All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Makefile: only run rpmspec if it exists
@ 2022-01-04  2:06 Adrian Ratiu
  0 siblings, 0 replies; only message in thread
From: Adrian Ratiu @ 2022-01-04  2:06 UTC (permalink / raw)
  To: David Howells; +Cc: keyrings

keyutils is built on many distros which do not use rpm like
Gentoo, ChromeOS or Arch. Older versions of bash silently
ignored the fact that rpmspec was missing, but newer bash
like v5.1 issue a new error:

/bin/sh: line 1: rpmspec: command not found

This happens every time the Makefile is parsed, including
for a simple "make" invocation or "make install" even if
a rpm package is not desired.

Arch Linux simply ignores this new error but Gentoo and
ChromeOS fail because portage actively monitors the build
log for errors like this. See bug report [1].

Fix this by calling rpmspec only if it exists.

[1] https://bugs.gentoo.org/760633

Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 599b145..1b39e8a 100644
--- a/Makefile
+++ b/Makefile
@@ -285,7 +285,7 @@ SRCBALL	:= rpmbuild/SOURCES/$(TARBALL)
 ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
 
 BUILDID	:= .local
-rpmver0	:= $(shell rpmspec -q ./keyutils.spec --define "buildid $(BUILDID)")
+rpmver0	:= $(shell if which rpmspec >/dev/null 2>&1; then rpmspec -q ./keyutils.spec --define "buildid $(BUILDID)"; fi)
 rpmver1	:= $(word 1,$(rpmver0))
 rpmver2	:= $(subst ., ,$(rpmver1))
 rpmver3	:= $(lastword $(rpmver2))
-- 
2.34.1


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2022-01-04  2:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-04  2:06 [PATCH] Makefile: only run rpmspec if it exists Adrian Ratiu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.