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

build/ports: do not overwrite global SELF and IMAGE 

While here cleanup_packages is highly ambiguous.  Use
prune_packages instead as we remove stale or incompatible
packages from the set.
This commit is contained in:
Franco Fichtner 2021-01-20 16:25:45 +01:00
parent 8742d7295d
commit d6111ee42a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/common.sh
View File

@ -665,20 +665,20 @@ sign_image()
check_image()
{
SELF=${1}
local SELF=${1}
SKIP=${2}
IMAGE=$(find ${IMAGESDIR} -name "*-${SELF}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*")
CHECK=$(find ${IMAGESDIR} -name "*-${SELF}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*")
if [ -f "${IMAGE}" -a -z "${SKIP}" ]; then
echo ">>> Reusing ${SELF} image: ${IMAGE}"
if [ -f "${CHECK}" -a -z "${SKIP}" ]; then
echo ">>> Reusing ${SELF} image: ${CHECK}"
exit 0
fi
}
check_packages()
{
SELF=${1}
local SELF=${1}
SKIP=${2}
PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}.tar")
@ -749,7 +749,7 @@ remove_packages()
done
}
cleanup_packages()
prune_packages()
{
BASEDIR=${1}

2
build/ports.sh
View File

@ -89,7 +89,7 @@ setup_distfiles ${STAGEDIR}
if extract_packages ${STAGEDIR}; then
remove_packages ${STAGEDIR} ${@} ${PRODUCT_CORES} ${PRODUCT_PLUGINS}
cleanup_packages ${STAGEDIR}
prune_packages ${STAGEDIR}
fi
MAKE_CONF="${CONFIGDIR}/make.conf"