Signed-off-by: Hongxu Jia <hongxu....@windriver.com>
---
.../0001-Woverride-init-is-not-needed-with-gcc-9.patch | 2 +-
...nfigure.ac-use-a-custom-value-for-the-location-of-.patch | 6 +++---
.../gnupg/0002-use-pkgconfig-instead-of-npth-config.patch | 2 +-
...0004-autogen.sh-fix-find-version-for-beta-checking.patch | 2 +-
meta/recipes-support/gnupg/gnupg/relocate.patch | 2 +-
.../gnupg/{gnupg_2.5.3.bb => gnupg_2.5.4.bb} | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
rename meta/recipes-support/gnupg/{gnupg_2.5.3.bb => gnupg_2.5.4.bb} (97%)
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 fcd2528513..6299eb95ce 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 bbf09a439d56ddcae6f641c8f1cf7544e3dd4d6f Mon Sep 17 00:00:00 2001
+From 690faa62529c584cd80c8eaa56210ec1e4a96d7f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.k...@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 6e2f8d6fe6..ed94145833 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 c9cef60c7be6a5cb5a9557117f4d285278cc6f47 Mon Sep 17 00:00:00 2001
+From c9392c615a95c965dd58b0896cb3b87deafc62a4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kana...@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.kana...@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 6252d57..1da2c6f 100644
+index 23a9101..3e10021 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1911,7 +1911,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
+@@ -1908,7 +1908,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/0002-use-pkgconfig-instead-of-npth-config.patch
b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
index 9c87788e80..2d23ca1e66 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 7c0163fd17b78284495da382023074ee7dd629b6 Mon Sep 17 00:00:00 2001
+From 9f7cf2e4770697c24f8d24ce9f79b8548120bbf8 Mon Sep 17 00:00:00 2001
From: Saul Wold <s...@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 3b4b01721a..fc7d964ec4 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 24ae21dce9fc7546468580ab37db3bf9559e6efc Mon Sep 17 00:00:00 2001
+From 4d8cc1982273d571b4e80fe981878d0fa5884236 Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong....@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 b67744419e..1ae8a564d4 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From db9e4933176b7919077120cedb8a8b0a40c2115b Mon Sep 17 00:00:00 2001
+From 917a98f9380d581548f3cbb59428cee3a5c29bae Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.bur...@intel.com>
Date: Wed, 19 Sep 2018 14:44:40 +0100
Subject: [PATCH] Allow the environment to override where gnupg looks for its
diff --git a/meta/recipes-support/gnupg/gnupg_2.5.3.bb
b/meta/recipes-support/gnupg/gnupg_2.5.4.bb
similarity index 97%
rename from meta/recipes-support/gnupg/gnupg_2.5.3.bb
rename to meta/recipes-support/gnupg/gnupg_2.5.4.bb
index cca4feaf6c..e6a7e3fb40 100644
--- a/meta/recipes-support/gnupg/gnupg_2.5.3.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.5.4.bb
@@ -23,7 +23,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] =
"23128b136aed4e5121e793d1b6c60ee50c8007a9d926c1313e524d05386b54ac"
+SRC_URI[sha256sum] =
"f8cb2ac6c9f17f81e3541c62158764910fad5c3a0765e00b398c41a32bc4e0ea"
EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#211523):
https://lists.openembedded.org/g/openembedded-core/message/211523
Mute This Topic: https://lists.openembedded.org/mt/111228040/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
