* [PATCH] rpm: search for gpg if gpg2 is not found
@ 2015-09-15 13:05 Markus Lehtonen
2015-09-15 13:11 ` Gary Thomas
2015-09-15 13:58 ` Mark Hatle
0 siblings, 2 replies; 5+ messages in thread
From: Markus Lehtonen @ 2015-09-15 13:05 UTC (permalink / raw)
To: openembedded-core; +Cc: Bogdan Voiculescu
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]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
.../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
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 0000000..f5db167
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
@@ -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 <markus.lehtonen@linux.intel.com>
+---
+ 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
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 1f9a4bd..b450c6f 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
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
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] rpm: search for gpg if gpg2 is not found
2015-09-15 13:05 [PATCH] rpm: search for gpg if gpg2 is not found Markus Lehtonen
@ 2015-09-15 13:11 ` Gary Thomas
2015-09-17 11:56 ` Markus Lehtonen
2015-09-15 13:58 ` Mark Hatle
1 sibling, 1 reply; 5+ messages in thread
From: Gary Thomas @ 2015-09-15 13:11 UTC (permalink / raw)
To: openembedded-core
On 2015-09-15 07:05, Markus Lehtonen wrote:
> 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]
>
> Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
> ---
> .../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
>
> 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 0000000..f5db167
> --- /dev/null
> +++ b/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
> @@ -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?
> +This patch increases compatibility by searching for 'gpg' in addition to
> +'gpg2'.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
> +---
> + 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
> +
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> index 1f9a4bd..b450c6f 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
> 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
>
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] rpm: search for gpg if gpg2 is not found
2015-09-15 13:11 ` Gary Thomas
@ 2015-09-17 11:56 ` Markus Lehtonen
0 siblings, 0 replies; 5+ messages in thread
From: Markus Lehtonen @ 2015-09-17 11:56 UTC (permalink / raw)
To: Gary Thomas; +Cc: openembedded-core
Hi Gary,
On Tue, 2015-09-15 at 07:11 -0600, Gary Thomas wrote:
> On 2015-09-15 07:05, Markus Lehtonen wrote:
> > 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]
> >
> > Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
> > ---
> > .../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
> >
> > 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 0000000..f5db167
> > --- /dev/null
> > +++ b/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
> > @@ -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?
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
>
> > +This patch increases compatibility by searching for 'gpg' in addition to
> > +'gpg2'.
> > +
> > +Upstream-Status: Pending
> > +
> > +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
> > +---
> > + 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
> > +
> > diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> > index 1f9a4bd..b450c6f 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
> > 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
> >
>
> --
> ------------------------------------------------------------
> Gary Thomas | Consulting for the
> MLB Associates | Embedded world
> ------------------------------------------------------------
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] rpm: search for gpg if gpg2 is not found
2015-09-15 13:05 [PATCH] rpm: search for gpg if gpg2 is not found Markus Lehtonen
2015-09-15 13:11 ` Gary Thomas
@ 2015-09-15 13:58 ` Mark Hatle
2015-09-17 11:52 ` Markus Lehtonen
1 sibling, 1 reply; 5+ messages in thread
From: Mark Hatle @ 2015-09-15 13:58 UTC (permalink / raw)
To: Markus Lehtonen, openembedded-core; +Cc: Bogdan Voiculescu
On 9/15/15 8:05 AM, Markus Lehtonen wrote:
> 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]
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
> Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
> ---
> .../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
>
> 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 0000000..f5db167
> --- /dev/null
> +++ b/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
> @@ -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 <markus.lehtonen@linux.intel.com>
> +---
> + 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
> +
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> index 1f9a4bd..b450c6f 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
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] rpm: search for gpg if gpg2 is not found
2015-09-15 13:58 ` Mark Hatle
@ 2015-09-17 11:52 ` Markus Lehtonen
0 siblings, 0 replies; 5+ messages in thread
From: Markus Lehtonen @ 2015-09-17 11:52 UTC (permalink / raw)
To: Mark Hatle; +Cc: Bogdan Voiculescu, openembedded-core
Hi Mark,
On Tue, 2015-09-15 at 08:58 -0500, Mark Hatle wrote:
> On 9/15/15 8:05 AM, Markus Lehtonen wrote:
> > 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]
>
> 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.
> 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
> > Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
> > ---
> > .../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
> >
> > 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 0000000..f5db167
> > --- /dev/null
> > +++ b/meta/recipes-devtools/rpm/rpm/configure.ac-check-for-both-gpg2-and-gpg.patch
> > @@ -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 <markus.lehtonen@linux.intel.com>
> > +---
> > + 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
> > +
> > diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> > index 1f9a4bd..b450c6f 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
> > 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
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-09-17 11:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-15 13:05 [PATCH] rpm: search for gpg if gpg2 is not found Markus Lehtonen
2015-09-15 13:11 ` Gary Thomas
2015-09-17 11:56 ` Markus Lehtonen
2015-09-15 13:58 ` Mark Hatle
2015-09-17 11:52 ` Markus Lehtonen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox