[SCM] live-build branch, debian-next, updated. debian/3.0_a11-1-24-g0055df3

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 0055df3951f1d8843c783a458ae300d23f4f5245
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Feb 14 16:20:00 2011 +0100

    Making sure to correctly deference syslinux theme files when building chrooted.

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index b6b2c0a..e6f1378 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -58,8 +58,6 @@ case "${LB_BUILD_WITH_CHROOT}" in
 
 		# Installing depends
 		Install_package
-
-		_PREFIX="chroot"
 		;;
 esac
 
@@ -83,7 +81,19 @@ esac
 
 # Copying files
 mkdir -p ${_SUFFIX}
-cp -aL ${_PREFIX}/usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}-live/* ${_SUFFIX}
+
+case "${LB_BUILD_WITH_CHROOT}" in
+	true)
+		# Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly
+		Chroot chroot "cp -aL /usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}-live /root/tmp"
+		mv chroot/root/tmp/* ${_SUFFIX}
+		rmdir chroot/root/tmp
+		;;
+
+	false)
+		cp -aL /usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}-live/* ${_SUFFIX}
+		;;
+esac
 
 # Configuring files
 if [ -e ${_SUFFIX}/live.cfg ]

-- 
live-build