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

Tidy calls to new Expand_packagelist 

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
Chris Lamb 2008-04-17 21:26:34 +01:00 committed by Daniel Baumann
parent d49857d8ff
commit f8c8aaa99a
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
helpers/lh_binary_local-packageslists
View File

@ -51,8 +51,7 @@ then
for PACKAGESLIST in config/binary_local-packageslists/* for PACKAGESLIST in config/binary_local-packageslists/*
do do
# Generate package list # Generate package list
Expand_packagelist "$(basename ${PACKAGESLIST})" "config/binary_local-packageslists" "${LH_BASE:-/usr/share/live-helper/lists}/lists" > chroot/root/"$(basename ${PACKAGESLIST})" Expand_packagelist "${PACKAGESLIST}" "config/binary_local-packageslists" > chroot/root/"$(basename ${PACKAGESLIST})"
# Downloading additional packages # Downloading additional packages
Chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install" Chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"

7
helpers/lh_chroot_local-packageslists
View File

@ -47,11 +47,8 @@ then
for PACKAGES_LIST in config/chroot_local-packageslists/* for PACKAGES_LIST in config/chroot_local-packageslists/*
do do
# Generate package list # Generate package list
Expand_packagelist \ Expand_packagelist "${PACKAGES_LIST}" "config/chroot_local-packageslists" \
"$(basename ${PACKAGES_LIST})" \ >> chroot/root/chroot_packages
"config/chroot_local-packageslists" \
"${LH_BASE:-/usr/share/live-helper/lists}/lists" \
>> chroot/root/chroot_packages
done done
# Creating stage file # Creating stage file

14
helpers/lh_chroot_packageslists
View File

@ -47,17 +47,9 @@ then
for LIST in ${LH_PACKAGES_LISTS} for LIST in ${LH_PACKAGES_LISTS}
do do
if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ] # Generating package list
then Expand_packagelist "${LIST}" "config/chroot_local-packageslists" \
# Generating package list >> chroot/root/chroot_packages
Expand_packagelist \
"${LIST}" \
"config/chroot_local-packageslists" \
"${LH_BASE:-/usr/share/live-helper}/lists" \
>> chroot/root/chroot_packages
else
Echo_warning "skipping installation of unknown packages list '${LIST}'."
fi
done done
# Creating stage file # Creating stage file