manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving config/chroot_local-tasklists/*.list to config/task-lists/*.chroot.list, analogue to config/package-lists.

This commit is contained in:
Daniel Baumann 2011-06-15 21:52:45 +02:00
parent db4943c415
commit e26d3be01a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build/lb_chroot_local-tasklists
View File

@ -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

4
scripts/build/lb_config
View File

@ -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