[SCM] live-build branch, debian-next, updated. debian/3.0_a53-1-1-g6c0ddb7
Daniel Baumann
daniel at debian.org
Thu Jul 19 16:12:44 UTC 2012
The following commit has been merged in the debian-next branch:
commit 6c0ddb7d6d72d15ab2887a4b40de2c5d71f26d3a
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jul 19 18:13:13 2012 +0200
Making sure target directory for syslinux theme files exists when building non-chrooted.
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 9663fa3..2788103 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -166,10 +166,10 @@ else
fi
# Copying files
-mkdir -p $(dirname ${_TARGET})
-
case "${LB_BUILD_WITH_CHROOT}" in
true)
+ mkdir -p $(dirname ${_TARGET})
+
# Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly
if [ "${LB_SYSLINUX_THEME}" = "live-build" ]
then
@@ -190,6 +190,8 @@ case "${LB_BUILD_WITH_CHROOT}" in
;;
false)
+ mkdir -p ${_TARGET}
+
cp -aL ${_SOURCE}/* ${_TARGET}
case "${LB_MODE}" in
--
live-build
More information about the debian-live-changes
mailing list