From 0d33db8e8f8e44ee087f8d3de7ccd59539f580ec Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 19 May 2014 12:14:28 +0100 Subject: [PATCH] Import patches-unapplied version 2.212 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: 5094f5308fcb6817650f019d4bc36a3e1e2fa03e New changelog entries: * 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 | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f7c782d4..b8891371 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.212) utopic; 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:14:28 +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..0334ec4f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -197,7 +197,7 @@ case $PROJECT in add_package install ubuntu-desktop-next COMPONENTS='main restricted universe' LIVE_TASK='ubuntu-live' - ;; + ;; kubuntu|kubuntu-dvd) add_task install minimal standard @@ -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