summaryrefslogtreecommitdiff
path: root/scripts/build/binary_debian-installer
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-19 21:41:25 +0100
committerDaniel Baumann <daniel@debian.org>2012-12-20 12:27:49 +0100
commitb0217026ea9608737a43f479c77f3f88a38fb860 (patch)
treece663a129b29c25a3a8f9190dceeb1e1169d2ec5 /scripts/build/binary_debian-installer
parent87008965a11890a4c69671683bf58ae66b77fb92 (diff)
downloadvyos-live-build-b0217026ea9608737a43f479c77f3f88a38fb860.tar.gz
vyos-live-build-b0217026ea9608737a43f479c77f3f88a38fb860.zip
Moving off binary image archive areas into new config tree format.
Diffstat (limited to 'scripts/build/binary_debian-installer')
-rwxr-xr-xscripts/build/binary_debian-installer4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index 93ae4fa05..229850403 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -441,7 +441,7 @@ then
then
# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
- _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
+ _CONTENTS="$(for _ARCHIVE_AREA in ${LIVE_IMAGE_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
@@ -502,7 +502,7 @@ then
mv chroot/binary.deb ./
- for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS})
+ for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LIVE_IMAGE_ARCHIVE_AREAS})
do
mkdir -p binary/pool/${_ARCHIVE_AREA}
done