[SCM] live-build branch, debian, updated. debian/3.0_a20-1-8-gf424434
Daniel Baumann
daniel at debian.org
Mon Jun 13 18:43:55 UTC 2011
The following commit has been merged in the debian branch:
commit d5510c99100303d73c00dd59907aeda83594d3b5
Author: Colin Watson <cjwatson at canonical.com>
Date: Mon Jun 13 10:24:37 2011 +0100
Divert flash-kernel aside while building the chroot (Closes: #630350).
diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg
index 25795a3..3194c04 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/lb_chroot_dpkg
@@ -70,6 +70,10 @@ EOF
touch /var/state/samhain/samhain_file
fi
+ # flash-kernel
+ Chroot chroot dpkg-divert --rename --add /usr/sbin/flash-kernel
+ ln -s /bin/true chroot/usr/sbin/flash-kernel
+
# Creating stage file
Create_stagefile .stage/chroot_dpkg
;;
@@ -85,6 +89,10 @@ EOF
# Manual hacks for special packages
+ # flash-kernel
+ rm -f chroot/usr/sbin/flash-kernel
+ Chroot chroot dpkg-divert --rename --remove /usr/sbin/flash-kernel
+
# samhain
if [ -e /var/state/samhain/samhain_file.orig ]
then
--
live-build
More information about the debian-live-changes
mailing list