From bfe9390724ae341fa88e71f67a17f18bd788a60c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 17 Jun 2011 08:25:23 +0100 Subject: [PATCH 1/2] Handle package/task list changes in live-build 3.0~a22-1. --- debian/changelog | 6 ++++++ live-build/auto/config | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09d511dc..23b13131 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.8) UNRELEASED; urgency=low + + * Handle package/task list changes in live-build 3.0~a22-1. + + -- Colin Watson Fri, 17 Jun 2011 08:24:52 +0100 + livecd-rootfs (2.7) oneiric; urgency=low * Install xubuntu-live for xubuntu, not edubuntu-live (LP: #800211). diff --git a/live-build/auto/config b/live-build/auto/config index db93e71d..d961ab77 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -19,8 +19,7 @@ if [ -z "$MIRROR" ]; then esac fi -mkdir -p config/chroot_local-tasklists config/chroot_local-packagelists -rm -f config/chroot_local-tasklists/livecd-rootfs.list config/chroot_local-packagelists/livecd-rootfs.list +mkdir -p config/task-lists config/package-lists add_task () { @@ -29,7 +28,7 @@ add_task () local task for task; do - echo "$task" >> "config/chroot_local-tasklists/livecd-rootfs.list.$pass" + echo "$task" >> "config/task-lists/livecd-rootfs.chroot_$pass.list" done } @@ -40,7 +39,7 @@ add_package () local pkg for pkg; do - echo "$pkg" >> "config/chroot_local-packagelists/livecd-rootfs.list.$pass" + echo "$pkg" >> "config/package-lists/livecd-rootfs.chroot_$pass.list" done } From 2248b8b31925583a1631bbd2ed9f6b1da2ca48d7 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 17 Jun 2011 10:42:12 +0100 Subject: [PATCH 2/2] Handle local sources.list changes in live-build 3.0~a22-1. --- debian/changelog | 1 + live-build/auto/config | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 23b13131..15b3be26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ livecd-rootfs (2.8) UNRELEASED; urgency=low * Handle package/task list changes in live-build 3.0~a22-1. + * Handle local sources.list changes in live-build 3.0~a22-1. -- Colin Watson Fri, 17 Jun 2011 08:24:52 +0100 diff --git a/live-build/auto/config b/live-build/auto/config index d961ab77..1b521f72 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -177,7 +177,7 @@ case $PROJECT in *-dvd) . config/bootstrap - cat > config/chroot_sources/dvd.binary << EOF + cat > config/archives/dvd.binary.list << EOF deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse