[SCM] live-build branch, debian, updated. debian/3.0_a25-1-57-g6167d10
Daniel Baumann
daniel at debian.org
Thu Aug 4 19:53:17 UTC 2011
The following commit has been merged in the debian branch:
commit 651c8aebd2960123d14bf6715e3a0f149b2c9b98
Author: Cody A.W. Somerville <cody.somerville at canonical.com>
Date: Wed Jul 20 08:48:07 2011 +0200
Updating lb_binary_linux-image to only copy over kernel and initrd if LB_LINUX_PACKAGES doesn't equal 'none'.
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image
index 22e6761..43e09a9 100755
--- a/scripts/build/lb_binary_linux-image
+++ b/scripts/build/lb_binary_linux-image
@@ -73,8 +73,11 @@ Check_multiarchitectures
mkdir -p "${DESTDIR}"
# Installing linux-image
-cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
-cp chroot/boot/initrd.img-* "${DESTDIR}"
+if [ "${LB_LINUX_PACKAGES}" != "none" ]
+then
+ cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
+ cp chroot/boot/initrd.img-* "${DESTDIR}"
+fi
case "${LB_INITRAMFS}" in
live-boot)
--
live-build
More information about the debian-live-changes
mailing list