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

Unifying config/chroot_local-packagelists and config/binary_local-packagelists. 

Rather than using config/chroot_local-packagelists/*.list and
config/binary_local-packagelists/*.list, we're simply using
config/package-lists/*.chroot.list and
config/package-lists/*.binary.list.
This commit is contained in:
Daniel Baumann 2011-06-15 21:37:10 +02:00
parent 36ecab10d3
commit 9d905734e5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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/binary_local-packagelists/*.list
if Find_files config/package-lists/*.binary.list
then
# Restoring cache
Restore_cache cache/packages_chroot
@ -53,10 +53,10 @@ then
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status
for PACKAGELIST in config/binary_local-packagelists/*.list
for PACKAGELIST in config/package-lists/*.binary.list
do
# Generate package list
Expand_packagelist "${PACKAGELIST}" "config/binary_local-packagelists" "config/chroot_local-packagelists" > chroot/root/"$(basename ${PACKAGELIST})"
Expand_packagelist "${PACKAGELIST}" "config/package-lists" > chroot/root/"$(basename ${PACKAGELIST})"
# Downloading additional packages
Chroot chroot "xargs --arg-file=/root/$(basename ${PACKAGELIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"

8
scripts/build/lb_chroot_local-packagelists
View File

@ -41,15 +41,15 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if ls config/chroot_local-packagelists/*.list > /dev/null 2>&1 || \
ls config/chroot_local-packagelists/*.list.${_PASS} > /dev/null 2>&1
if ls config/package-lists/*.chroot.list > /dev/null 2>&1 || \
ls config/package-lists/*.chroot_${_PASS}.list > /dev/null 2>&1
then
for LIST in config/chroot_local-packagelists/*.list config/chroot_local-packagelists/*.list.${_PASS}
for LIST in config/package-lists/*.chroot.list config/package-lists/*.chroot_${_PASS}.list
do
if [ -e "${LIST}" ]
then
# Generating local package list
Expand_packagelist "$(basename ${LIST})" "config/chroot_local-packagelists" \
Expand_packagelist "$(basename ${LIST})" "config/package-lists" \
>> chroot/root/chroot_packages
fi
done

8
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/binary_local-packagelists config/chroot_local-packagelists 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/chroot_local-tasklists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
do
if Find_files "${DIRECTORY}"
then
@ -1154,7 +1154,7 @@ mkdir -p config/chroot_local-hooks
mkdir -p config/chroot_local-includes
mkdir -p config/chroot_local-patches
mkdir -p config/chroot_local-packages
mkdir -p config/chroot_local-packagelists
mkdir -p config/package-lists
mkdir -p config/chroot_local-preseed
mkdir -p config/chroot_local-tasklists
@ -1225,7 +1225,7 @@ mkdir -p config/binary_grub
mkdir -p config/binary_local-debs
mkdir -p config/binary_local-hooks
mkdir -p config/binary_local-includes
mkdir -p config/binary_local-packagelists
mkdir -p config/package-lists
mkdir -p config/binary_local-udebs
mkdir -p config/binary_rootfs
mkdir -p config/binary_syslinux
@ -1394,7 +1394,7 @@ mkdir -p auto/scripts
if [ "${CONFIG}" = "clone" ] # FIXME
then
# Read package selection
echo $(dpkg --get-selections | awk '{ print $1 }') > config/chroot_local-packagelists/local-system
echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local-system.chroot.list
LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS} local-system"
# Read debconf questions