summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-09-22 09:24:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-26 10:35:27 +0100
commit45b0401d82138f7d68fe8921d5a9e8c00cc8fb4a (patch)
tree17400c7515c7047c696104695ef342138f16fb5e /meta/recipes-devtools
parent2cd1c9fbfd8f0ddaec27c102b355ec3b96aefe38 (diff)
downloadpoky-45b0401d82138f7d68fe8921d5a9e8c00cc8fb4a.tar.gz
createrepo-c: upgrade 0.21.1 -> 1.0.0
Enable zstd in libsolv, as new createrepo_c is using that instead of zlib for repo metadata compression. (From OE-Core rev: 6df7e6f0661aa01a755cb0f1e8cc6a0491c7fddf) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch39
-rw-r--r--meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb (renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb)3
2 files changed, 1 insertions, 41 deletions
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch
deleted file mode 100644
index 0d1c6b08fb..0000000000
--- a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 970b901e1999f415da8bac205f526c808ddad0ba Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 8 May 2023 10:40:43 +0200
4Subject: [PATCH] src/cmd_parser.c: add a missing parameter name
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9This resolves the following error with older versions of gcc:
10| /srv/storage/alex/yocto/build-32/tmp/work/x86_64-linux/createrepo-c-native/0.21.1-r0/git/src/cmd_parser.c: In function ‘duplicated_nevra_option_parser’:
11| /srv/storage/alex/yocto/build-32/tmp/work/x86_64-linux/createrepo-c-native/0.21.1-r0/git/src/cmd_parser.c:76:32: error: parameter name omitted
12| 76 | duplicated_nevra_option_parser(const gchar *,
13| | ^~~~~~~~~~~~~
14| /srv/storage/alex/yocto/build-32/tmp/work/x86_64-linux/createrepo-c-native/0.21.1-r0/git/src/cmd_parser.c:78:32: error: parameter name omitted
15| 78 | gpointer,
16| | ^~~~~~~~
17
18Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/366]
19Signed-off-by: Alexander Kanavin <alex@linutronix.de>
20---
21 src/cmd_parser.c | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/src/cmd_parser.c b/src/cmd_parser.c
25index 97c9ea7..63af7ea 100644
26--- a/src/cmd_parser.c
27+++ b/src/cmd_parser.c
28@@ -73,9 +73,9 @@ struct CmdOptions _cmd_options = {
29
30
31 gboolean
32-duplicated_nevra_option_parser(const gchar *,
33+duplicated_nevra_option_parser(const gchar *option_name,
34 const gchar *value,
35- gpointer,
36+ gpointer data,
37 GError **error)
38 {
39 if (!g_strcmp0(value, "keep"))
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb
index 57f23b8dfd..9b109327c8 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \ 7SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \
8 file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ 8 file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
9 file://0001-include-rpm-rpmstring.h.patch \ 9 file://0001-include-rpm-rpmstring.h.patch \
10 file://0001-src-cmd_parser.c-add-a-missing-parameter-name.patch \
11 file://time64fix.patch \ 10 file://time64fix.patch \
12 " 11 "
13 12
14SRCREV = "0652d7303ce236e596c83c29ccc9bee7868fce6e" 13SRCREV = "0cc13920991b2fb8f87fb9d352bd3394c2983289"
15 14
16S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
17 16