summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch29
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.14.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch b/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
new file mode 100644
index 0000000000..7894a4263d
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
@@ -0,0 +1,29 @@
1configure.ac: search for both gpg2 and gpg
2
3On some platforms the GnuPG binary is named 'gpg2' whereas others have 'gpg'.
4This patch increases compatibility by searching for 'gpg' in addition to
5'gpg2'.
6
7Upstream-Status: Pending
8
9Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
10---
11 configure.ac | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/configure.ac b/configure.ac
15index 6746b4c..f6922ae 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -562,7 +562,7 @@ AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
19 AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
20 AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
21 AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH)
22-AC_PATH_PROG(__GPG, gpg2, %{_bindir}/gpg2, $MYPATH)
23+AC_PATH_PROGS(__GPG, [gpg2 gpg], %{_bindir}/gpg2, $MYPATH)
24 AC_PATH_PROG(__GSR, gsr, %{_bindir}/gsr, $MYPATH)
25 AC_PATH_PROG(__GST_INSPECT, gst-inspect-0.10, %{_bindir}/gst-inspect-0.10, $MYPATH)
26 AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH)
27--
282.1.4
29
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 1f9a4bd977..b450c6fc39 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -98,6 +98,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
98 file://rpm-check-rootpath-reasonableness.patch \ 98 file://rpm-check-rootpath-reasonableness.patch \
99 file://rpm-macros.in-disable-external-key-server.patch \ 99 file://rpm-macros.in-disable-external-key-server.patch \
100 file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ 100 file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \
101 file://configure.ac-check-for-both-gpg2-and-gpg.patch \
101 " 102 "
102 103
103# Uncomment the following line to enable platform score debugging 104# Uncomment the following line to enable platform score debugging