summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2018-04-04 20:26:39 +0100
committerLuca Boccassi <bluca@debian.org>2018-04-05 16:24:36 +0100
commit08dd0b90dbe87411fb0657c940926c85730ac3e7 (patch)
treed63b4176ef4002c08c67a1386f791ff27df45a90
parent050e637b2ceaa1f6735fd9f84b0f7f4676637a79 (diff)
downloadvyos-live-build-08dd0b90dbe87411fb0657c940926c85730ac3e7.tar.gz
vyos-live-build-08dd0b90dbe87411fb0657c940926c85730ac3e7.zip
Print an error and exit if a host package (dependency) is missing.
Check_package will just add a missing dependency to the LB_PACKAGES todo list if it doesn't find it, when build-with-chroot is true, even if the check was not for the chroot. Instead error out if the check is not done for the chroot, e.g. Check_package host /bin/foo foo
-rwxr-xr-xfunctions/packages.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/functions/packages.sh b/functions/packages.sh
index 7c3592dac..a119e823d 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -18,7 +18,7 @@ Check_package ()
if [ "${INSTALL_STATUS}" -ne 0 ]
then
- if [ "${LB_BUILD_WITH_CHROOT}" != "false" ]
+ if [ "${LB_BUILD_WITH_CHROOT}" != "false" ] && [ "${CHROOT}" = "chroot" ]
then
_LB_PACKAGES="${_LB_PACKAGES} ${PACKAGE}"
else