build: drop unused, packages now without PRODUCT_FLAVOUR

This commit is contained in:
Franco Fichtner 2023-02-07 07:55:06 +01:00
parent 1f136c68db
commit 2bfa4c65e8
2 changed files with 4 additions and 4 deletions

View File

@ -69,7 +69,7 @@ while getopts ${OPTS} OPT; do
export PRODUCT_KERNEL=${OPTARG}
;;
f)
export PRODUCT_FLAVOUR=${OPTARG%% *}
export PRODUCT_FLAVOUR=${OPTARG}
;;
G)
export PORTSREFBRANCH=${OPTARG}
@ -954,7 +954,7 @@ install_packages()
custom_packages()
{
chroot ${1} /bin/sh -es << EOF
make -C ${2} ${3} FLAVOUR=${PRODUCT_FLAVOUR} PKGDIR=${PACKAGESDIR}/All package
make -C ${2} ${3} PKGDIR=${PACKAGESDIR}/All package
EOF
(
@ -1033,7 +1033,7 @@ bundle_packages()
sh ./clean.sh packages
PACKAGEVER="${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}"
PACKAGEVER="${PRODUCT_VERSION}-${PRODUCT_ARCH}"
PACKAGESET="${SETSDIR}/packages-${PACKAGEVER}.tar"
echo -n ">>> Creating package mirror set for ${PACKAGEVER}... "
tar -C ${BASEDIR}${PACKAGESDIR}-new -cf ${PACKAGESET} .

View File

@ -102,7 +102,7 @@ for ARG in ${@}; do
echo ">>> Renaming packages set: ${PRODUCT_VERSION}"
for FILE in $(find ${SETSDIR} -name \
"packages-*-${PRODUCT_ARCH}.*"); do
mv ${FILE} ${SETSDIR}/packages-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-${FILE##*-}
mv ${FILE} ${SETSDIR}/packages-${PRODUCT_VERSION}-${FILE##*-}
done
;;
serial)