diff --git a/build/common.sh b/build/common.sh index ea37e99..aebe77d 100644 --- a/build/common.sh +++ b/build/common.sh @@ -861,6 +861,7 @@ remove_packages() echo ">>> Removing packages in ${BASEDIR}: ${PKGLIST}" for PKG in ${PKGLIST}; do + PKG=$(echo ${PKG} | tr '%' '*') for PKGFILE in $(cd ${BASEDIR}${PACKAGESDIR}; \ find All -name "${PKG}-[0-9]*.pkg" -type f); do rm ${BASEDIR}${PACKAGESDIR}/${PKGFILE} diff --git a/build/packages.sh b/build/packages.sh index 70ec53d..1496a6e 100644 --- a/build/packages.sh +++ b/build/packages.sh @@ -41,6 +41,7 @@ AUXLIST=$(list_packages "${AUXLIST}" ${CONFIGDIR}/aux.conf) setup_stage ${STAGEDIR} setup_base ${STAGEDIR} extract_packages ${STAGEDIR} +remove_packages ${STAGEDIR} ${@} # The goal for aux packages is that they are part of the packages # set for nightly builds until they are officially built using the