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

Reverse keywords in suffix of the package list files for consistency. 

Previously, config/package-lists/foo.{binary,chroot}.list was used,
now we use config/package-lists/foo.list.{binary,chroot}.

That way, we're using the same single suffix for all files to make
them specific for either binary and chroot, rather than having
an exception to the rule for package list files.
This commit is contained in:
Daniel Baumann 2011-08-05 08:40:03 +02:00
parent a51393f49b
commit 8a0da57266
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/lb_binary_local-packagelists
View File

@ -38,7 +38,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if Find_files config/package-lists/*.binary.list
if Find_files config/package-lists/*.list.binary
then
# Restoring cache
Restore_cache cache/packages_chroot
@ -53,7 +53,7 @@ then
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status
for PACKAGELIST in config/package-lists/*.binary.list
for PACKAGELIST in config/package-lists/*.list.binary
do
# Generate package list
Expand_packagelist "${PACKAGELIST}" "config/package-lists" > chroot/root/"$(basename ${PACKAGELIST})"

6
scripts/build/lb_chroot_local-packagelists
View File

@ -41,10 +41,10 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if ls config/package-lists/*.chroot.list > /dev/null 2>&1 || \
ls config/package-lists/*.chroot_${_PASS}.list > /dev/null 2>&1
if ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \
ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
then
for LIST in config/package-lists/*.chroot.list config/package-lists/*.chroot_${_PASS}.list
for LIST in config/package-lists/*.list.chroot config/package-lists/*.list.chroot_${_PASS}
do
if [ -e "${LIST}" ]
then

6
scripts/build/lb_chroot_task-lists
View File

@ -41,10 +41,10 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if ls config/task-lists/*.chroot.list > /dev/null 2>&1 || \
ls config/task-lists/*.chroot_${_PASS}.list > /dev/null 2>&1
if ls config/task-lists/*.list.chroot > /dev/null 2>&1 || \
ls config/task-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
then
for LIST in config/task-lists/*.chroot.list config/task-lists/*.chroot_${_PASS}.list
for LIST in config/task-lists/*.list.chroot config/task-lists/*.list.chroot_${_PASS}
do
if [ -e "${LIST}" ]
then

2
scripts/build/lb_config
View File

@ -1393,7 +1393,7 @@ mkdir -p auto/scripts
if [ "${CONFIG}" = "clone" ] # FIXME
then
# Read package selection
echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local-system.chroot.list
echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local.list.chroot
LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS} local-system"
# Read debconf questions