From 539d266f9547f89a1472f739c61134d360faaea2 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 04:01:32 +0200 Subject: [PATCH] assemble_firmware: fix parsing profile-packages for flavor-suffix * 1st remove the flavor-suffix * use the normalized profilename to lookup the profile-packagelist --- scripts/assemble_firmware.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/assemble_firmware.sh b/scripts/assemble_firmware.sh index cb8c638175..73b1696a77 100755 --- a/scripts/assemble_firmware.sh +++ b/scripts/assemble_firmware.sh @@ -141,6 +141,11 @@ tar xf "$IB_FILE" --strip-components=1 -C "$TEMP_DIR" for profile in $PROFILES ; do info "Building an image for $profile" + # profiles can have a suffix. like 4mb devices get a smaller package list pro use case + # UBNT:4MB -> profile "UBNT" suffix "4MB" + suffix="$(echo $profile | cut -d':' -f 2)" + profile="$(echo $profile | cut -d':' -f 1)" + if [ -e "${PKGLIST_DIR}/profile-packages.txt" ] ; then model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d':' -s -f 2)" # this is compatibility for WeimarNetz-stype definitons @@ -150,11 +155,6 @@ for profile in $PROFILES ; do info "we include these extra packages: $model_packages" fi - # profiles can have a suffix. like 4mb devices get a smaller package list pro use case - # UBNT:4MB -> profile "UBNT" suffix "4MB" - suffix="$(echo $profile | cut -d':' -f 2)" - profile="$(echo $profile | cut -d':' -f 1)" - for usecase in $USECASES ; do package_list="" packages=""