diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2021-08-08 01:50:32 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2021-08-08 03:13:40 +0000 |
| commit | 54247ce1f96f04d16f1429007bac3607c8a0a39e (patch) | |
| tree | 77c9247357e1fbfb81a5066c11dfd0e12cd1ae21 /Makefile.inc1 | |
| parent | 1f88aa09417f1cfb3929fd37531b1ab51213c2d6 (diff) | |
| download | src-54247ce1f96f04d16f1429007bac3607c8a0a39e.tar.gz src-54247ce1f96f04d16f1429007bac3607c8a0a39e.zip | |
Makefile.inc1: Avoid hanging if pkg is not installed
For `pkg --version`, Redirect stdin from /dev/null to avoid waiting on
/usr/sbin/pkg's bootstrap prompt if the pkg package is not installed.
Also redirect stderr to /dev/null to discard the warning message in
this case.
Reported by: mjg
Fixes: 4e224e4be7c3 ("pkgbase: accommodate pkg < 1.17")
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index be8ac02353e1..2c1f72085110 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1889,7 +1889,8 @@ _pkgbootstrap: .PHONY .if make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages) PKG_ABI!=${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI .endif -PKG_BIN_VERSION!=${PKG_CMD} --version | awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}' +PKG_BIN_VERSION!=${PKG_CMD} --version </dev/null 2>/dev/null |\ + awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}' .if ${PKG_BIN_VERSION} < 11700 PKG_EXT= ${PKG_FORMAT} .else |