diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 09:19:07 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 09:19:07 +0100 |
| commit | cb7e5f256c36b8f7c2aa2a04ae69eddf6cff403d (patch) | |
| tree | 5dc1d17d8720ad53e3cac136a02ec08b75a7bdb9 /scripts/build/installer_debian-installer | |
| parent | 07253b661cbbcdcd043a83018b3c68420b8813da (diff) | |
| download | vyos-live-build-cb7e5f256c36b8f7c2aa2a04ae69eddf6cff403d.tar.gz vyos-live-build-cb7e5f256c36b8f7c2aa2a04ae69eddf6cff403d.zip | |
Cleaning up from python removal (LIVE_IMAGE_PARENT_ARCHIVE_AREAS).
Diffstat (limited to 'scripts/build/installer_debian-installer')
| -rwxr-xr-x | scripts/build/installer_debian-installer | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index a0868248e..5146ede5b 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -419,7 +419,7 @@ then 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} @@ -430,7 +430,7 @@ then 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" ] @@ -503,7 +503,7 @@ then mv chroot/binary.deb ./ - for _ARCHIVE_AREA in $(echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS}) + for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS}) do mkdir -p binary/pool/${_ARCHIVE_AREA} done @@ -754,7 +754,7 @@ cd /root/binary && apt-ftparchive \ -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \ -o APT::FTPArchive::Release::Date="$(date -R)" \ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ - -o APT::FTPArchive::Release::Components="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" \ + -o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \ -o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \ release dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/Release EOF |