From d6f42085fcfc9180478d817551f753dc7eae5ad6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jun 2011 23:32:35 +0100 Subject: [PATCH] Switch from --binary-remove-linux to config/binary_rootfs/excludes. --- debian/changelog | 1 + debian/control | 2 +- live-build/auto/config | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0ee856d..bf7e3e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.1) UNRELEASED; urgency=low * Fix ordering of log file creation in BuildLiveCD. * Fix permissions in BuildLiveCD when setting up auto directory. + * Switch from --binary-remove-linux to config/binary_rootfs/excludes. -- Colin Watson Mon, 13 Jun 2011 19:42:59 +0100 diff --git a/debian/control b/debian/control index 25f29db7..e12c60d6 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk Package: livecd-rootfs Architecture: all -Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, live-build (>= 3.0~a20-1ubuntu1) +Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, live-build (>= 3.0~a21-1ubuntu1) Suggests: partimage Description: construction script for the livecd rootfs livecd-rootfs provides the script used to create the root filesystem diff --git a/live-build/auto/config b/live-build/auto/config index aea794ef..5c82cd0a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -44,7 +44,7 @@ add_package () OPTS= COMPONENTS= -BINARY_REMOVE_LINUX=true +BINARY_REMOVE_LINUX=: case $IMAGEFORMAT in ext2|ext3) @@ -141,7 +141,6 @@ lb config noauto \ --distribution "$SUITE" \ --bootstrap-keyring ubuntu-keyring \ --binary-images none \ - --binary-remove-linux "$BINARY_REMOVE_LINUX" \ --memtest none \ --source false \ --build-with-chroot false \ @@ -153,6 +152,13 @@ lb config noauto \ --initramfs-compression lzma \ $OPTS +if $BINARY_REMOVE_LINUX; then + cat > config/binary_rootfs/excludes << EOF +boot/vmlinu?-* +boot/initrd.img-* +EOF +fi + case $PROJECT in kubuntu|kubuntu-mobile) ln -s /usr/share/live/build/examples/hooks/kubuntu_chroot_icon-theme.sh config/chroot_local-hooks/