Skip to content

Commit

Permalink
assemble_firmware: fix parsing profile-packages for flavor-suffix
Browse files Browse the repository at this point in the history
* 1st remove the flavor-suffix
* use the normalized profilename to lookup the profile-packagelist
  • Loading branch information
SvenRoederer committed Jun 27, 2021
1 parent 3890c8d commit 539d266
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions scripts/assemble_firmware.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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=""
Expand Down

0 comments on commit 539d266

Please sign in to comment.