From patchwork Fri Dec 15 14:17:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 36436 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 E73CCC4829F for ; Fri, 15 Dec 2023 14:17:53 +0000 (UTC) Received: from a27-191.smtp-out.us-west-2.amazonses.com (a27-191.smtp-out.us-west-2.amazonses.com [54.240.27.191]) by mx.groups.io with SMTP id smtpd.web11.63606.1702649863298395552 for ; Fri, 15 Dec 2023 06:17:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=RdUUpUJI; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=kMiHUSQX; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.191, mailfrom: 0101018c6dd7194c-9ae0fb40-1c34-448c-8a5e-84500a99507c-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1702649862; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=cRIrPBxBYA29F8pnEJXSZSu5FHsl9Cl70wyxGQzd/Gk=; b=RdUUpUJIBw5ESwuOzuaEZun9SSXvlZGH9jhMI179EFupvu96vMx5rcFR3bUBOtCG dK0FY4F2Ex3vZcOcUPvFwzYLBphtUCLWoyniNq9nSpW5k1xMvliLpHnFljOlQu56mZY ECvdrEEpVOyxEYEjr4pP7YuxFThWTq/2/dRtSKHA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1702649862; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=cRIrPBxBYA29F8pnEJXSZSu5FHsl9Cl70wyxGQzd/Gk=; b=kMiHUSQXhjasNTcaZDVGrutyNapilpXWPrhdvamxitKeohbyaIRYW7srqveaYhJ9 A9/EKi4C2sZ245mm9aAxxCkyEtK9VqFDw+hH/CgdIYnM7yQYcoh34nQYdINRaMCWPGO QMexsWE6f31e0//aiIvPM5xdZqB7pCFURt/dXffQ= MIME-Version: 1.0 From: auh@yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] dnf: upgrading to 4.18.2 SUCCEEDED Message-ID: <0101018c6dd7194c-9ae0fb40-1c34-448c-8a5e-84500a99507c-000000@us-west-2.amazonses.com> Date: Fri, 15 Dec 2023 14:17:42 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.12.15-54.240.27.191 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 ; Fri, 15 Dec 2023 14:17:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192452 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *dnf* to *4.18.2* has Succeeded. Next steps: - apply the patch: git am 0001-dnf-upgrade-4.18.1-4.18.2.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 6dc7f708edb6163db4173d4c0609a984da17f477 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 15 Dec 2023 06:35:23 +0000 Subject: [PATCH] dnf: upgrade 4.18.1 -> 4.18.2 --- ...1-Corretly-install-tmpfiles.d-configuration.patch | 7 ++----- ...t-hardcode-etc-and-systemd-unit-directories.patch | 4 ++-- .../dnf/0001-dnf-write-the-log-lock-to-root.patch | 2 +- .../0001-set-python-path-for-completion_helper.patch | 8 +++----- .../0005-Do-not-prepend-installroot-to-logdir.patch | 12 +++++------- ...ot-set-PYTHON_INSTALL_DIR-by-running-python.patch | 2 +- .../dnf/dnf/0030-Run-python-scripts-using-env.patch | 11 ++++------- .../dnf/{dnf_4.18.1.bb => dnf_4.18.2.bb} | 2 +- 8 files changed, 19 insertions(+), 29 deletions(-) rename meta/recipes-devtools/dnf/{dnf_4.18.1.bb => dnf_4.18.2.bb} (98%) diff --git a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch b/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch index 6692b41a16..3890d5b2a0 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch +++ b/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch @@ -1,7 +1,7 @@ -From 05e059cd4e9910c00b32d377f4f98e3c8dde6bc6 Mon Sep 17 00:00:00 2001 +From cf281a61daf214837e699284414a6d8003edbd18 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 26 Jan 2017 16:36:20 +0200 -Subject: [PATCH 4/5] Corretly install tmpfiles.d configuration +Subject: [PATCH] Corretly install tmpfiles.d configuration Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin @@ -17,6 +17,3 @@ index f69c773e..3eb6d0e8 100644 @@ -1 +1 @@ -INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/) +INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/) --- -2.14.2 - 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 cb09f17a56..712b7940a2 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 ffb7942cc73c3d2c6aa7c689cdaf9bc0bcbc144b Mon Sep 17 00:00:00 2001 +From 5cbc1e74f96c31a2e228e79221fcdc0f9bbf34e3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 26 Jan 2017 16:25:47 +0200 Subject: [PATCH] Do not hardcode /etc and systemd unit directories @@ -11,7 +11,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73552967..38cf4fbf 100644 +index 4aee99fb..9e2e9e9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4) diff --git a/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch b/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch index eb0309d81a..df08408be5 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch +++ b/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch @@ -1,4 +1,4 @@ -From 3bd0faf58cc9ad531e6b63d5660c4b8316e8daed Mon Sep 17 00:00:00 2001 +From c15d64fb6f409aa1d68bc7d79a483ed6466ff5d5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 28 Apr 2020 15:55:00 +0200 Subject: [PATCH] dnf: write the log lock to root diff --git a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch index 448f6408bc..4ea1a6af33 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch +++ b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch @@ -1,16 +1,17 @@ -From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001 +From 80528288f6e8c676e5e0f17d000d6ba0cc257a1b Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Wed, 11 Mar 2020 22:10:02 +0000 Subject: [PATCH] set python path for completion_helper Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Jeremy Puhlman + --- dnf/cli/completion_helper.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in -index 351226759..2835cd3b6 100644 +index 0da0f2a2..9330d15b 100644 --- a/dnf/cli/completion_helper.py.in +++ b/dnf/cli/completion_helper.py.in @@ -1,4 +1,4 @@ @@ -19,6 +20,3 @@ index 351226759..2835cd3b6 100644 # # This file is part of dnf. # --- -2.23.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 aa20009cef..9470ea18a3 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 @@ -1,7 +1,7 @@ -From 6365389074a1b86962f3d8b22a2ead2202026a98 Mon Sep 17 00:00:00 2001 +From 1f558abc89a340b33ab8c770941991164ec7b33a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 11 Jan 2017 15:10:13 +0200 -Subject: [PATCH 5/5] Do not prepend installroot to logdir. +Subject: [PATCH] Do not prepend installroot to logdir. This would otherwise write the logs into rootfs/var/log (whereas we want them in $T), @@ -9,15 +9,16 @@ and will break installation of base-files rpm. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- dnf/cli/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py -index d2d9c082..82270ecf 100644 +index 1824bd00..4dcb1c1c 100644 --- a/dnf/cli/cli.py +++ b/dnf/cli/cli.py -@@ -920,7 +920,7 @@ class Cli(object): +@@ -944,7 +944,7 @@ class Cli(object): logger.warning(_("Unable to detect release version (use '--releasever' to specify " "release version)")) @@ -26,6 +27,3 @@ index d2d9c082..82270ecf 100644 conf.prepend_installroot(opt) self.base._logging._setup_from_dnf_conf(conf) --- -2.14.2 - 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 5cffc9dce1..945f820201 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 @@ -1,4 +1,4 @@ -From ceb1043c4f3de095e36908232320b74a4128a94e Mon Sep 17 00:00:00 2001 +From 9aaf258fd07a78826706474753a9149ca4fa014b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:29:07 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python diff --git a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch index eedbb5723f..d6718e33fc 100644 --- a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch +++ b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch @@ -1,7 +1,7 @@ -From 8d97b72a1d77149e2f9048d1ca6cef66da1a8aa5 Mon Sep 17 00:00:00 2001 +From f0824af53fef2e276d0242837de297bb8108da0a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:29:37 +0200 -Subject: [PATCH 2/5] Run python scripts using env +Subject: [PATCH] Run python scripts using env Otherwise the build tools hardcode the python path into them. @@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in -index 5b06aa26..891b4c24 100755 +index 17e35a05..28827e38 100755 --- a/bin/dnf-automatic.in +++ b/bin/dnf-automatic.in @@ -1,4 +1,4 @@ @@ -24,7 +24,7 @@ index 5b06aa26..891b4c24 100755 # # Copyright (C) 2014-2016 Red Hat, Inc. diff --git a/bin/dnf.in b/bin/dnf.in -index 645d0f06..bdf7b3c4 100755 +index 55ceb3f2..e38973c7 100755 --- a/bin/dnf.in +++ b/bin/dnf.in @@ -1,4 +1,4 @@ @@ -33,6 +33,3 @@ index 645d0f06..bdf7b3c4 100755 # The dnf executable script. # # Copyright (C) 2012-2016 Red Hat, Inc. --- -2.14.2 - diff --git a/meta/recipes-devtools/dnf/dnf_4.18.1.bb b/meta/recipes-devtools/dnf/dnf_4.18.2.bb similarity index 98% rename from meta/recipes-devtools/dnf/dnf_4.18.1.bb rename to meta/recipes-devtools/dnf/dnf_4.18.2.bb index f60b4794a6..987ca42c98 100644 --- a/meta/recipes-devtools/dnf/dnf_4.18.1.bb +++ b/meta/recipes-devtools/dnf/dnf_4.18.2.bb @@ -19,7 +19,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 = "41a287e2bd60b4d1100c329a274776ff32ba8740" +SRCREV = "1c43d0999178d492381ad0b43917ffd9c74016f8" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" S = "${WORKDIR}/git"