diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-01-04 19:50:58 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-01-04 19:50:58 +0100 |
| commit | 23099946121e5e172e584a13e3425b96bbefbe28 (patch) | |
| tree | 2514a9397bfa79c59f99b0d342d26e7aa53b5393 | |
| parent | 90024a03917842b43b8ebb9c2ba17ce50b38a149 (diff) | |
| download | vyos-live-build-23099946121e5e172e584a13e3425b96bbefbe28.tar.gz vyos-live-build-23099946121e5e172e584a13e3425b96bbefbe28.zip | |
Correcting dependency checks in binary_package-lists (Closes: #774336).
| -rwxr-xr-x | scripts/build/binary_package-lists | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index 91ff72e9d..27780b1ca 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -53,13 +53,15 @@ esac if ls config/package-lists/*.list > /dev/null 2>&1 || \ ls config/package-lists/*.list.binary > /dev/null 2>&1 then + # Check depends + Check_package host /usr/bin/apt-ftparchive apt-utils + case "${LB_BUILD_WITH_CHROOT}" in true) # Restoring cache Restore_cache cache/packages.chroot # Check depends - Check_package chroot /usr/bin/apt-ftparchive apt-utils Check_package chroot /usr/bin/grep-aptavail dctrl-tools # Installing depends @@ -67,17 +69,7 @@ then ;; false) - if [ ! -e /usr/bin/apt-ftparchive ]; then - # apt-utils - Echo_error "/usr/bin/apt-ftparchive - no such file." - exit 1 - fi - - if [ ! -e /usr/bin/grep-aptavail ]; then - # dctrl-tools - Echo_error "/usr/bin/grep-aptavail - no such file." - exit 1 - fi + Check_package host /usr/bin/grep-aptavail dctrl-tools ;; esac |