diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-08-31 16:17:11 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-08-31 16:54:40 +0200 |
| commit | 6f3e61be9b817232b5147586cbf9dbc3b28d1885 (patch) | |
| tree | 34db2c9cac9f1e223dc1f80c1646f6f4fa8b8177 /sys-apps/keyutils | |
| parent | net-misc/clusterssh update homepage URL (diff) | |
| download | gentoo-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')
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch | 20 | ||||
| -rw-r--r-- | sys-apps/keyutils/keyutils-1.5.10.ebuild | 1 | ||||
| -rw-r--r-- | sys-apps/keyutils/keyutils-1.5.11.ebuild | 1 |
3 files changed, 22 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)) diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild b/sys-apps/keyutils/keyutils-1.5.10.ebuild index f2610937efef..eb922e7c5c42 100644 --- a/sys-apps/keyutils/keyutils-1.5.10.ebuild +++ b/sys-apps/keyutils/keyutils-1.5.10.ebuild @@ -20,6 +20,7 @@ DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" PATCHES=( "${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch "${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch + "${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446 "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050 "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch ) diff --git a/sys-apps/keyutils/keyutils-1.5.11.ebuild b/sys-apps/keyutils/keyutils-1.5.11.ebuild index 4d30cfbe2eb8..dc870fbcc6f4 100644 --- a/sys-apps/keyutils/keyutils-1.5.11.ebuild +++ b/sys-apps/keyutils/keyutils-1.5.11.ebuild @@ -20,6 +20,7 @@ DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" PATCHES=( "${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch "${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch + "${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446 "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050 "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch ) |