summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/build/lb_chroot_local-tasklists8
-rwxr-xr-xscripts/build/lb_config4
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/lb_chroot_local-tasklists b/scripts/build/lb_chroot_local-tasklists
index 2eef3553a..8291395b6 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 90a5004b7..4de05d9df 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