Message ID | 1693448992-27476-1-git-send-email-wangmy@fujitsu.com |
---|---|
State | New |
Headers | show |
Series | createrepo-c: upgrade 0.21.1 -> 1.0.0 | expand |
Hello, On 31/08/2023 10:29:52+0800, wangmy wrote: > From: Wang Mingyu <wangmy@fujitsu.com> > > 0001-src-cmd_parser.c-add-a-missing-parameter-name.patch > removed since it's included in 1.0.0 > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> This causes failures on the AB: https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/8000/steps/12/logs/stdio ERROR: core-image-minimal-1.0-r0 do_rootfs: Could not invoke dnf. Command '/home/pokybuild/yocto-worker/poky-tiny/build/build/tmp/work/qemux86-poky-linux-musl/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf -v --rpmverbosity=info -y -c /home/pokybuild/yocto-worker/poky-tiny/build/build/tmp/work/qemux86-poky-linux-musl/core-image-minimal/1.0/rootfs/etc/dnf/dnf.conf --setopt=reposdir=/home/pokybuild/yocto-worker/poky-tiny/build/build/tmp/work/qemux86-poky-linux-musl/core-image-minimal/1.0/rootfs/etc/yum.repos.d --installroot=/home/pokybuild/yocto-worker/poky-tiny/build/build/tmp/work/qemux86-poky-linux-musl/core-image-minimal/1.0/rootfs --setopt=logdir=/home/pokybuild/yocto-worker/poky-tiny/build/build/tmp/work/qemux86-poky-linux-musl/core-image-minimal/1.0/temp --repofrompath=oe-repo,/home/pokybuild/yocto-worker/poky-tiny/build/build/tmp/work/qemux86-poky-linux-musl/core-image-minimal/1.0/oe-rootfs-repo makecache --refresh' returned 1: DNF version: 4.16.1 cachedir: /home/pokybuild/yocto-worker/poky-tiny/build/build/tmp/work/qemux86-poky-linux-musl/core-image-minimal/1.0/rootfs/var/cache/dnf Added oe-repo repo from /home/pokybuild/yocto-worker/poky-tiny/build/build/tmp/work/qemux86-poky-linux-musl/core-image-minimal/1.0/oe-rootfs-repo Making cache files for all metadata files. oe-repo: has expired and will be refreshed. repo: downloading from remote: oe-repo oe-repo 101 MB/s | 281 kB 00:00 loading repo 'oe-repo' failure: Opening repository primary data has failed: No such file or directory Error: Loading repository 'oe-repo' has failed > --- > ...arser.c-add-a-missing-parameter-name.patch | 39 ------------------- > ...repo-c_0.21.1.bb => createrepo-c_1.0.0.bb} | 3 +- > 2 files changed, 1 insertion(+), 41 deletions(-) > delete mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0001-src-cmd_parser.c-add-a-missing-parameter-name.patch > rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.21.1.bb => createrepo-c_1.0.0.bb} (92%) > > 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 @@ > -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")) > 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 > similarity index 92% > rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb > rename to 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" > 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" > > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#186929): https://lists.openembedded.org/g/openembedded-core/message/186929 > Mute This Topic: https://lists.openembedded.org/mt/101066825/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 @@ -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")) 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 similarity index 92% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.21.1.bb rename to 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" 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"