summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-10-13 17:44:00 +0200
committerDaniel Baumann <daniel@debian.org>2011-10-13 17:44:00 +0200
commit0da0a10a95fe39356d4ed36bf28545ee0b415ea7 (patch)
treef8e20f69e1e64f462e6d94d638f933077c9a15ac /scripts
parent5053d95fe02394c2bbbad9ad26d6d28c0d4700c5 (diff)
downloadvyos-live-build-0da0a10a95fe39356d4ed36bf28545ee0b415ea7.tar.gz
vyos-live-build-0da0a10a95fe39356d4ed36bf28545ee0b415ea7.zip
Also strip out source archives from local archive definitions when using --apt-source-archives false.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_chroot_archives12
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 85059da6f..ee90f764f 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -278,6 +278,12 @@ EOF
-e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
+
+ if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ]
+ then
+ # Strip out source archives
+ sed "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
+ fi
fi
done
fi
@@ -834,6 +840,12 @@ EOF
-e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)"
+
+ if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ]
+ then
+ # Strip out source archives
+ sed "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)"
+ fi
fi
done
fi