From 83c397cf2ec383e497186b561081f59286361ee9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 19 May 2014 12:14:05 +0100 Subject: [PATCH] live-build/auto/config: If EXTRA_ARCHIVES is set in the environment, dump its value into config/archives/extra-archives.list.chroot and config/archives/extra-archives.list.binary. This makes it easier for a builder to build an image against an additional PPA. --- debian/changelog | 9 +++++++++ live-build/auto/config | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index f7c782d4..d0de61d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.212) UNRELEASED; urgency=medium + + * live-build/auto/config: If EXTRA_ARCHIVES is set in the environment, + dump its value into config/archives/extra-archives.list.chroot and + config/archives/extra-archives.list.binary. This makes it easier for a + builder to build an image against an additional PPA. + + -- Colin Watson Mon, 19 May 2014 12:12:15 +0100 + livecd-rootfs (2.211) utopic; urgency=medium * Add an ubuntu-desktop-next project for building a desktop flavour diff --git a/live-build/auto/config b/live-build/auto/config index 7e262380..0f5c7162 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -498,6 +498,13 @@ EOF ;; esac +if [ "$EXTRA_ARCHIVES" ]; then + printf '%s\n' "$EXTRA_ARCHIVES" \ + > config/archives/extra-archives.list.chroot + cp -a config/archives/extra-archives.list.chroot \ + config/archives/extra-archives.list.binary +fi + # cribbed from cdimage, perhaps this should be a small helper script in germinate? add_inheritance () { case " $inherit " in