[SCM] live-build branch, debian, updated. debian/2.0_a28-1-12-g43666a8
Daniel Baumann
daniel at debian.org
Thu Sep 16 19:25:30 UTC 2010
The following commit has been merged in the debian branch:
commit b37bdd8f37e473b6ce80e6344cf4679154d4e13c
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 16 18:16:19 2010 +0200
Allowing also symlinks in chroot_local-packages (Closes: #593186).
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index d5dfeea..84c4756 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -204,12 +204,28 @@ EOF
# Copy packages
if Find_files config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb
then
- cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
+ for FILE in config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb
+ do
+ if [ -L "${FILE}" ]
+ then
+ cp -L config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
+ else
+ cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
+ fi
+ done
fi
if Find_files config/chroot_local-packages/*_all.deb
then
- cp ${CP_OPTIONS} config/chroot_local-packages/*_all.deb chroot/root/local-packages
+ for FILE in config/chroot_local-packages/*_all.deb
+ do
+ if [ -L "${FILE}" ]
+ then
+ cp -L config/chroot_local-packages/*_all.deb chroot/root/local-packages
+ else
+ cp ${CP_OPTIONS} config/chroot_local-packages/*_all.deb chroot/root/local-packages
+ fi
+ done
fi
if Find_files chroot/root/local-packages/*.deb
--
live-build
More information about the debian-live-changes
mailing list