diff mbox series

[06/29] dnf: upgrade 4.23.0 -> 4.24.0

Message ID 20251105234712.446-6-wangmy@fujitsu.com
State New
Headers show
Series [01/29] adwaita-icon-theme: upgrade 48.0 -> 49.0 | expand

Commit Message

Wang Mingyu Nov. 5, 2025, 11:46 p.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
refreshed for 4.24.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...1-Do-not-hardcode-etc-and-systemd-unit-directories.patch | 6 +++---
 meta/recipes-devtools/dnf/{dnf_4.23.0.bb => dnf_4.24.0.bb}  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/dnf/{dnf_4.23.0.bb => dnf_4.24.0.bb} (98%)

Comments

Mathieu Dubois-Briand Nov. 7, 2025, 11:51 a.m. UTC | #1 
On Thu Nov 6, 2025 at 12:46 AM CET, wangmy via lists.openembedded.org wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
> refreshed for 4.24.0
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---

Hi Wang,

Thanks for the update.

It look likes this is breaking dnf while generating images:

ERROR: core-image-minimal-1.0-r0 do_rootfs: Could not invoke dnf. Command '/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf -v --rpmverbosity=info -y -c /srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/dnf/dnf.conf --setopt=reposdir=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/yum.repos.d --installroot=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/rootfs --setopt=logdir=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/temp --repofrompath=oe-repo,/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/oe-rootfs-repo makecache --refresh' returned 1:
Traceback (most recent call last):
  File "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf.real", line 56, in <module>
    from dnf.cli import main
  File "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/__init__.py", line 30, in <module>
    import dnf.base
  File "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/base.py", line 35, in <module>
    from dnf.db.history import SwdbInterface
  File "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/db/history.py", line 287, in <module>
    class SwdbInterface(object):
    ...<243 lines>...
            return result
  File "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/db/history.py", line 430, in SwdbInterface
    persistence=libdnf.transaction.TransactionPersistence_UNKNOWN):
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AttributeError: module 'libdnf.transaction' has no attribute 'TransactionPersistence_UNKNOWN'. Did you mean: 'TransactionItemState_UNKNOWN'?


https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/2699
https://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/2745

Can you have a look at this error?

Thanks,
Mathieu
Wang Mingyu Nov. 11, 2025, 7:58 a.m. UTC | #2 
I have summited another patch of libdnf to solve this problem.

  --
Best Regards
---------------------------------------------------
Wang Mingyu
FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST)
No.6 Wenzhu Road, Nanjing, 210012, China
TEL：+86+25-86630566--8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: wangmy@fujitsu.com

> -----Original Message-----
> From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> Sent: Friday, November 7, 2025 7:51 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 06/29] dnf: upgrade 4.23.0 -> 4.24.0
> 
> On Thu Nov 6, 2025 at 12:46 AM CET, wangmy via lists.openembedded.org
> wrote:
> > From: Wang Mingyu <wangmy@fujitsu.com>
> >
> > 0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
> > refreshed for 4.24.0
> >
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > ---
> 
> Hi Wang,
> 
> Thanks for the update.
> 
> It look likes this is breaking dnf while generating images:
> 
> ERROR: core-image-minimal-1.0-r0 do_rootfs: Could not invoke dnf. Command
> '/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_
> 64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf -v
> --rpmverbosity=info -y -c
> /srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_6
> 4-poky-linux/core-image-minimal/1.0/rootfs/etc/dnf/dnf.conf
> --setopt=reposdir=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/
> work/genericx86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/yum.repos.
> d
> --installroot=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/
> genericx86_64-poky-linux/core-image-minimal/1.0/rootfs
> --setopt=logdir=/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/wo
> rk/genericx86_64-poky-linux/core-image-minimal/1.0/temp
> --repofrompath=oe-repo,/srv/pokybuild/yocto-worker/genericx86-64/build/build
> /tmp/work/genericx86_64-poky-linux/core-image-minimal/1.0/oe-rootfs-repo
> makecache --refresh' returned 1:
> Traceback (most recent call last):
>   File
> "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_
> 64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf.real",
> line 56, in <module>
>     from dnf.cli import main
>   File
> "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_
> 64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13
> /site-packages/dnf/__init__.py", line 30, in <module>
>     import dnf.base
>   File
> "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_
> 64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13
> /site-packages/dnf/base.py", line 35, in <module>
>     from dnf.db.history import SwdbInterface
>   File
> "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_
> 64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13
> /site-packages/dnf/db/history.py", line 287, in <module>
>     class SwdbInterface(object):
>     ...<243 lines>...
>             return result
>   File
> "/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/genericx86_
> 64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13
> /site-packages/dnf/db/history.py", line 430, in SwdbInterface
>     persistence=libdnf.transaction.TransactionPersistence_UNKNOWN):
> 
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> AttributeError: module 'libdnf.transaction' has no attribute
> 'TransactionPersistence_UNKNOWN'. Did you mean:
> 'TransactionItemState_UNKNOWN'?
> 
> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/2699
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/2745
> 
> Can you have a look at this error?
> 
> Thanks,
> Mathieu
> 
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
diff mbox series

Patch

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..9d978cdc5f 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
@@ -1,4 +1,4 @@ 
-From 3ca6d14fbc6419ff6239b4ba16f77da20fb31d03 Mon Sep 17 00:00:00 2001
+From c2b2b91b58f4531d4baf0a01f5d868d71e577a84 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 26 Jan 2017 16:25:47 +0200
 Subject: [PATCH] Do not hardcode /etc and systemd unit directories
@@ -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 e71e9517..8fcb2069 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4)
+@@ -3,8 +3,8 @@ PROJECT (dnf NONE)
  
  INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake)
  
diff --git a/meta/recipes-devtools/dnf/dnf_4.23.0.bb b/meta/recipes-devtools/dnf/dnf_4.24.0.bb
similarity index 98%
rename from meta/recipes-devtools/dnf/dnf_4.23.0.bb
rename to meta/recipes-devtools/dnf/dnf_4.24.0.bb
index 927a8d8930..d40b85c4b0 100644
--- a/meta/recipes-devtools/dnf/dnf_4.23.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.24.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 = "8fa4bb94a99eadaed91ad2ee51f27a4baafcebed"
+SRCREV = "e47634fbe3565d0580e89ec21adb7c1b308642ce"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit cmake gettext bash-completion setuptools3-base systemd