summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-09-15 15:29:55 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 12:00:19 +0100
commitcb24cbbb0262a9273cc41f0e3355c94e717bcff3 (patch)
tree2dd5f1067949fe113dde24b765ea0bb58c13ff1b /meta
parent217cccd0af91dbe82990d727566c8cb3f482d1ec (diff)
downloadpoky-cb24cbbb0262a9273cc41f0e3355c94e717bcff3.tar.gz
rpm: search for gpg if gpg2 is not found
Some (host) systems only have a binary named 'gpg' (e.g. Fedora) while some only have 'gpg2' (Ubuntu) and others have both of them (openSUSE). Currently the behavior of rpm-native with regards to GnuPG depends on the host platform: rpm(-native) is configured to use GnuPG binary of the host system if 'gpg2' is found in $PATH. Otherwise, rpm(-native) will default to using '%{_bindir}/gpg2' which will be pointing to a sysroot binary which usually does not exist. This patch changes rpm to look for both 'gpg' and 'gpg2' when searching for the GnuPG binary in PATH. This makes possible to create signed RPM packages on different host platforms, using the GnuPG binary of the host, without the need to explicitly define the gpg binary in bitbake configuration (via GPG_BIN variable). [YOCTO #8134] (From OE-Core rev: eb76b668e815fbecd18271808b871fc3b0f15e65) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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