diff options
| author | Luca Boccassi <bluca@debian.org> | 2018-04-04 19:56:41 +0100 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2018-04-04 19:56:41 +0100 |
| commit | 2aff516e1f9713e1c7407f163bc0abc998951bca (patch) | |
| tree | 2b527a75487d22af6ce0dd9da24c8ee41d52187f | |
| parent | 44e0d3520e9440cab692c86536083b3ce19510a2 (diff) | |
| download | vyos-live-build-2aff516e1f9713e1c7407f163bc0abc998951bca.tar.gz vyos-live-build-2aff516e1f9713e1c7407f163bc0abc998951bca.zip | |
ONIE: Check_package in the host, not the chroot
The binary_onie script works on the host, not in the chroot (if used),
so don't check that the required packages for the script are installed
in the chroot (if present) as they won't be useful.
Check instead on the host.
| -rwxr-xr-x | scripts/build/binary_onie | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build/binary_onie b/scripts/build/binary_onie index b8095a68b..67244d7b0 100755 --- a/scripts/build/binary_onie +++ b/scripts/build/binary_onie @@ -56,14 +56,14 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -Check_package chroot /bin/cpio cpio -Check_package chroot /usr/bin/sha1sum coreutils -Check_package chroot /bin/zcat gzip -Check_package chroot /bin/gzip gzip -Check_package chroot /usr/bin/xzcat xz-utils -Check_package chroot /usr/bin/xz xz-utils -Check_package chroot /bin/bzcat bzip2 -Check_package chroot /bin/bzip2 bzip2 +Check_package host /bin/cpio cpio +Check_package host /usr/bin/sha1sum coreutils +Check_package host /bin/zcat gzip +Check_package host /bin/gzip gzip +Check_package host /usr/bin/xzcat xz-utils +Check_package host /usr/bin/xz xz-utils +Check_package host /bin/bzcat bzip2 +Check_package host /bin/bzip2 bzip2 # Restoring cache Restore_cache cache/packages.binary |