| Message ID | 1742439740-18703-1-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [V2] dnf: upgrade 4.22.0 -> 4.23.0 | expand |
On Thu Mar 20, 2025 at 4:02 AM CET, wangmy via lists.openembedded.org wrote: > From: Wang Mingyu <wangmy@fujitsu.com> > > 0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch > 0005-Do-not-prepend-installroot-to-logdir.patch > 0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch > refreshed for 4.23.0 > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- Hi, Thanks for your patch. I believe this is responsible of some failures we see on the autobuilder: ERROR: core-image-ptest-util-linux-1.0-r0 do_rootfs: Could not invoke dnf. Command '/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/recipe-sysroot-native/usr/bin/dnf -v --rpmverbosity=info -y -c /srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/rootfs/etc/dnf/dnf.conf --setopt=reposdir=/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/rootfs/etc/yum.repos.d --installroot=/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/rootfs --setopt=logdir=/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/temp --repofrompath=oe-repo,/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/oe-rootfs-repo makecache --refresh' returned 1: ... File "/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/conf/substitutions.py", line 57, in __setitem__ releasever_major, releasever_minor = ConfigParser.splitReleasever(value) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AttributeError: type object 'ConfigParser' has no attribute 'splitReleasever' https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/1155 https://autobuilder.yoctoproject.org/valkyrie/#/builders/50/builds/1242 Can you have a look at this issue please?
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch index 37359a5765..24b26f4cb8 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch +++ b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch @@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4aee99fb..9e2e9e9e 100644 +index a76b6ac..a2ba58c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4) +@@ -4,8 +4,8 @@ PROJECT (dnf NONE) INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake) @@ -24,3 +24,6 @@ index 4aee99fb..9e2e9e9e 100644 IF (NOT PYTHON_DESIRED) FIND_PACKAGE (PythonInterp REQUIRED) +-- +2.43.0 + diff --git a/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch index a1c58d6563..159dc32c75 100644 --- a/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch +++ b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py -index d3844df3..ac080f79 100644 +index 62b9434..14d4757 100644 --- a/dnf/cli/cli.py +++ b/dnf/cli/cli.py -@@ -954,7 +954,7 @@ class Cli(object): +@@ -1002,7 +1002,7 @@ class Cli(object): logger.warning(_("Unable to detect release version (use '--releasever' to specify " "release version)")) @@ -26,3 +26,6 @@ index d3844df3..ac080f79 100644 conf.prepend_installroot(opt) self.base._logging._setup_from_dnf_conf(conf) +-- +2.43.0 + diff --git a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 64ea7874d3..09af96048c 100644 --- a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e2e9e9e..2056089d 100644 +index a2ba58c..98aa9df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -19,7 +19,7 @@ ELSE () +@@ -20,7 +20,7 @@ ELSE () MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) ENDIF() @@ -22,3 +22,6 @@ index 9e2e9e9e..2056089d 100644 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") ADD_SUBDIRECTORY (dnf) +-- +2.43.0 + diff --git a/meta/recipes-devtools/dnf/dnf_4.22.0.bb b/meta/recipes-devtools/dnf/dnf_4.23.0.bb similarity index 98% rename from meta/recipes-devtools/dnf/dnf_4.22.0.bb rename to meta/recipes-devtools/dnf/dnf_4.23.0.bb index e5ac3c9824..fe3deb4344 100644 --- a/meta/recipes-devtools/dnf/dnf_4.22.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.23.0.bb @@ -20,7 +20,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc SRC_URI:append:class-native = " file://0001-dnf-write-the-log-lock-to-root.patch" -SRCREV = "da9a7066be8e1628d9453428d33685225cd9c90d" +SRCREV = "8fa4bb94a99eadaed91ad2ee51f27a4baafcebed" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"