summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-08-31 16:17:11 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-08-31 16:54:40 +0200
commit6f3e61be9b817232b5147586cbf9dbc3b28d1885 (patch)
tree34db2c9cac9f1e223dc1f80c1646f6f4fa8b8177 /sys-apps/keyutils/files
parentnet-misc/clusterssh update homepage URL (diff)
downloadgentoo-6f3e61be9b817232b5147586cbf9dbc3b28d1885.tar.gz
gentoo-6f3e61be9b817232b5147586cbf9dbc3b28d1885.tar.bz2
gentoo-6f3e61be9b817232b5147586cbf9dbc3b28d1885.zip
sys-apps/keyutils: silence check for /etc/rpm & /usr/lib/rpm
Closes: https://bugs.gentoo.org/656446 Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'sys-apps/keyutils/files')
-rw-r--r--sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
new file mode 100644
index 000000000000..dafd7de8dd91
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
@@ -0,0 +1,20 @@
+Hide
+
+> grep: /etc/rpm: No such file or directory
+> grep: /usr/lib/rpm: No such file or directory
+
+errors.
+
+Bug: https://bugs.gentoo.org/656446
+
+--- a/Makefile
++++ b/Makefile
+@@ -245,7 +245,7 @@ SRCBALL := rpmbuild/SOURCES/$(TARBALL)
+ ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
+
+ BUILDID := .local
+-dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
++dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null))
+ release := $(word 2,$(shell grep ^Release: $(SPECFILE)))
+ release := $(subst %{?dist},$(dist),$(release))
+ release := $(subst %{?buildid},$(BUILDID),$(release))