From cb7e5f256c36b8f7c2aa2a04ae69eddf6cff403d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 10 Dec 2014 09:19:07 +0100 Subject: Cleaning up from python removal (LIVE_IMAGE_PARENT_ARCHIVE_AREAS). --- scripts/build/chroot_firmware | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/build/chroot_firmware') diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware index f62a17468..76bdbe5e5 100755 --- a/scripts/build/chroot_firmware +++ b/scripts/build/chroot_firmware @@ -56,7 +56,7 @@ mkdir -p cache/contents.chroot FIRMWARE_PACKAGES="" -_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" +_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} @@ -67,7 +67,7 @@ do FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" done -if echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" +if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" then # Manually add firmware-linux/non-free meta package if [ "${LB_DERIVATIVE}" != "true" ] @@ -110,7 +110,7 @@ do done # Some known licenses required to be accepted -if echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" +if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" then cat >> chroot/root/packages.chroot.cfg << EOF -- cgit v1.2.3