diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-15 21:37:10 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-15 21:37:10 +0200 |
| commit | 9d905734e5c3950ab74d29c08d10ca58472e114d (patch) | |
| tree | bc8eb92095d46fe1d2b50f21c7832e755af06d6f /scripts/build/lb_binary_local-packagelists | |
| parent | 36ecab10d372152acf7522d1d1f6274c938f72dd (diff) | |
| download | vyos-live-build-9d905734e5c3950ab74d29c08d10ca58472e114d.tar.gz vyos-live-build-9d905734e5c3950ab74d29c08d10ca58472e114d.zip | |
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.
Diffstat (limited to 'scripts/build/lb_binary_local-packagelists')
| -rwxr-xr-x | scripts/build/lb_binary_local-packagelists | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/lb_binary_local-packagelists b/scripts/build/lb_binary_local-packagelists index d2b203785..b0d28ab7e 100755 --- a/scripts/build/lb_binary_local-packagelists +++ b/scripts/build/lb_binary_local-packagelists @@ -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" |