[SCM] live-build branch, debian-next, updated. debian/3.0_a21-1-11-ge26d3be
Daniel Baumann
daniel at debian.org
Wed Jun 15 19:52:11 UTC 2011
The following commit has been merged in the debian-next branch:
commit e26d3be01aed013cd9a439240c28fa16c8bb272d
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jun 15 21:52:45 2011 +0200
Moving config/chroot_local-tasklists/*.list to config/task-lists/*.chroot.list, analogue to config/package-lists.
diff --git a/scripts/build/lb_chroot_local-tasklists b/scripts/build/lb_chroot_local-tasklists
index 2eef355..8291395 100755
--- a/scripts/build/lb_chroot_local-tasklists
+++ b/scripts/build/lb_chroot_local-tasklists
@@ -41,15 +41,15 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/chroot_local-tasklists/*.list > /dev/null 2>&1 || \
- ls config/chroot_local-tasklists/*.list.${_PASS} > /dev/null 2>&1
+if ls config/task-lists/*.chroot.list > /dev/null 2>&1 || \
+ ls config/task-lists/*.chroot_${_PASS}.list > /dev/null 2>&1
then
- for LIST in config/chroot_local-tasklists/*.list config/chroot_local-tasklists/*.list.${_PASS}
+ for LIST in config/task-lists/*.chroot.list config/task-lists/*.chroot_${_PASS}.list
do
if [ -e "${LIST}" ]
then
# Generating local task list
- Expand_packagelist "$(basename ${LIST})" "config/chroot_local-tasklists" \
+ Expand_packagelist "$(basename ${LIST})" "config/task-lists" \
>> chroot/root/chroot_tasks
fi
done
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 90a5004..4de05d9 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -196,7 +196,7 @@ Local_arguments ()
Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
# Dump contents of directories that contain text files
- for DIRECTORY in config/package-lists config/chroot_local-tasklists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
+ for DIRECTORY in config/package-lists config/task-lists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
do
if Find_files "${DIRECTORY}"
then
@@ -1156,7 +1156,7 @@ mkdir -p config/chroot_local-patches
mkdir -p config/chroot_local-packages
mkdir -p config/package-lists
mkdir -p config/chroot_local-preseed
-mkdir -p config/chroot_local-tasklists
+mkdir -p config/task-lists
cat > config/chroot << EOF
# config/chroot - options for live-build(7), chroot stage
--
live-build
More information about the debian-live-changes
mailing list