summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-09-07 10:24:04 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-09 12:04:55 +0100
commit29362665c8ff388da389717d21f27c064cdda653 (patch)
tree950f24a46a1e00c9420123fed89a337c314e3ff4
parent05d0677c5a6eb60baffc25363f4baff0c9d1d178 (diff)
downloadpoky-29362665c8ff388da389717d21f27c064cdda653.tar.gz
librepo: upgrade 1.15.2 -> 1.16.0
Changelog: Implement OpenPGP using librpm API 0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch refreshed for 1.16.0 (From OE-Core rev: 05617d5636d3712c4374cf3590ff123f63e8e26a) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch21
-rw-r--r--meta/recipes-devtools/librepo/librepo_1.16.0.bb (renamed from meta/recipes-devtools/librepo/librepo_1.15.2.bb)2
2 files changed, 13 insertions, 10 deletions
diff --git a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
index d61d8fbf85..a0a4d490f1 100644
--- a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
+++ b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
@@ -12,16 +12,19 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 1 file changed, 2 insertions(+), 1 deletion(-) 12 1 file changed, 2 insertions(+), 1 deletion(-)
13 13
14diff --git a/CMakeLists.txt b/CMakeLists.txt 14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index a45d5c4..40249e6 100644 15index cd975a8..713cc87 100644
16--- a/CMakeLists.txt 16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
18@@ -32,7 +32,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) 18@@ -35,7 +35,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
19 PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl)
20 PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
21 FIND_PACKAGE(CURL 7.52.0 REQUIRED) 19 FIND_PACKAGE(CURL 7.52.0 REQUIRED)
22-FIND_PACKAGE(Gpgme REQUIRED)
23+PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
24+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
25 20
26 21 IF (USE_GPGME)
27 IF (WITH_ZCHUNK) 22- FIND_PACKAGE(Gpgme REQUIRED)
23+ PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
24+ set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
25 ELSE (USE_GPGME)
26 PKG_CHECK_MODULES(RPM REQUIRED rpm>=4.18.0)
27 ENDIF (USE_GPGME)
28--
292.34.1
30
diff --git a/meta/recipes-devtools/librepo/librepo_1.15.2.bb b/meta/recipes-devtools/librepo/librepo_1.16.0.bb
index 995301d601..4710a6b72a 100644
--- a/meta/recipes-devtools/librepo/librepo_1.15.2.bb
+++ b/meta/recipes-devtools/librepo/librepo_1.16.0.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;pr
10 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ 10 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
11 " 11 "
12 12
13SRCREV = "1a0a5fd2b040d00872118b32d09d1f79730897a2" 13SRCREV = "7c9af219abd49f8961542b7622fc82cfdaa572e3"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16