opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build: similar approach for find_images(), now values PRODUCT_FLAVOUR

This commit is contained in:
Franco Fichtner 2021-07-08 12:43:04 +02:00
parent f7ed343a6f
commit 3e3621cdec
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/boot.sh
View File

@ -33,14 +33,14 @@ SELF=boot
. ./common.sh
if [ -z "${1}" ]; then
echo ">> No image given."
echo ">>> No image given."
exit 1
fi
IMAGE=$(find ${IMAGESDIR} -name "*-${1}-${PRODUCT_ARCH}.*" \! -name "*.sig")
IMAGE=$(find_image "${1}")
if [ ! -f "${IMAGE}" ]; then
echo ">> No image found."
echo ">>> No image found."
exit 1
fi

7
build/common.sh
View File

@ -693,7 +693,7 @@ check_image()
local SELF=${1}
SKIP=${2}
CHECK=$(find ${IMAGESDIR} -name "*-${SELF}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*" \! -name "*.sig")
CHECK=$(find_image "${SELF}")
if [ -f "${CHECK}" -a -z "${SKIP}" ]; then
echo ">>> Reusing ${SELF} image: ${CHECK}"
@ -720,6 +720,11 @@ check_packages()
return 1
}
find_image()
{
echo $(find ${IMAGESDIR} -name "*-${PRODUCT_FLAVOUR}-${1}-${PRODUCT_ARCH}.*" \! -name "*.sig")
}
find_set()
{
case ${1} in