From patchwork Thu Feb 15 17:32:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 39430 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 37A89C54764 for ; Thu, 15 Feb 2024 17:32:39 +0000 (UTC) Received: from a27-192.smtp-out.us-west-2.amazonses.com (a27-192.smtp-out.us-west-2.amazonses.com [54.240.27.192]) by mx.groups.io with SMTP id smtpd.web11.20330.1708018344937596863 for ; Thu, 15 Feb 2024 09:32:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=hEYotTOP; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=n9uvkRak; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.192, mailfrom: 0101018dadd3a110-6ecb53c9-1380-4d67-827e-ee835743c64c-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=1708018344; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=THsroHmD5aRXLgO3V5+8n1INGpi7jM7YlpnyJgQsxRQ=; b=hEYotTOPfg4Udt3XsPwbIlDPwKFIsYSmdc/F1FUvV46qWRKcP3x+SS8Wx5s7Sl/T 3buyaVXAjU+D0BHCVbGi1bB/WdO3zDrlI5eWmmUJtVzaSlD6n4B8XiBst0UXANzVJkl oh2JFK4PbD9FVthKCrIWFme+iWGKZ403TH3lyGzo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1708018344; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=THsroHmD5aRXLgO3V5+8n1INGpi7jM7YlpnyJgQsxRQ=; b=n9uvkRakicRI+0bDsb38Hj+HuyIGF8JEWxxDPgQI1N4lwcTMS+PLWmLwXhsRVs4R ZZssszDt7UOEn4rpQW4eOXLcltdZFrdgU5FWuIJHoBOC+BLvS1qZ55QobbS4bbCZqoX LNAcvQAdcSj3ipLqqNd1+JfFjQUP5tjVBKDd27hM= MIME-Version: 1.0 From: auh@yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] libdnf: upgrading to 0.73.0 SUCCEEDED Message-ID: <0101018dadd3a110-6ecb53c9-1380-4d67-827e-ee835743c64c-000000@us-west-2.amazonses.com> Date: Thu, 15 Feb 2024 17:32:24 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.02.15-54.240.27.192 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 ; Thu, 15 Feb 2024 17:32:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195582 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *libdnf* to *0.73.0* has Succeeded. Next steps: - apply the patch: git am 0001-libdnf-upgrade-0.72.0-0.73.0.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 e9420e6a015514400cdcd6bd8197ca55e808409f Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 15 Feb 2024 07:42:59 +0000 Subject: [PATCH] libdnf: upgrade 0.72.0 -> 0.73.0 --- ...ke-drop-the-requirement-for-GTKDOC_SCA.patch | 10 ++++------ ...-for-both-libsolv-and-libsolvext-libdn.patch | 2 +- .../0001-drop-FindPythonInstDir.cmake.patch | 6 ++---- ...riables-with-pkg-config-cmake-s-own-mo.patch | 2 +- .../libdnf/libdnf/armarch.patch | 17 +++++++++++++---- .../libdnf/enable_test_data_dir_set.patch | 2 +- .../{libdnf_0.72.0.bb => libdnf_0.73.0.bb} | 2 +- 7 files changed, 23 insertions(+), 18 deletions(-) rename meta/recipes-devtools/libdnf/{libdnf_0.72.0.bb => libdnf_0.73.0.bb} (97%) diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch index 791a32e748..8e2820c1b2 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch @@ -1,7 +1,7 @@ -From 9bb7630915c3e787732463a3e2064fe0e177101b Mon Sep 17 00:00:00 2001 +From 7d8c1916a2e4b7c1fb2a6020a3ea408a9dde6e06 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 24 Nov 2016 14:33:07 +0200 -Subject: [PATCH 1/4] FindGtkDoc.cmake: drop the requirement for +Subject: [PATCH] FindGtkDoc.cmake: drop the requirement for GTKDOC_SCANGOBJ_WRAPPER For some reason cmake is not able to find it when building in openembedded, @@ -9,12 +9,13 @@ and it's bundled with the source code anyway. Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] Signed-off-by: Alexander Kanavin + --- cmake/modules/FindGtkDoc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/FindGtkDoc.cmake b/cmake/modules/FindGtkDoc.cmake -index 92b2cc7..39f34bd 100644 +index 92b2cc7e..39f34bd5 100644 --- a/cmake/modules/FindGtkDoc.cmake +++ b/cmake/modules/FindGtkDoc.cmake @@ -52,7 +52,7 @@ find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin") @@ -26,6 +27,3 @@ index 92b2cc7..39f34bd 100644 VERSION_VAR GtkDoc_VERSION) # :: --- -2.11.0 - diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch index 08d0859953..1f4d7110df 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch @@ -1,4 +1,4 @@ -From b87ae6860ea44996b677ad1c4a9793720b77c67c Mon Sep 17 00:00:00 2001 +From c6e71bca83cb956fde55529c3e5cf742915fc040 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Feb 2017 12:16:03 +0200 Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch index d483dd410b..eda01bbba8 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch @@ -1,4 +1,4 @@ -From c0a465ccae395871ab10932975e37894220bc6a1 Mon Sep 17 00:00:00 2001 +From 8740e452af3ec4bac303c0e302c605c99e3031f4 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 1 Jun 2021 10:23:59 +0800 Subject: [PATCH] drop FindPythonInstDir.cmake @@ -21,6 +21,7 @@ Yocto setting Upstream-Status: Inappropriate [Yocto specific] Signed-off-by: Hongxu Jia + --- cmake/modules/FindPythonInstDir.cmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) @@ -37,6 +38,3 @@ index ed098ded..8b137891 100644 -stdout.write(path)" -OUTPUT_VARIABLE PYTHON_INSTALL_DIR) + --- -2.18.1 - diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch index 32f2bb6ad0..28c033fdb3 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch @@ -1,4 +1,4 @@ -From 0b8eceb9161711003cd25ab400cadde7c1601733 Mon Sep 17 00:00:00 2001 +From 65e9c0bf12bb830fcabad42eea76c7981f6f4b29 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:24:50 +0200 Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module diff --git a/meta/recipes-devtools/libdnf/libdnf/armarch.patch b/meta/recipes-devtools/libdnf/libdnf/armarch.patch index 99eaf1d521..b5138dc727 100644 --- a/meta/recipes-devtools/libdnf/libdnf/armarch.patch +++ b/meta/recipes-devtools/libdnf/libdnf/armarch.patch @@ -1,3 +1,8 @@ +From 5f4cf0be38ba2a2af4ca30437d316ca90e68a065 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Thu, 9 Nov 2023 10:29:31 +0000 +Subject: [PATCH] libdnf: Fix arm arch mapping issues for qemuarmv5 + We change the way rpm architectures work, we make the machine name the default machine specific package architecture. @@ -6,10 +11,14 @@ armv5hl which doesn't exist and causes errrors. We can simply remove it, we don' Upstream-Status: Inappropriate [Relies on OE rpm config] -Index: git/libdnf/hy-util.cpp -=================================================================== ---- git.orig/libdnf/hy-util.cpp -+++ git/libdnf/hy-util.cpp +--- + libdnf/hy-util.cpp | 23 ----------------------- + 1 file changed, 23 deletions(-) + +diff --git a/libdnf/hy-util.cpp b/libdnf/hy-util.cpp +index 9978c8e9..aa1369b6 100644 +--- a/libdnf/hy-util.cpp ++++ b/libdnf/hy-util.cpp @@ -117,29 +117,6 @@ hy_detect_arch(char **arch) if (uname(&un) < 0) return DNF_ERROR_FAILED; diff --git a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch index 8b1a597200..8fb192fe30 100644 --- a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch +++ b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch @@ -1,4 +1,4 @@ -From dc83a79053597546b2b42fcf578f3a7727b13f3b Mon Sep 17 00:00:00 2001 +From 02a7bfb370d2b63abc9cd749b352e9d8162426e8 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Wed, 22 Jul 2020 13:31:11 -0700 Subject: [PATCH] libdnf: allow reproducible binary builds diff --git a/meta/recipes-devtools/libdnf/libdnf_0.72.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.73.0.bb similarity index 97% rename from meta/recipes-devtools/libdnf/libdnf_0.72.0.bb rename to meta/recipes-devtools/libdnf/libdnf_0.73.0.bb index a8685a1604..dc2ddf9492 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.72.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.73.0.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p file://armarch.patch \ " -SRCREV = "908dba63c9e18c86a2d81166ce7523559e65338c" +SRCREV = "1f30b3479528e8b62754f9047195c8e5a31f07ed" UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git"