diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-04-17 21:26:34 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2008-04-19 17:32:02 +0200 |
| commit | f8c8aaa99a2c07ff31173ff0cedef0a0bbc1bdd5 (patch) | |
| tree | c789fc1bc7c618f66da80ca44b3b03ac74cb8c1d | |
| parent | d49857d8ff9da9cdc26dd680da219d647497a6fb (diff) | |
| download | vyos-live-build-f8c8aaa99a2c07ff31173ff0cedef0a0bbc1bdd5.tar.gz vyos-live-build-f8c8aaa99a2c07ff31173ff0cedef0a0bbc1bdd5.zip | |
Tidy calls to new Expand_packagelist
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
| -rwxr-xr-x | helpers/lh_binary_local-packageslists | 3 | ||||
| -rwxr-xr-x | helpers/lh_chroot_local-packageslists | 7 | ||||
| -rwxr-xr-x | helpers/lh_chroot_packageslists | 14 |
3 files changed, 6 insertions, 18 deletions
diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists index cc3c87ddc..5804fa1ae 100755 --- a/helpers/lh_binary_local-packageslists +++ b/helpers/lh_binary_local-packageslists @@ -51,8 +51,7 @@ then for PACKAGESLIST in config/binary_local-packageslists/* do # 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 Chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install" diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists index 8a1bef0c1..f5fe3bb6b 100755 --- a/helpers/lh_chroot_local-packageslists +++ b/helpers/lh_chroot_local-packageslists @@ -47,11 +47,8 @@ then for PACKAGES_LIST in config/chroot_local-packageslists/* do # Generate package list - Expand_packagelist \ - "$(basename ${PACKAGES_LIST})" \ - "config/chroot_local-packageslists" \ - "${LH_BASE:-/usr/share/live-helper/lists}/lists" \ - >> chroot/root/chroot_packages + Expand_packagelist "${PACKAGES_LIST}" "config/chroot_local-packageslists" \ + >> chroot/root/chroot_packages done # Creating stage file diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists index 05d742d74..956955004 100755 --- a/helpers/lh_chroot_packageslists +++ b/helpers/lh_chroot_packageslists @@ -47,17 +47,9 @@ then for LIST in ${LH_PACKAGES_LISTS} do - if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ] - then - # Generating package list - 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 + # Generating package list + Expand_packagelist "${LIST}" "config/chroot_local-packageslists" \ + >> chroot/root/chroot_packages done # Creating stage file |