From patchwork Tue Mar 18 06:21:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 59356 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B25F9C36002 for ; Tue, 18 Mar 2025 06:22:12 +0000 (UTC) Received: from esa3.hc1455-7.c3s2.iphmx.com (esa3.hc1455-7.c3s2.iphmx.com [207.54.90.49]) by mx.groups.io with SMTP id smtpd.web11.5353.1742278929138044005 for ; Mon, 17 Mar 2025 23:22:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=fj2 header.b=oomMvESa; spf=pass (domain: fujitsu.com, ip: 207.54.90.49, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1742278930; x=1773814930; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=FbdQRmjdXe9pIF7VWyAfMrX/uNDFsQlB98DfHDGmExQ=; b=oomMvESa3Daus8Zxz74nLTcR1VSF6bLmFSoXTRdta9Uz4gLlcjfR92CN XFWv2rSY6yzq5WbmuwwQDwHb+Y+l0cDkC+GX4HWcKsShriZNHReeA1Zdi +LTI19CV4LzRlkEWR9iIvRHS42tm7D1Ao2fblvind6+TxRNu0YVgRJWBb XhtUiux8Q+gpXGSxLzir0v4isK3dx4wP3UocA+WnaRHM8poXQlAttPSyS f0Ck2JaSOhoTk2BchuaNyY+Pu8KV1EznMoyIG/dStZ6Vj7wST4QrBgXN3 4StBLN5OfJ6+NxD4Cy8U4gg5QD5IyuXAZHKpAoamjdh5g+xPbwVFS2i5I Q==; X-CSE-ConnectionGUID: 6SLwhLNCQs2SVPUAunNwIg== X-CSE-MsgGUID: imzIH3iIQhCrSmJY68Q9Fw== X-IronPort-AV: E=McAfee;i="6700,10204,11376"; a="193422760" X-IronPort-AV: E=Sophos;i="6.14,256,1736780400"; d="scan'208";a="193422760" Received: from unknown (HELO oym-r4.gw.nic.fujitsu.com) ([210.162.30.92]) by esa3.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2025 15:22:06 +0900 Received: from oym-m1.gw.nic.fujitsu.com (oym-nat-oym-m1.gw.nic.fujitsu.com [192.168.87.58]) by oym-r4.gw.nic.fujitsu.com (Postfix) with ESMTP id C01B7DBB81 for ; Tue, 18 Mar 2025 15:22:04 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by oym-m1.gw.nic.fujitsu.com (Postfix) with ESMTP id 85A41D8ADF for ; Tue, 18 Mar 2025 15:22:04 +0900 (JST) Received: from localhost.localdomain.localdomain (unknown [10.193.128.200]) by edo.cn.fujitsu.com (Postfix) with ESMTP id 1C5EE1A00A1; Tue, 18 Mar 2025 14:22:04 +0800 (CST) From: wangmy@fujitsu.com To: openembedded-core@lists.openembedded.org Cc: Wang Mingyu Subject: [OE-core] [PATCH 03/12] dnf: upgrade 4.22.0 -> 4.23.0 Date: Tue, 18 Mar 2025 14:21:43 +0800 Message-Id: <1742278912-2989-3-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1742278912-2989-1-git-send-email-wangmy@fujitsu.com> References: <1742278912-2989-1-git-send-email-wangmy@fujitsu.com> List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 18 Mar 2025 06:22:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213169 From: Wang Mingyu 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 --- ...-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} | 5 +---- 4 files changed, 16 insertions(+), 10 deletions(-) rename meta/recipes-devtools/dnf/{dnf_4.22.0.bb => dnf_4.23.0.bb} (92%) 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 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 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 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 92% rename from meta/recipes-devtools/dnf/dnf_4.22.0.bb rename to meta/recipes-devtools/dnf/dnf_4.23.0.bb index e5ac3c9824..47ae69f940 100644 --- a/meta/recipes-devtools/dnf/dnf_4.22.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.23.0.bb @@ -10,9 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protocol=https \ file://0001-Corretly-install-tmpfiles.d-configuration.patch \ - file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ - file://0005-Do-not-prepend-installroot-to-logdir.patch \ - file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ file://0001-set-python-path-for-completion_helper.patch \ file://0001-lock.py-fix-Exception-handling.patch \ @@ -20,7 +17,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\d+(\.\d+)+)" S = "${WORKDIR}/git"