rpm: search for gpg if gpg2 is not found
PATCH 1/1 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]
--- .../configure.ac-check-for-both-gpg2-and-gpg.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +29 -0
@@ -0,0 +1,29 @@ +configure.ac: search for both gpg2 and gpg + +On some platforms the GnuPG binary is named 'gpg2' whereas others have 'gpp'. +This patch increases compatibility by searching for 'gpg' in addition to +'gpg2'. + +Upstream-Status: Pending + +Signed-off-by: Markus Lehtonen <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6746b4c..f6922ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -562,7 +562,7 @@ AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) + AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) + AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) + AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH) +-AC_PATH_PROG(__GPG, gpg2, %{_bindir}/gpg2, $MYPATH) ++AC_PATH_PROGS(__GPG, [gpg2 gpg], %{_bindir}/gpg2, $MYPATH) + AC_PATH_PROG(__GSR, gsr, %{_bindir}/gsr, $MYPATH) + AC_PATH_PROG(__GST_INSPECT, gst-inspect-0.10, %{_bindir}/gst-inspect-0.10, $MYPATH) + AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH) +-- +2.1.4 +
meta/recipes-devtools/rpm/rpm_5.4.14.bb +1 -0
@@ -98,6 +98,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-check-rootpath-reasonableness.patch \ file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ + file://configure.ac-check-for-both-gpg2-and-gpg.patch \ " # Uncomment the following line to enable platform score debugging
Signature · 1 line
2.1.4
Quoted 29 lines · Markus Lehtonen
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_BINvariable).[YOCTO #8134]
Signed-off-by Markus Lehtonen <[email protected]>--- .../configure.ac-check-for-both-gpg2-and-gpg.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 + 2 files changed, 30 insertions(+)create mode 100644
meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patchmeta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +0
-0
meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch line 3
Quoted 3 lines
meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +3
-0@@ -0,0 +1,29 @@ +configure.ac: search for both gpg2 and gpg + +On some platforms the GnuPG binary is named 'gpg2' whereas others have 'gpp'.
^^^
Typo?
Quoted 39 lines
meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +26
-0+This patch increases compatibility by searching for 'gpg' in addition to +'gpg2'. + +Upstream-Status: Pending + +Signed-off-by: Markus Lehtonen <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6746b4c..f6922ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -562,7 +562,7 @@ AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) + AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) + AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) + AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH) +-AC_PATH_PROG(__GPG, gpg2, %{_bindir}/gpg2, $MYPATH) ++AC_PATH_PROGS(__GPG, [gpg2 gpg], %{_bindir}/gpg2, $MYPATH) + AC_PATH_PROG(__GSR, gsr, %{_bindir}/gsr, $MYPATH) + AC_PATH_PROG(__GST_INSPECT, gst-inspect-0.10, %{_bindir}/gst-inspect-0.10, $MYPATH) + AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH) +-- +2.1.4 +meta/recipes-devtools/rpm/rpm_5.4.14.bb +1
-0@@ -98,6 +98,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-check-rootpath-reasonableness.patch \ file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ + file://configure.ac-check-for-both-gpg2-and-gpg.patch \ " # Uncomment the following line to enable platform score debugging
Signature · 4 lines
------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------
Hi Gary,
Quoted 34 lines · Gary Thomas
Quoted 29 lines · Markus Lehtonen
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_BINvariable).[YOCTO #8134]
Signed-off-by Markus Lehtonen <[email protected]>--- .../configure.ac-check-for-both-gpg2-and-gpg.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 + 2 files changed, 30 insertions(+)create mode 100644
meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patchmeta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +0
-0meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch line 3
Quoted 3 lines
meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +3
-0@@ -0,0 +1,29 @@ +configure.ac: search for both gpg2 and gpg + +On some platforms the GnuPG binary is named 'gpg2' whereas others have 'gpp'.^^^
Quoted 1 line
Typo?
Oh, indeed. Well spotted, thanks! An updated patch with the typo fixed is found here:git://git.openembedded.org/openembedded-core-contrib marquiz/rpmsign
http://cgit.openembedded.org/openembedded-core-contrib/commit/?h=marquiz/rpmsign&id=b1d86be082e3cdb9dc1f3885e7b18c56a6094cc3
Cheers,
Markus
Quoted 46 lines
Quoted 40 lines
meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +26
-0+This patch increases compatibility by searching for 'gpg' in addition to +'gpg2'. + +Upstream-Status: Pending + +Signed-off-by: Markus Lehtonen <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6746b4c..f6922ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -562,7 +562,7 @@ AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) + AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) + AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) + AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH) +-AC_PATH_PROG(__GPG, gpg2, %{_bindir}/gpg2, $MYPATH) ++AC_PATH_PROGS(__GPG, [gpg2 gpg], %{_bindir}/gpg2, $MYPATH) + AC_PATH_PROG(__GSR, gsr, %{_bindir}/gsr, $MYPATH) + AC_PATH_PROG(__GST_INSPECT, gst-inspect-0.10, %{_bindir}/gst-inspect-0.10, $MYPATH) + AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH) +-- +2.1.4 +meta/recipes-devtools/rpm/rpm_5.4.14.bb +1
-0@@ -98,6 +98,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-check-rootpath-reasonableness.patch \ file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ + file://configure.ac-check-for-both-gpg2-and-gpg.patch \ " # Uncomment the following line to enable platform score debuggingSignature · 4 lines
------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------
Quoted 8 lines · Markus Lehtonen
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.
Quoted 7 lines
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_BINvariable).[YOCTO #8134]
The only concern I have with this change is that it may affect both native and target RPM. Please verify that the target RPM settings are still correct.
FYI, the value isn't used for anything but the initial setup of some RPM macro scripts. Typically I tell uses that they are responsible for providing the proper ~/.oerpmmacros file in order to instruct RPM where some of these types of tools are present. My file for instance:
%__gpg gpg2
%_gpg_name Test RPM Signing Key
--Mark
Quoted 55 lines
Signed-off-by Markus Lehtonen <[email protected]>--- .../configure.ac-check-for-both-gpg2-and-gpg.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patchmeta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +29
-0@@ -0,0 +1,29 @@ +configure.ac: search for both gpg2 and gpg + +On some platforms the GnuPG binary is named 'gpg2' whereas others have 'gpp'. +This patch increases compatibility by searching for 'gpg' in addition to +'gpg2'. + +Upstream-Status: Pending + +Signed-off-by: Markus Lehtonen <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6746b4c..f6922ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -562,7 +562,7 @@ AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) + AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) + AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) + AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH) +-AC_PATH_PROG(__GPG, gpg2, %{_bindir}/gpg2, $MYPATH) ++AC_PATH_PROGS(__GPG, [gpg2 gpg], %{_bindir}/gpg2, $MYPATH) + AC_PATH_PROG(__GSR, gsr, %{_bindir}/gsr, $MYPATH) + AC_PATH_PROG(__GST_INSPECT, gst-inspect-0.10, %{_bindir}/gst-inspect-0.10, $MYPATH) + AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH) +-- +2.1.4 +meta/recipes-devtools/rpm/rpm_5.4.14.bb +1
-0@@ -98,6 +98,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-check-rootpath-reasonableness.patch \ file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ + file://configure.ac-check-for-both-gpg2-and-gpg.patch \ " # Uncomment the following line to enable platform score debugging
Hi Mark,
Quoted 15 lines · Mark Hatle
Quoted 14 lines · Markus Lehtonen
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_BINvariable).
Quoted 4 lines
Quoted 1 line
[YOCTO #8134]
The only concern I have with this change is that it may affect both native and target RPM. Please verify that the target RPM settings are still correct.
The target rpm is not affected. Autotools in bitbake environment will not find host system binaries.
Quoted 7 lines
FYI, the value isn't used for anything but the initial setup of some RPM macro scripts. Typically I tell uses that they are responsible for providing the proper ~/.oerpmmacros file in order to instruct RPM where some of these types of tools are present. My file for instance:
%__gpg gpg2
%_gpg_name Test RPM Signing Key
Yes, this is possible, as well as usage of the GPG_BIN configuration variable. I just find it nicer for the user if signing works without similarly on all host platforms (without the need for these settings on some hosts, like Ubuntu).
Thanks,
Markus
Quoted 56 lines
Quoted 55 lines
Signed-off-by Markus Lehtonen <[email protected]>--- .../configure.ac-check-for-both-gpg2-and-gpg.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patchmeta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch new file +29
-0@@ -0,0 +1,29 @@ +configure.ac: search for both gpg2 and gpg + +On some platforms the GnuPG binary is named 'gpg2' whereas others have 'gpp'. +This patch increases compatibility by searching for 'gpg' in addition to +'gpg2'. + +Upstream-Status: Pending + +Signed-off-by: Markus Lehtonen <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6746b4c..f6922ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -562,7 +562,7 @@ AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) + AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) + AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) + AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH) +-AC_PATH_PROG(__GPG, gpg2, %{_bindir}/gpg2, $MYPATH) ++AC_PATH_PROGS(__GPG, [gpg2 gpg], %{_bindir}/gpg2, $MYPATH) + AC_PATH_PROG(__GSR, gsr, %{_bindir}/gsr, $MYPATH) + AC_PATH_PROG(__GST_INSPECT, gst-inspect-0.10, %{_bindir}/gst-inspect-0.10, $MYPATH) + AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH) +-- +2.1.4 +meta/recipes-devtools/rpm/rpm_5.4.14.bb +1
-0@@ -98,6 +98,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-check-rootpath-reasonableness.patch \ file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ + file://configure.ac-check-for-both-gpg2-and-gpg.patch \ " # Uncomment the following line to enable platform score debugging