commit: 6f3e61be9b817232b5147586cbf9dbc3b28d1885 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Fri Aug 31 14:17:11 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Aug 31 14:54:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3e61be
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 .../files/keyutils-1.5.10-silence-rpm-check.patch | 20 ++++++++++++++++++++ sys-apps/keyutils/keyutils-1.5.10.ebuild | 1 + sys-apps/keyutils/keyutils-1.5.11.ebuild | 1 + 3 files changed, 22 insertions(+) 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 00000000000..dafd7de8dd9 --- /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 f2610937efe..eb922e7c5c4 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 4d30cfbe2eb..dc870fbcc6f 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 )
