mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

createrepo-c: upgrade 0.21.1 -> 1.0.0

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2023-09-22 09:24:02 +02:00
committed by Richard Purdie
parent 2cd1c9fbfd
commit 45b0401d82
3 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch
View File

@@ -1,39 +0,0 @@
From 970b901e1999f415da8bac205f526c808ddad0ba Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 8 May 2023 10:40:43 +0200
Subject: [PATCH] src/cmd_parser.c: add a missing parameter name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This resolves the following error with older versions of gcc:
| /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’:
| /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
| 76 | duplicated_nevra_option_parser(const gchar *,
| | ^~~~~~~~~~~~~
| /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
| 78 | gpointer,
| | ^~~~~~~~
Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/366]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
src/cmd_parser.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cmd_parser.c b/src/cmd_parser.c
index 97c9ea7..63af7ea 100644
--- a/src/cmd_parser.c
+++ b/src/cmd_parser.c
@@ -73,9 +73,9 @@ struct CmdOptions _cmd_options = {
gboolean
-duplicated_nevra_option_parser(const gchar *,
+duplicated_nevra_option_parser(const gchar *option_name,
const gchar *value,
- gpointer,
+ gpointer data,
GError **error)
{
if (!g_strcmp0(value, "keep"))

3
meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb → meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb
View File

@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0001-include-rpm-rpmstring.h.patch \
file://0001-src-cmd_parser.c-add-a-missing-parameter-name.patch \
file://time64fix.patch \
"
SRCREV = "0652d7303ce236e596c83c29ccc9bee7868fce6e"
SRCREV = "0cc13920991b2fb8f87fb9d352bd3394c2983289"
S = "${WORKDIR}/git"

4
meta/recipes-extended/libsolv/libsolv_0.7.24.bb
View File

@@ -6,7 +6,7 @@ SECTION = "devel"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
DEPENDS = "expat zlib"
DEPENDS = "expat zlib zstd"
SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \
file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \
@@ -23,7 +23,7 @@ inherit cmake
PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}"
PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm"
EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON"
EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON -DENABLE_ZSTD_COMPRESSION=ON"
PACKAGES =+ "${PN}-tools ${PN}ext"