From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id CE18472A78 for ; Thu, 17 Sep 2015 11:56:22 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 17 Sep 2015 04:56:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,546,1437462000"; d="scan'208";a="791672055" Received: from marquiz.fi.intel.com ([10.237.72.155]) by fmsmga001.fm.intel.com with ESMTP; 17 Sep 2015 04:56:21 -0700 Message-ID: <1442490980.11206.28.camel@linux.intel.com> From: Markus Lehtonen To: Gary Thomas Date: Thu, 17 Sep 2015 14:56:20 +0300 In-Reply-To: <55F818FF.2060605@mlbassoc.com> References: <1442322326-10462-1-git-send-email-markus.lehtonen@linux.intel.com> <55F818FF.2060605@mlbassoc.com> X-Mailer: Evolution 3.12.11 Mime-Version: 1.0 Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH] rpm: search for gpg if gpg2 is not found X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2015 11:56:23 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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 > > --- > > .../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 > > +--- > > + 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 > ------------------------------------------------------------