diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:10 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
commit | eee41d341d28687286e09af027471764bad48132 (patch) | |
tree | 119387c138263e08942915686b441c5faa38205e /meta/recipes-devtools | |
parent | 3e180097a9ea5eb4f617b0948697e260df933f87 (diff) | |
download | poky-eee41d341d28687286e09af027471764bad48132.tar.gz |
libdnf: update 0.72.0 -> 0.73.0
(From OE-Core rev: 3680faea03afce24a27106932a255a68dcf0a867)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/armarch.patch | 16 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf_0.73.0.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.72.0.bb) | 2 |
7 files changed, 20 insertions, 21 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch index 791a32e748..046e09eab2 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9bb7630915c3e787732463a3e2064fe0e177101b Mon Sep 17 00:00:00 2001 | 1 | From 5d6db56791d326e6b486dca54fe2335af0225229 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 24 Nov 2016 14:33:07 +0200 | 3 | Date: Thu, 24 Nov 2016 14:33:07 +0200 |
4 | Subject: [PATCH 1/4] FindGtkDoc.cmake: drop the requirement for | 4 | Subject: [PATCH] FindGtkDoc.cmake: drop the requirement for |
5 | GTKDOC_SCANGOBJ_WRAPPER | 5 | GTKDOC_SCANGOBJ_WRAPPER |
6 | 6 | ||
7 | For some reason cmake is not able to find it when building in openembedded, | 7 | For some reason cmake is not able to find it when building in openembedded, |
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/cmake/modules/FindGtkDoc.cmake b/cmake/modules/FindGtkDoc.cmake | 16 | diff --git a/cmake/modules/FindGtkDoc.cmake b/cmake/modules/FindGtkDoc.cmake |
17 | index 92b2cc7..39f34bd 100644 | 17 | index 92b2cc7e..39f34bd5 100644 |
18 | --- a/cmake/modules/FindGtkDoc.cmake | 18 | --- a/cmake/modules/FindGtkDoc.cmake |
19 | +++ b/cmake/modules/FindGtkDoc.cmake | 19 | +++ b/cmake/modules/FindGtkDoc.cmake |
20 | @@ -52,7 +52,7 @@ find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin") | 20 | @@ -52,7 +52,7 @@ find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin") |
@@ -26,6 +26,3 @@ index 92b2cc7..39f34bd 100644 | |||
26 | VERSION_VAR GtkDoc_VERSION) | 26 | VERSION_VAR GtkDoc_VERSION) |
27 | 27 | ||
28 | # :: | 28 | # :: |
29 | -- | ||
30 | 2.11.0 | ||
31 | |||
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch index 08d0859953..223c1be218 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b87ae6860ea44996b677ad1c4a9793720b77c67c Mon Sep 17 00:00:00 2001 | 1 | From bf9bde4af952b67cc357d25b9863889099ea9665 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 7 Feb 2017 12:16:03 +0200 | 3 | Date: Tue, 7 Feb 2017 12:16:03 +0200 |
4 | Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is | 4 | Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is |
@@ -7,7 +7,6 @@ Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is | |||
7 | 7 | ||
8 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] | 8 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | CMakeLists.txt | 2 +- | 11 | CMakeLists.txt | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch index d483dd410b..27f76077d7 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c0a465ccae395871ab10932975e37894220bc6a1 Mon Sep 17 00:00:00 2001 | 1 | From a6b3bc4fb3db996cd6c5616a99c16d085704dae0 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 1 Jun 2021 10:23:59 +0800 | 3 | Date: Tue, 1 Jun 2021 10:23:59 +0800 |
4 | Subject: [PATCH] drop FindPythonInstDir.cmake | 4 | Subject: [PATCH] drop FindPythonInstDir.cmake |
@@ -37,6 +37,3 @@ index ed098ded..8b137891 100644 | |||
37 | -stdout.write(path)" | 37 | -stdout.write(path)" |
38 | -OUTPUT_VARIABLE PYTHON_INSTALL_DIR) | 38 | -OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
39 | + | 39 | + |
40 | -- | ||
41 | 2.18.1 | ||
42 | |||
diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch index 32f2bb6ad0..ecab47e5af 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0b8eceb9161711003cd25ab400cadde7c1601733 Mon Sep 17 00:00:00 2001 | 1 | From e40def862bdeb10da295b15c5904fe2829d391c7 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 30 Dec 2016 18:24:50 +0200 | 3 | Date: Fri, 30 Dec 2016 18:24:50 +0200 |
4 | Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module | 4 | Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module |
@@ -7,7 +7,6 @@ Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module | |||
7 | 7 | ||
8 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] | 8 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | CMakeLists.txt | 3 ++- | 11 | CMakeLists.txt | 3 ++- |
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | 12 | 1 file changed, 2 insertions(+), 1 deletion(-) |
diff --git a/meta/recipes-devtools/libdnf/libdnf/armarch.patch b/meta/recipes-devtools/libdnf/libdnf/armarch.patch index 99eaf1d521..63debdb58f 100644 --- a/meta/recipes-devtools/libdnf/libdnf/armarch.patch +++ b/meta/recipes-devtools/libdnf/libdnf/armarch.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From aa0f8b65feec64420a9b7b61cfcc8bcce161e14b Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 9 Nov 2023 10:29:31 +0000 | ||
4 | Subject: [PATCH] libdnf: Fix arm arch mapping issues for qemuarmv5 | ||
5 | |||
1 | We change the way rpm architectures work, we make the machine name the default machine | 6 | We change the way rpm architectures work, we make the machine name the default machine |
2 | specific package architecture. | 7 | specific package architecture. |
3 | 8 | ||
@@ -5,11 +10,14 @@ This arm mapping code can work or in the case of qemuarmv5, it doesn't as it cre | |||
5 | armv5hl which doesn't exist and causes errrors. We can simply remove it, we don't need it. | 10 | armv5hl which doesn't exist and causes errrors. We can simply remove it, we don't need it. |
6 | 11 | ||
7 | Upstream-Status: Inappropriate [Relies on OE rpm config] | 12 | Upstream-Status: Inappropriate [Relies on OE rpm config] |
13 | --- | ||
14 | libdnf/hy-util.cpp | 23 ----------------------- | ||
15 | 1 file changed, 23 deletions(-) | ||
8 | 16 | ||
9 | Index: git/libdnf/hy-util.cpp | 17 | diff --git a/libdnf/hy-util.cpp b/libdnf/hy-util.cpp |
10 | =================================================================== | 18 | index 9978c8e9..aa1369b6 100644 |
11 | --- git.orig/libdnf/hy-util.cpp | 19 | --- a/libdnf/hy-util.cpp |
12 | +++ git/libdnf/hy-util.cpp | 20 | +++ b/libdnf/hy-util.cpp |
13 | @@ -117,29 +117,6 @@ hy_detect_arch(char **arch) | 21 | @@ -117,29 +117,6 @@ hy_detect_arch(char **arch) |
14 | if (uname(&un) < 0) | 22 | if (uname(&un) < 0) |
15 | return DNF_ERROR_FAILED; | 23 | return DNF_ERROR_FAILED; |
diff --git a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch index 8b1a597200..e4f6d447f1 100644 --- a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch +++ b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dc83a79053597546b2b42fcf578f3a7727b13f3b Mon Sep 17 00:00:00 2001 | 1 | From 25229773a9d4472235278bb45f75439e56630cee Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <joe.slater@windriver.com> | 2 | From: Joe Slater <joe.slater@windriver.com> |
3 | Date: Wed, 22 Jul 2020 13:31:11 -0700 | 3 | Date: Wed, 22 Jul 2020 13:31:11 -0700 |
4 | Subject: [PATCH] libdnf: allow reproducible binary builds | 4 | Subject: [PATCH] libdnf: allow reproducible binary builds |
@@ -9,7 +9,6 @@ TESTDATADIR, since the default is guaranteed to be wrong for target builds. | |||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
10 | 10 | ||
11 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 11 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | CMakeLists.txt | 7 ++++++- | 13 | CMakeLists.txt | 7 ++++++- |
15 | 1 file changed, 6 insertions(+), 1 deletion(-) | 14 | 1 file changed, 6 insertions(+), 1 deletion(-) |
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.72.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.73.0.bb index a8685a1604..dc2ddf9492 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.72.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.73.0.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p | |||
13 | file://armarch.patch \ | 13 | file://armarch.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRCREV = "908dba63c9e18c86a2d81166ce7523559e65338c" | 16 | SRCREV = "1f30b3479528e8b62754f9047195c8e5a31f07ed" |
17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |