diff mbox series

[V2] dnf: upgrade 4.22.0 -> 4.23.0

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

Commit Message

Wang Mingyu March 20, 2025, 3:02 a.m. UTC
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>
---
 ...-Do-not-hardcode-etc-and-systemd-unit-directories.patch | 7 +++++--
 .../dnf/0005-Do-not-prepend-installroot-to-logdir.patch    | 7 +++++--
 ...9-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 7 +++++--
 meta/recipes-devtools/dnf/{dnf_4.22.0.bb => dnf_4.23.0.bb} | 2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/dnf/{dnf_4.22.0.bb => dnf_4.23.0.bb} (98%)

Comments

Mathieu Dubois-Briand March 20, 2025, 8:02 a.m. UTC | #1
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?
Wang Mingyu March 26, 2025, 1:45 a.m. UTC | #2
After compiling the image, I did not encounter such an issue, so could you please tell me how to reproduce 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: openembedded-core@lists.openembedded.org
> <openembedded-core@lists.openembedded.org> On Behalf Of Mathieu
> Dubois-Briand via lists.openembedded.org
> Sent: Thursday, March 20, 2025 4:03 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH V2] dnf: upgrade 4.22.0 -> 4.23.0
> 
> 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/qemux8
> 6_64-poky-linux/core-image-ptest-util-linux/1.0/recipe-sysroot-native/usr/bin/d
> nf -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/t
> mp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/rootfs/etc/yu
> m.repos.d
> --installroot=/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/w
> ork/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-root
> fs-repo makecache --refresh' returned 1:
> ...
>   File
> "/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux8
> 6_64-poky-linux/core-image-ptest-util-linux/1.0/recipe-sysroot-native/usr/lib/py
> thon3.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?
> 
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Alexander Kanavin March 26, 2025, 9:25 a.m. UTC | #3
On Wed, 26 Mar 2025 at 02:45, wangmy via lists.openembedded.org
<wangmy=fujitsu.com@lists.openembedded.org> wrote:
>
> After compiling the image, I did not encounter such an issue, so could you please tell me how to reproduce this problem?

What is in your testing setup? I was able to reproduce this easily by
putting the update on top of current poky master and building
core-image-minimal.

Generally, please keep in mind: integrators do not have capacity (and,
often, knowledge) to look deeper into the issues caused by incoming
patches. They report the fail, drop the offending patch and move on to
other incoming patches.

Alex
Mathieu Dubois-Briand March 26, 2025, 10:10 a.m. UTC | #4
On Wed Mar 26, 2025 at 2:45 AM CET, Mingyu Wang (Fujitsu) wrote:
> After compiling the image, I did not encounter such an issue, so could you please tell me how to reproduce this problem?
>
>   --
> Best Regards
> ---------------------------------------------------

Hi,

Here is a reproducer sequence:

git clone ssh://git@push.yoctoproject.org/poky-ci-archive -b autobuilder.yoctoproject.org/valkyrie/a-full-1229
. ./poky-ci-archive/oe-init-build-env
bitbake core-image-minimal

And I get this error:

ERROR: core-image-minimal-1.0-r0 do_rootfs: Could not invoke dnf. Command '/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf -v --rpmverbosity=info -y -c /home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/dnf/dnf.conf --setopt=reposdir=/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/yum.repos.d --installroot=/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs --setopt=logdir=/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/temp --repofrompath=oe-repo,/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/oe-rootfs-repo makecache --refresh' returned 1:
Traceback (most recent call last):
  File "/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf.real", line 57, in <module>
    main.user_main(sys.argv[1:], exit_code=True)
    ~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/cli/main.py", line 208, in user_main
    errcode = main(args)
  File "/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/cli/main.py", line 67, in main
    return _main(base, args, cli_class, option_parser_class)
  File "/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/cli/main.py", line 102, in _main
    cli.configure(list(map(ucd, args)), option_parser())
    ~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/cli/cli.py", line 847, in configure
    self._read_conf_file(opts.releasever, opts.releasever_major, opts.releasever_minor)
    ~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/cli/cli.py", line 981, in _read_conf_file
    subst.update_from_etc(from_root, varsdir=conf._get_value('varsdir'))
    ~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.13/site-packages/dnf/conf/substitutions.py", line 89, in update_from_etc
    self[fsvar] = val
    ~~~~^^^^^^^
  File "/home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/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'

ERROR: Logfile of failure stored in: /home/mdubois-briand/swat/dnf/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/temp/log.do_rootfs.2565307
ERROR: Task (/home/mdubois-briand/swat/dnf/poky-ci-archive/meta/recipes-core/images/core-image-minimal.bb:do_rootfs) failed with exit code '1'
Mathieu Dubois-Briand March 26, 2025, 10:13 a.m. UTC | #5
On Wed Mar 26, 2025 at 11:10 AM CET, Mathieu Dubois-Briand wrote:
> On Wed Mar 26, 2025 at 2:45 AM CET, Mingyu Wang (Fujitsu) wrote:
> > After compiling the image, I did not encounter such an issue, so could you please tell me how to reproduce this problem?
> >
> >   --
> > Best Regards
> > ---------------------------------------------------
>
> Hi,
>
> Here is a reproducer sequence:
>
> git clone ssh://git@push.yoctoproject.org/poky-ci-archive -b autobuilder.yoctoproject.org/valkyrie/a-full-1229
> . ./poky-ci-archive/oe-init-build-env
> bitbake core-image-minimal
>

Sorry, you probably cannot fetch from this git, but you can instead use:

git clone git://git.yoctoproject.org/poky-ci-archive -b autobuilder.yoctoproject.org/valkyrie/a-full-1229
Wang Mingyu March 28, 2025, 1:38 a.m. UTC | #6
After synchronously upgrading libdnf, the issue with dnf was resolved. I have submitted the upgrade patch for libdnf

  --
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: openembedded-core@lists.openembedded.org
> <openembedded-core@lists.openembedded.org> On Behalf Of Mathieu
> Dubois-Briand via lists.openembedded.org
> Sent: Thursday, March 20, 2025 4:03 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH V2] dnf: upgrade 4.22.0 -> 4.23.0
> 
> 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/qemux8
> 6_64-poky-linux/core-image-ptest-util-linux/1.0/recipe-sysroot-native/usr/bin/d
> nf -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/t
> mp/work/qemux86_64-poky-linux/core-image-ptest-util-linux/1.0/rootfs/etc/yu
> m.repos.d
> --installroot=/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/w
> ork/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-root
> fs-repo makecache --refresh' returned 1:
> ...
>   File
> "/srv/pokybuild/yocto-worker/qemux86-64-ptest/build/build/tmp/work/qemux8
> 6_64-poky-linux/core-image-ptest-util-linux/1.0/recipe-sysroot-native/usr/lib/py
> thon3.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?
> 
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Mathieu Dubois-Briand March 28, 2025, 9:14 a.m. UTC | #7
On Fri Mar 28, 2025 at 2:38 AM CET, Mingyu Wang (Fujitsu) wrote:
> After synchronously upgrading libdnf, the issue with dnf was resolved. I have submitted the upgrade patch for libdnf
>
>   --
> Best Regards
> ---------------------------------------------------

Thanks, it seems better but it looks like we have a python dependency
issue:

Traceback (most recent call last):
  File "/srv/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
    return func(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^
  File "/srv/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
    return func(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^
  File "/srv/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
    return func(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^
  [Previous line repeated 1 more time]
  File "/srv/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/runtime/cases/dnf.py", line 35, in test_dnf_help
    self.dnf('--help')
  File "/srv/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/runtime/cases/dnf.py", line 23, in dnf
    self.assertEqual(status, expected, message)
AssertionError: 1 != 0 : dnf --help
Traceback (most recent call last):
  File "/usr/bin/dnf", line 56, in <module>
    from dnf.cli import main
  File "/usr/lib/python3.13/site-packages/dnf/__init__.py", line 30, in <module>
    import dnf.base
  File "/usr/lib/python3.13/site-packages/dnf/base.py", line 32, in <module>
    from dnf.comps import CompsQuery
  File "/usr/lib/python3.13/site-packages/dnf/comps.py", line 27, in <module>
    from dnf.exceptions import CompsError
  File "/usr/lib/python3.13/site-packages/dnf/exceptions.py", line 22, in <module>
    import dnf.util
  File "/usr/lib/python3.13/site-packages/dnf/util.py", line 28, in <module>
    import ctypes
ModuleNotFoundError: No module named 'ctypes'

https://autobuilder.yoctoproject.org/valkyrie/#/builders/40/builds/1267
https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/1303
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..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"