| Message ID | 20241127233600.4124020-2-hongxu.jia@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] man-db: upgrade 2.12.1 -> 2.13.0 | expand |
On Thu, 28 Nov 2024 at 00:36, hongxu via lists.openembedded.org <hongxu.jia=eng.windriver.com@lists.openembedded.org> wrote: > create_wrappers() { > - for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do > + for i in gpgconf gpg-agent gpg-connect-agent; do This needs to be replaced with gpg rather than simply dropped? You also need to adjust gcr recipe to use gpg instead of gpg2. Alex
On Wed, Nov 27, 2024 at 03:35:58PM -0800, hongxu via lists.openembedded.org wrote: > Due to upstream [build: Remove configure option --enable-gpg-is-gpg2][1], > drop option --enable-gpg-is-gpg2 and remove gpg2 installation > > Due to upsream [doc: Remove included yat2m and build HTML versions of > the man pages.][2], it used standard detection on yat2m other than build > it from source. Because no native recipe provide yat2m in Yocto, > explicitly disable doc via option --disable-doc > > [1] https://github.com/gpg/gnupg/commit/2125f228d36c0882a87bce433a18253154653d50 > [2] https://github.com/gpg/gnupg/commit/60c541f5880e8c603ca9372d3ca8b7ad68b97018 > Hi, I believe this patch is the source of some errors we get on the autobuilder: AssertionError: Command 'gpgconf --list-dirs --homedir /tmp/oeqa-feed-sign-pnrdr5tx; gpg -v --batch --homedir /tmp/oeqa-feed-sign-pnrdr5tx --import /srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-2070984/meta-selftest/files/signing/key.secret' returned non-zero exit status 2: sysconfdir:/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/x86_64-linux/gnupg-native/2.5.1/recipe-sysroot-native/etc/gnupg bindir:/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-2070984/tmp/work/x86_64-linux/gnupg-native/2.5.1/recipe-sysroot-native/usr/bin/../../usr/bin libexecdir:/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/x86_64-linux/gnupg-native/2.5.1/recipe-sysroot-native/usr/libexec libdir:/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/x86_64-linux/gnupg-native/2.5.1/recipe-sysroot-native/usr/lib/gnupg datadir:/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/x86_64-linux/gnupg-native/2.5.1/recipe-sysroot-native/usr/share/gnupg localedir:/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/x86_64-linux/gnupg-native/2.5.1/recipe-sysroot-native/usr/share/locale socketdir:/run/user/6000/gnupg/d.3hczswacngxo5d1e9ddydbj1 dirmngr-socket:/run/user/6000/gnupg/d.3hczswacngxo5d1e9ddydbj1/S.dirmngr keyboxd-socket:/run/user/6000/gnupg/d.3hczswacngxo5d1e9ddydbj1/S.keyboxd agent-ssh-socket:/run/user/6000/gnupg/d.3hczswacngxo5d1e9ddydbj1/S.gpg-agent.ssh agent-extra-socket:/run/user/6000/gnupg/d.3hczswacngxo5d1e9ddydbj1/S.gpg-agent.extra agent-browser-socket:/run/user/6000/gnupg/d.3hczswacngxo5d1e9ddydbj1/S.gpg-agent.browser agent-socket:/run/user/6000/gnupg/d.3hczswacngxo5d1e9ddydbj1/S.gpg-agent.yocto-native homedir:/tmp/oeqa-feed-sign-pnrdr5tx gpg: enabled compatibility flags: gpg: keybox '/tmp/oeqa-feed-sign-pnrdr5tx/pubring.kbx' created gpg: armor header: Version: GnuPG v1 gpg: sec rsa2048/7B31316B5D64AD52 2015-10-14 testuser (nocomment) <testuser@testemail.com> gpg: /tmp/oeqa-feed-sign-pnrdr5tx/trustdb.gpg: trustdb created gpg: using pgp trust model gpg: key 7B31316B5D64AD52: public key "testuser (nocomment) <testuser@testemail.com>" imported gpg: no running gpg-agent - starting '/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/x86_64-linux/gnupg-native/2.5.1/recipe-sysroot-native/usr/bin/gpg-agent' gpg: waiting for the agent to come up ... (5s) gpg: waiting for the agent to come up ... (4s) gpg: waiting for the agent to come up ... (3s) gpg: waiting for the agent to come up ... (2s) gpg: waiting for the agent to come up ... (1s) gpg: can't connect to the gpg-agent: IPC connect call failed gpg: no running gpg-agent - starting '/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/x86_64-linux/gnupg-native/2.5.1/recipe-sysroot-native/usr/bin/gpg-agent' gpg: waiting for the agent to come up ... (5s) gpg: waiting for the agent to come up ... (4s) gpg: waiting for the agent to come up ... (3s) gpg: waiting for the agent to come up ... (2s) gpg: waiting for the agent to come up ... (1s) gpg: can't connect to the gpg-agent: IPC connect call failed gpg: error getting the KEK: No agent running gpg: error reading '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-2070984/meta-selftest/files/signing/key.secret': No agent running gpg: import from '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-2070984/meta-selftest/files/signing/key.secret' failed: No agent running gpg: Total number processed: 0 gpg: imported: 1 gpg: secret keys read: 1 https://valkyrie.yoctoproject.org/#/builders/48/builds/464/steps/14/logs/stdio Can you have a look at this error, please ?
Thanks, I will fix in v2
OK, I will fix it
diff --git a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch index 77d7507edc..024f4a9f10 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch @@ -1,4 +1,4 @@ -From 6392cb71a23adfd601537049da4e5e06e51d2e50 Mon Sep 17 00:00:00 2001 +From 69d132c4cca738f148551af24932010fb1029ea1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 20 Dec 2018 17:37:48 -0800 Subject: [PATCH] Woverride-init is not needed with gcc 9 diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index 12b1447138..702cba4b71 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From a0e986b487891ef8e3bb41b95f969e00edd4923f Mon Sep 17 00:00:00 2001 +From d9ef954b602c17839c52a1d7dc73e2354e5fbbbb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e4f8c0e..fa75ec8 100644 +index 29592fd..7286862 100644 --- a/configure.ac +++ b/configure.ac -@@ -1925,7 +1925,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1911,7 +1911,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) diff --git a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch index fef05cf3c8..13c1a36366 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch @@ -1,4 +1,4 @@ -From 4a7d4d6e45c68708ec95335b0f11d6596b23095a Mon Sep 17 00:00:00 2001 +From 2e7534f3f7694ba426615b2061c235908097bb9b Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 22 Aug 2024 15:31:16 +0800 Subject: [PATCH] fix compile failure with musl @@ -20,17 +20,14 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+) diff --git a/scd/app.c b/scd/app.c -index 926ab79..7bf58a2 100644 +index 525950e..7180178 100644 --- a/scd/app.c +++ b/scd/app.c -@@ -23,6 +23,7 @@ - #include <stdlib.h> +@@ -24,6 +24,7 @@ #include <string.h> + #include <unistd.h> #include <npth.h> +#include <unistd.h> #include "scdaemon.h" #include "../common/exechelp.h" --- -2.27.0 - diff --git a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch index 945abb55ff..a7a6f03c7d 100644 --- a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch +++ b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch @@ -1,4 +1,4 @@ -From fa93b5f7c2da0e5846b80de9c6296966ca2a3d83 Mon Sep 17 00:00:00 2001 +From d5fc05998d7260fd94a558c53f6e6c35a384d163 Mon Sep 17 00:00:00 2001 From: Saul Wold <sgw@linux.intel.com> Date: Wed, 16 Aug 2017 11:16:30 +0800 Subject: [PATCH] use pkgconfig instead of npth config diff --git a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch index 761fd6c608..8aeb87dfd4 100644 --- a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch +++ b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch @@ -1,4 +1,4 @@ -From e8f67e3bbbdbaa17cfe88c1f7a8f488eb4936281 Mon Sep 17 00:00:00 2001 +From 21396a6e74d188a2198439aa27403c29c1dbcea8 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <wenzong.fan@windriver.com> Date: Wed, 16 Aug 2017 11:23:22 +0800 Subject: [PATCH] autogen.sh: fix find-version for beta checking diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 5c4d81f87a..6fcbc2d18f 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 4e556a5edde8a97312abae63f8e9b5f989ca5c91 Mon Sep 17 00:00:00 2001 +From 3c761174b0ec6f49f184f16a0b0eaade44264edc Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 3929108..d3a7b8f 100644 +index a73182e..9994a9a 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -1439,7 +1439,7 @@ gnupg_socketdir (void) diff --git a/meta/recipes-support/gnupg/gnupg_2.5.0.bb b/meta/recipes-support/gnupg/gnupg_2.5.1.bb similarity index 89% rename from meta/recipes-support/gnupg/gnupg_2.5.0.bb rename to meta/recipes-support/gnupg/gnupg_2.5.1.bb index 9cfdbdf0a4..6cc61a70bd 100644 --- a/meta/recipes-support/gnupg/gnupg_2.5.0.bb +++ b/meta/recipes-support/gnupg/gnupg_2.5.1.bb @@ -24,7 +24,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "2222c827d4e7087f15e7f72739d004abc1d05c6c5f0a5a12b24c6a6cc5d173fb" +SRC_URI[sha256sum] = "8a34bb318499867962c939e156666ada93ed81f01926590ac68f3ff79178375e" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ @@ -32,17 +32,14 @@ EXTRA_OECONF = "--disable-ldap \ --with-bzip2=${STAGING_LIBDIR}/.. \ --with-readline=${STAGING_LIBDIR}/.. \ --with-mailprog=${sbindir}/sendmail \ - --enable-gpg-is-gpg2 \ --disable-tests \ + --disable-doc \ " -# yat2m can be found from recipe-sysroot-native non-deterministically with different versioning otherwise -CACHED_CONFIGUREVARS += "ac_cv_path_YAT2M=./yat2m" # A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) PACKAGES =+ "${PN}-gpg" FILES:${PN}-gpg = " \ ${bindir}/gpg \ - ${bindir}/gpg2 \ ${bindir}/gpg-agent \ " @@ -63,7 +60,6 @@ do_configure:prepend () { } do_install:append() { - ln -sf gpg2 ${D}${bindir}/gpg ln -sf gpgv2 ${D}${bindir}/gpgv } @@ -76,7 +72,7 @@ do_install:append:class-nativesdk() { } create_wrappers() { - for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do + for i in gpgconf gpg-agent gpg-connect-agent; do create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 done }
Due to upstream [build: Remove configure option --enable-gpg-is-gpg2][1], drop option --enable-gpg-is-gpg2 and remove gpg2 installation Due to upsream [doc: Remove included yat2m and build HTML versions of the man pages.][2], it used standard detection on yat2m other than build it from source. Because no native recipe provide yat2m in Yocto, explicitly disable doc via option --disable-doc [1] https://github.com/gpg/gnupg/commit/2125f228d36c0882a87bce433a18253154653d50 [2] https://github.com/gpg/gnupg/commit/60c541f5880e8c603ca9372d3ca8b7ad68b97018 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- ...0001-Woverride-init-is-not-needed-with-gcc-9.patch | 2 +- ...e.ac-use-a-custom-value-for-the-location-of-.patch | 6 +++--- .../gnupg/0001-fix-compile-failure-with-musl.patch | 11 ++++------- .../0002-use-pkgconfig-instead-of-npth-config.patch | 2 +- ...utogen.sh-fix-find-version-for-beta-checking.patch | 2 +- meta/recipes-support/gnupg/gnupg/relocate.patch | 4 ++-- .../gnupg/{gnupg_2.5.0.bb => gnupg_2.5.1.bb} | 10 +++------- 7 files changed, 15 insertions(+), 22 deletions(-) rename meta/recipes-support/gnupg/{gnupg_2.5.0.bb => gnupg_2.5.1.bb} (89%)