From patchwork Tue Mar 31 09:57:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 84887 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 76890FF60FA for ; Tue, 31 Mar 2026 09:57:19 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16606.1774951038262019735 for ; Tue, 31 Mar 2026 02:57:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=D3ivu2hX; spf=pass (domain: amarulasolutions.com, ip: 209.85.208.67, mailfrom: adam.duskett@amarulasolutions.com) Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-66bb4de745bso373089a12.0 for ; Tue, 31 Mar 2026 02:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1774951037; x=1775555837; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=88i2vswGLCwDgX7a0DwZxyHIiq+AG31CjA2c2S6sE0Y=; b=D3ivu2hXu4lxRBjAJwSHL+gRKTt71jnw3tyV5HPznnQ1OQWxE9ygCPiG1ziliPB8tp k6EGZaPzQ7PQ/qD2k9FbvfO991Dlr8pqGcBaJQP/wIjfdMmLKgg/En/cneEAUZbMCTD+ Q040CHV62rtXqzDOVHWBYozgwkc/EBxof6pYg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774951037; x=1775555837; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=88i2vswGLCwDgX7a0DwZxyHIiq+AG31CjA2c2S6sE0Y=; b=rUKYobQiGy15QmggjsEp78unR9DBH5XcgjIaO8uZ3GCOz1uOJojZfeJI0017UKRQ42 UG3pA565rHt/dpjJME3aEdUAvEXO0tYVCeh3XGk/MPxju0erbzvL7ehsp/+1HbqPk0/7 KG6XKDMKn2V7BK53YYsbbrqtF1kpjeW8Lhju4ud1eyjSyU5HT5jZIBitbcECwVFIKJZz hYP4pzmjX/T+mEBUyGYL0LSfq3pnpCmtKyysA+lx7gyfo8lswsgIJ24AXeq3W8IO7d5f 1iRIBpvgHqmt+t850Z0lIFccCzYn0o7YtMxlO93gOPXHhkPf2g76nX//bgFmo9IjvnAi /PNA== X-Gm-Message-State: AOJu0YzDQFdzLAffqd4XPdIy6RHdSzTZGQNYS2iUlzw8BZV1ElGFpDQx BwZ1fueZH+Blk9SxxKQjCYWnTnQbfI0h9bPuVBwAif08j+qPaTR3QxvFLAANd1tCEU8+YxBkR/i y6Pom88Os1w== X-Gm-Gg: ATEYQzw/TUcVRaFpihWhYL24/lRTn4B5+q6NxyefxYTpktpKG1l9nC+24Na3qq0gl0H PT8VxvPx05SDrZv5hNjowdUiN2AQ8ACdmDnWIywgXX3zxFGFCElCAfYn4TIgOJAHq9+fzmWu+R+ 96VjHIBHQPPvPKiqc5/OdqcMDYZpnK+nMbsHHX0FClBN42ypWynNFbWNedfJRYhsFZ1p5bh1rXm fTXl5evg/cUm3f5ZbLpfBAEr6WtVMLB+9dTpeAuazr0p7TC9r1GOFW6x3nFA9d4ms04UTyGZ9GB cDFoKDFy1vi2RhNs6YpmUUblU+pcVn8p+qVgdIp9sjE9URp/e8pzNPVYpN3jOSejn1HYxZWCpRb nr6en706PflLELGyZxjw9IhAltVCwzwBpCrUtjErUhHOqP9tNwHa+0Np6JVP6fpRtO9myVlVqT7 AMDZGgy5h1y6GwGiGjHO/s3XFIwMVsxc2DagXZZANRzwAWRazL7pMW36LBepkPW+zEiHDTnLgD9 Bdf3xf/KZQ= X-Received: by 2002:a05:6402:1ec9:b0:66b:aeb1:d979 with SMTP id 4fb4d7f45d1cf-66baeb1dbbdmr2569429a12.2.1774951036603; Tue, 31 Mar 2026 02:57:16 -0700 (PDT) Received: from adam.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-66b7607a653sm3413599a12.24.2026.03.31.02.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 02:57:16 -0700 (PDT) From: Adam Duskett To: openembedded-core@lists.openembedded.org Cc: Adam Duskett Subject: [PATCH v8 1/7] signing-keys.bb: Fix DISTRO_CODENAME truncation Date: Tue, 31 Mar 2026 11:57:07 +0200 Message-ID: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Mar 2026 09:57:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234273 If DISTRO_CODENAME is not set in the environment, bash quietly drops the string resulting in a key such as PACKAGEFEED-GPG-KEY-defaultsetup- However, when python calls self.d.getVar('DISTRO_CODENAME'), the resulting string is 'None', leading to a configuration file pointing to a key such as PACKAGEFEED-GPG-KEY-defaultsetup-None Add a default value in signing-keys.bb to set DISTRO_CODENAME to None if DISTRO_CODENAME is not set. Signed-off-by: Adam Duskett --- meta/recipes-core/meta/signing-keys.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb index 94f4032911..c7713ed4a6 100644 --- a/meta/recipes-core/meta/signing-keys.bb +++ b/meta/recipes-core/meta/signing-keys.bb @@ -45,6 +45,10 @@ addtask get_public_keys before do_install do_get_public_keys[depends] += "gnupg-native:do_populate_sysroot" do_install () { + # Python evalutes an empty DISTRO_CODENAME to "None" which would cause mismatched files + # as the update config file would show GPG-KEY-${DISTRO}-None but the filename is + # installed as GPG-KEY-${DISTRO}- + DISTRO_CODENAME="${DISTRO_CODENAME:-None}" if [ -f "${B}/rpm-key" ]; then install -D -m 0644 "${B}/rpm-key" "${D}${sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}" fi @@ -57,6 +61,7 @@ do_install () { } do_deploy () { + DISTRO_CODENAME="${DISTRO_CODENAME:-None}" if [ -f "${B}/rpm-key" ]; then install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}" fi From patchwork Tue Mar 31 09:57:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 84892 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 B56241061B21 for ; Tue, 31 Mar 2026 09:57:29 +0000 (UTC) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16609.1774951039986516600 for ; Tue, 31 Mar 2026 02:57:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=luFv+kyF; spf=pass (domain: amarulasolutions.com, ip: 209.85.208.68, mailfrom: adam.duskett@amarulasolutions.com) Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-66ba5eb2f4aso217867a12.1 for ; Tue, 31 Mar 2026 02:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1774951038; x=1775555838; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/sTtqbeZbMjPZSH/9nVCt5tEt48zH3omv+N5HwcY210=; b=luFv+kyFNJ2fIMXGHW5smSQy3uczh1QK96y7+DGgY/pe26yOM3gI74s7jfBW5kVEPf EwFE/0DIg0j+6ScGfKpdhpAj2jYn1xg4V9DIWE3yUCKfwPa9Y8QWoDvqLjuGW+Nt0Pp1 Jadnx32tbr3zrE+Ms0EaablYU7FIdrLWCqCVE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774951038; x=1775555838; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=/sTtqbeZbMjPZSH/9nVCt5tEt48zH3omv+N5HwcY210=; b=ev/YNgMmmW0iDI0KcYC82KMK8zGfqCMBlj9uF+4NyEmG0EiTGg+NiX4pMTOGnvtNIR BcGShPhy9YJ4qFqE1T6WiV8G0wtPjfCq5ygpI/tLtFubSrumKl/zb6W4n9mm0c76vUzS KxFYyy4ubc3260gw5RzUoLfe3wFb/QZlwXWpGhEKbVpcSGqnSneYTNE/wc3tT0DVd0vv RTFYdDJBgbrezkogscKEW/NlOJ1JGEFXS4bv5GyCx2dhCsUFR4nCSjOYRYn9iOWQ7AAF NH1L4l7XQrkUP2RlA8Y+YLL5iwajWZruL0yCPv00Wdo1LSxiYTRD0BTth8B95SFlRtq8 Dv5A== X-Gm-Message-State: AOJu0YxlSZQEpIdVy0jmeISvxqf88KwZvNL1cHK1h2/ciS632212uebk TWG9BGVfMlCC0x2Owv/UIhWDQlf1chQtS3WbibE+/g4TEei975HioeJ/BQF+vqDuv05AFF9gjFM AAcH1jtZYzg== X-Gm-Gg: ATEYQzz6uhyDGc54V1z4e1C4N7hBnbm/uRsf0amExgjvUyPtj/eCLbPGFi5yBXaLinZ pF9SsH1vurXeZAoepWl61Imb9UFwzufDZvRk2dcFTZjil5RxFbPA+FqDfqeW86B6Nn5NPDEK6pw mvNsXO2yOIBycD92ixYvzlqVlqv4GwUJk0JXa70O/Xe1rLzq3zMFawegj3j8y3ukzacMtaWYUd6 aUpj4y7NiUfIFdt3+MVq7cxwIhoTD8hr2vnWrVgCMG12PZ3MwS2oiWi4FX7oh2u+wL70eF0rdqh S4+36F0LZMizsKUvK+osrf5flaKinLt4HpgxZ0mQOHoWXNL4n9F9Kqqs+HXpZknSOMb5dJdC0gu IGYLApI0IxLQuHKS5ZMs/KCA5EaA7zlLIwz/hVqQDlFyYWxOcU3mi0elSXw1Ze4UDOsuIm6kOPg mNrBei61rvDPfB3vNiRi/FOIHaiL7nxPXLUO35Wwiae7E1gvwwenPqpucWbCa2LfrVgueu2cEQC ouuwgFHHKo= X-Received: by 2002:a05:6402:3595:b0:66b:3e6c:4772 with SMTP id 4fb4d7f45d1cf-66b3e6c47cbmr4244643a12.3.1774951037494; Tue, 31 Mar 2026 02:57:17 -0700 (PDT) Received: from adam.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-66b7607a653sm3413599a12.24.2026.03.31.02.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 02:57:16 -0700 (PDT) From: Adam Duskett To: openembedded-core@lists.openembedded.org Cc: Adam Duskett Subject: [PATCH v8 2/7] libtoml11: new recipe Date: Tue, 31 Mar 2026 11:57:08 +0200 Message-ID: <20260331095714.1285106-2-adam.duskett@amarulasolutions.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> References: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Mar 2026 09:57:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234275 DNF5 requires libtoml. As such, copy libtoml verbatim from meta-openembedded to openembedded-core. Signed-off-by: Adam Duskett --- meta/conf/distro/include/maintainers.inc | 1 + .../distro/include/ptest-packagelists.inc | 1 + .../0001-Remove-whitespace-in-operator.patch | 46 +++++++++++++++++++ .../libtoml11/files/run-ptest | 13 ++++++ .../libtoml11/libtoml11_4.4.0.bb | 36 +++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 meta/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch create mode 100755 meta/recipes-devtools/libtoml11/files/run-ptest create mode 100644 meta/recipes-devtools/libtoml11/libtoml11_4.4.0.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 9acf2da0a6..0ff519d54e 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -410,6 +410,7 @@ RECIPE_MAINTAINER:pn-libtest-fatal-perl = "Tim Orling " RECIPE_MAINTAINER:pn-libtest-needs-perl = "Tim Orling " RECIPE_MAINTAINER:pn-libtest-warnings-perl = "Tim Orling " RECIPE_MAINTAINER:pn-libtheora = "Unassigned " +RECIPE_MAINTAINER:pn-libtoml11 = "Unassigned " RECIPE_MAINTAINER:pn-libtimedate-perl = "Tim Orling " RECIPE_MAINTAINER:pn-libtirpc = "Unassigned " RECIPE_MAINTAINER:pn-libtool = "Robert Yang " diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 31fd5ae7ce..9bf0db0be3 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -47,6 +47,7 @@ PTESTS_FAST = "\ libtest-needs-perl \ libtest-warnings-perl \ libtimedate-perl \ + libtoml11 \ libtry-tiny-perl \ libusb1 \ libxml-namespacesupport-perl \ diff --git a/meta/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch b/meta/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch new file mode 100644 index 0000000000..9516ee5cb1 --- /dev/null +++ b/meta/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch @@ -0,0 +1,46 @@ +From dee78f822d8a5b985e565e5c1ef42a59557aa8fc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Mar 2025 11:35:46 -0800 +Subject: [PATCH] Remove whitespace in operator"" + +Clang 20+ errors about this whitespace. + +Fixes +include/toml11/impl/../fwd/literal_fwd.hpp:22:26: error: identifier '_toml' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] +| 22 | ::toml::value operator"" _toml(const char* str, std::size_t len); +| | ~~~~~~~~~~~^~~~~ +| | operator""_toml + +Upstream-Status: Backport [https://github.com/ToruNiina/toml11/commit/dee78f822d8a5b985e565e5c1ef42a59557aa8fc] +Signed-off-by: Khem Raj +--- + include/toml11/fwd/literal_fwd.hpp | 2 +- + include/toml11/impl/literal_impl.hpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/toml11/fwd/literal_fwd.hpp b/include/toml11/fwd/literal_fwd.hpp +index e46612c..82f62b7 100644 +--- a/include/toml11/fwd/literal_fwd.hpp ++++ b/include/toml11/fwd/literal_fwd.hpp +@@ -19,7 +19,7 @@ inline namespace literals + inline namespace toml_literals + { + +-::toml::value operator"" _toml(const char* str, std::size_t len); ++::toml::value operator""_toml(const char* str, std::size_t len); + + #if defined(TOML11_HAS_CHAR8_T) + // value of u8"" literal has been changed from char to char8_t and char8_t is +diff --git a/include/toml11/impl/literal_impl.hpp b/include/toml11/impl/literal_impl.hpp +index e8298c2..067d4ed 100644 +--- a/include/toml11/impl/literal_impl.hpp ++++ b/include/toml11/impl/literal_impl.hpp +@@ -115,7 +115,7 @@ inline namespace toml_literals + { + + TOML11_INLINE ::toml::value +-operator"" _toml(const char* str, std::size_t len) ++operator""_toml(const char* str, std::size_t len) + { + if(len == 0) + { diff --git a/meta/recipes-devtools/libtoml11/files/run-ptest b/meta/recipes-devtools/libtoml11/files/run-ptest new file mode 100755 index 0000000000..4da9e68cc5 --- /dev/null +++ b/meta/recipes-devtools/libtoml11/files/run-ptest @@ -0,0 +1,13 @@ +#!/usr/bin/env sh + +cd tests || exit 1 + +rm -rf tests.log + +for atest in test_* ; do + if ./"${atest}" >> tests.log 2>&1; then + echo "PASS: ${atest}" + else + echo "FAIL: ${atest}" + fi +done diff --git a/meta/recipes-devtools/libtoml11/libtoml11_4.4.0.bb b/meta/recipes-devtools/libtoml11/libtoml11_4.4.0.bb new file mode 100644 index 0000000000..7e097e4612 --- /dev/null +++ b/meta/recipes-devtools/libtoml11/libtoml11_4.4.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "TOML for Modern C++" +DESCRIPTION = "toml11 is a feature-rich TOML language library for \ + C++11/14/17/20." + +HOMEPAGE = "https://github.com/ToruNiina/toml11" +BUGTRACKER = "https://github.com/ToruNiina/toml11/issues" +CVE_PRODUCT = "libtoml11" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=44d1fcf70c7aa6991533c38daf7befa3" + +PE = "1" + +SRC_URI = "\ + gitsm://github.com/ToruNiina/toml11.git;protocol=https;branch=main;tag=v${PV} \ + file://0001-Remove-whitespace-in-operator.patch \ + file://run-ptest \ +" +SRCREV = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286" + +inherit cmake ptest + +EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \ + -DTOML11_BUILD_TESTS=${@bb.utils.contains("PTEST_ENABLED", "1", "ON", "OFF", d)} \ +" + +ALLOW_EMPTY:${PN} = "1" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests +} + +BBCLASSEXTEND = "native nativesdk" From patchwork Tue Mar 31 09:57:09 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 84888 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 55F8AFF60FB for ; Tue, 31 Mar 2026 09:57:29 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16608.1774951039839327222 for ; Tue, 31 Mar 2026 02:57:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dz22cefi; spf=pass (domain: amarulasolutions.com, ip: 209.85.208.66, mailfrom: adam.duskett@amarulasolutions.com) Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-66b0c0c0dabso727264a12.3 for ; Tue, 31 Mar 2026 02:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1774951038; x=1775555838; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NZ3nXGmf+Q49K3GqIIhzZrcjandGLr+2Z2qvJUPWcpI=; b=dz22cefiJpHtAdTPFG7Ya7Pxdu58tXRNMHTiotiUC9UfSokXj0c4a7GQSJtcp6EGQ4 9p4PPkeYTgtLA32KXKJJ989K0WMy++vVaJOwcYqIMg/gN0w0JVMs6YuqJ+uuq7jmAvli 7NT7GQNkZeLuILx9WXUfbQ1cA66pEn3h+0UoI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774951038; x=1775555838; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=NZ3nXGmf+Q49K3GqIIhzZrcjandGLr+2Z2qvJUPWcpI=; b=mJ9jUctPv++/bt+8fa0Sn2rOOTaigduzfqpWvA/Mp7930Dpa5eM8nQ1GDUlx2DYlxF TBLLmFcdkhhAr5r5M+MbTCmcgivnAQ2wT6XQTmdD6MiGhP3ebpgxFLX9biqtGr8henhm 0sYeVhvV4pSrB+uGpUimhyUGTm4RpMsmERP4cTx1YTxCCgw/IVl1cfpxy78JRNRkdjtH EwAnIHM7OezBlWPU1aFgYUKe87GRX2e8rACmPpZqIuamjChPgWT+G4nNfeV1PkfexD8h WsvMhO2M3F7QVlyYeYCg1NR9YKy5V09QfX7BvRGK/wea4mHEIKxdIfuRQEqReCmIiRnb iWhg== X-Gm-Message-State: AOJu0Yzn1Fp9s8mR9jMItpLPUfmjUF+eqaagJv4RIsVRs82eHU/HTz+D jOXoVoZ0QO25OvfhAqoG1gL4NdbqnavKtoIwvHb9WZ/XDWoRtGcfp2N61Wo1TDt0e9c4lVsA7n5 og+YsoyCw0A== X-Gm-Gg: ATEYQzwAvzi4Z/PFmPRLnraUj7QUv73RxXKxJdEgDJEpuU/laVEwnOqUOlooD5r+WX2 NtjSf0YUzd6C/0rU/nKQopk+qaXQnhPSTJD4rnqdhJiEvjEst1iO8XmG0ysa3Ti3Yi/7dzoBZAZ SwewFuLPonugsK3GySj6m+n+4ILj30nGjlXosLgvO7BhI+Ne1+qXebHgahugYm8DN18IJ20GJLU fpeANXdnhIuO3wV4zliZycMsa15a5zJFPzJ7TuD75cCnyWbzN5rf6LQ7fx2XPeylUTZ2DB5ICGj Nxe3TezNY4Mp8DJyt1lSVRlz2alNIsotrwpBvLqg7ygmX/n5BrrRGrt2KUcDcxbcG4LnFE6TzG0 fwJMqJ3Yr7Usn5hw6vvm+7rWOpYVjwUXOVh5CtfIIuCaiOA2Z/LEM5Lwp/OLWbvqZ43K4u9N63y XL4QqRfwM+gKdpUvr99klVevB6chv6mh00/9RID04hyC4YGlGk2canvN4Nm4eosK/q/ws1pbxhV bBrlW8sj/4= X-Received: by 2002:a05:6402:430d:b0:66b:b6e2:66c8 with SMTP id 4fb4d7f45d1cf-66bb6e26840mr2294999a12.4.1774951038152; Tue, 31 Mar 2026 02:57:18 -0700 (PDT) Received: from adam.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-66b7607a653sm3413599a12.24.2026.03.31.02.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 02:57:17 -0700 (PDT) From: Adam Duskett To: openembedded-core@lists.openembedded.org Cc: Adam Duskett Subject: [PATCH v8 3/7] libsolv: explicitly enable comps for rpm packageconfig Date: Tue, 31 Mar 2026 11:57:09 +0200 Message-ID: <20260331095714.1285106-3-adam.duskett@amarulasolutions.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> References: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Mar 2026 09:57:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234274 dnf5 requires solv/repo_comps.h Signed-off-by: Adam Duskett --- meta/recipes-extended/libsolv/libsolv_0.7.36.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.36.bb b/meta/recipes-extended/libsolv/libsolv_0.7.36.bb index 852e79c45e..8a941ce4b8 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.36.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.36.bb @@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" inherit cmake ptest PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" -PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" +PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_COMPS=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON -DENABLE_ZSTD_COMPRESSION=ON -DENABLE_STATIC=ON" From patchwork Tue Mar 31 09:57:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 84890 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 0C7DD1061B26 for ; Tue, 31 Mar 2026 09:57:30 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16610.1774951040639067664 for ; Tue, 31 Mar 2026 02:57:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=pcJxUXcP; spf=pass (domain: amarulasolutions.com, ip: 209.85.208.67, mailfrom: adam.duskett@amarulasolutions.com) Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-66b0c0c0dabso727265a12.3 for ; Tue, 31 Mar 2026 02:57:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1774951039; x=1775555839; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YaXfxBv0dQkcVaLWDeSdvLhqlzY9UCiQE7Dgds6AjJo=; b=pcJxUXcP6BUqx0+bJyNhl6QWkGkZ7VbuRpzCfdRB3vlCEFarbU9YnN1bfqeIuy/ymk vQ2qwUuIMDk8kdkjxmXzIdts4taE/lqrWlzbPcwA/e9CSk8KMCXoxwnkNvBvp7YUVgaD gAm+s45C2cafdUj+ra8HJIE8XSY9B7LV6/rzI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774951039; x=1775555839; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YaXfxBv0dQkcVaLWDeSdvLhqlzY9UCiQE7Dgds6AjJo=; b=AKmDoy/dGxgcIjwCJai5KTFrugPdyDUYmJN1SvGJvny46OQBDrxxacfKzwhyV2ZK2M U2sR7i6b0nwud+vlAv0Q17rBsZbKkkyfhvJbxORRBey6LbeeC8zwbBLyIOEHhl9EFtAa VMUgezTLfu1u+TyEGNDc0BD2Ec78lYFgvFzzpmBtNUYfe4XjjuiNqZQyLy98sdtPRAZV o6VUtql9pUHgccmpGjsgAVH5Tzcr6ikA0fIm+c47KlqHIpzhLqLjxa2PM/+VWkpLC9W3 AG6+6nDCx2CbgpbJyZK9qmn8u/IhGnT3W/ovXjSzJr8RltdMzVlsHNnobtxoF4YpX7oS M/FA== X-Gm-Message-State: AOJu0YzNKoRAD9SLjXPxhtpuOaNqDMxKX/e+x0voQaz5IoCs2U31ozwH 2Zi8Yh0edpuSiXFG7sLYs3dJwUGtMrjVSPRpdk2TlBauVhUQnv5OprHXvo4DI9qQBX+X57mzlN9 WD2iLa8/3GQ== X-Gm-Gg: ATEYQzzvHjJu2LD8PyzDnn1LQLm6GxAv2DCsdlshpn+ck3Ij+72hKv+wQ5UsDimBxOZ lh4OZ5/9AEH4w74ls2NTwm/TzwreKserwYFAdXS8jmRAEpl3+OzMl0Zrz/aTMEmwynr9sDb4jWK XejPoNkhsd+GiN9cajjgU6EqSdE1jR6xXv4Oa1SHze8oBvxW26aGrEUTxwO3FI0/6Yv2vZL8WS0 SbgAWR4nZXI7AnB36xXAsTaLtavoNm34kPJub+RelSgemU7c2qycWMbJTwhJ4NN/0pbjXIXDVwH jfeMCLSvm9LLN4tMXKiFfuUP/UMETljqRKyAoWScd+VMmHgRgOkroPhVAw1yivqXzsVIOZ5ITAd CW85IQqoY9ztqyW56TQRTryNwzUiqkMQnlMhobRiSCG5MA8EXEOmp8IXS57ZQcd2sMDsbfuhG3h Ba/a2xMOd/xKQmVj10ChZaw0oxg7R+Sf6fgTX6NY2Q3Wb0F/vmwgW5/sw3EeLjAM1kHn9bvLtpc +Dxf/HOXvE= X-Received: by 2002:a05:6402:524a:b0:66a:ad93:5b6e with SMTP id 4fb4d7f45d1cf-66b28e6edbdmr4133801a12.8.1774951038950; Tue, 31 Mar 2026 02:57:18 -0700 (PDT) Received: from adam.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-66b7607a653sm3413599a12.24.2026.03.31.02.57.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 02:57:18 -0700 (PDT) From: Adam Duskett To: openembedded-core@lists.openembedded.org Cc: Adam Duskett Subject: [PATCH v8 4/7] librepo: add PACKAGECONFIG[sequoia] Date: Tue, 31 Mar 2026 11:57:10 +0200 Message-ID: <20260331095714.1285106-4-adam.duskett@amarulasolutions.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> References: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Mar 2026 09:57:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234276 Currently, librepo compiled with -DUSE_GPGME=ON (the default setting) causes dnf5 to fail importing repository keys. A very long writeup of the issue is linked below. [1] Add a new PACKAGECONFIG[sequoia] option which sets -DUSE_GPGME=OFF and adds rpm and rpm-sequoia to the dependency list which ensures dnf5 works with repository signing. 1: https://github.com/rpm-software-management/dnf5/issues/2539 Signed-off-by: Adam Duskett --- meta/recipes-devtools/librepo/librepo_1.20.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/librepo/librepo_1.20.0.bb b/meta/recipes-devtools/librepo/librepo_1.20.0.bb index 6557dda43a..7a2e9e6b9b 100644 --- a/meta/recipes-devtools/librepo/librepo_1.20.0.bb +++ b/meta/recipes-devtools/librepo/librepo_1.20.0.bb @@ -15,6 +15,8 @@ DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" inherit cmake setuptools3-base pkgconfig +PACKAGECONFIG[sequoia] = "-DUSE_GPGME=OFF,-DUSE_GPGME=ON,rpm rpm-sequoia" + EXTRA_OECMAKE = " \ -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ -DPYTHON_DESIRED=3 \ From patchwork Tue Mar 31 09:57:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 84891 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 2AC211061B2B for ; Tue, 31 Mar 2026 09:57:30 +0000 (UTC) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16611.1774951041314323006 for ; Tue, 31 Mar 2026 02:57:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=VEboCL0V; spf=pass (domain: amarulasolutions.com, ip: 209.85.208.45, mailfrom: adam.duskett@amarulasolutions.com) Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-66bb3766125so425749a12.2 for ; Tue, 31 Mar 2026 02:57:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1774951040; x=1775555840; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CwN2igoF2qTedj5q/7FvM+ZE0jCVib5hXWhvwnsKv5o=; b=VEboCL0V7m0s3rMBylFaKFjwJA9ql7rAIafxrL2fxaG1tw9O+Q8vBKFlmP83/ejwVy qvgQYI5qKMcsB7Oim3vXQUlAnvA/4jhFJnO3AofS+XkU8k3yoHLP20lmNZZNvcgZM3bK vd8CLLZh6l2FLd2BSqtyBnpTMIyX+GrOvAvKk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774951040; x=1775555840; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=CwN2igoF2qTedj5q/7FvM+ZE0jCVib5hXWhvwnsKv5o=; b=I38emSzdYOJoFA8diET/iFI1GwKcVWj58jU5k5STzNznDnc5BAv0Ws733NkIHLcC4O oVvXURYaiBU1YtvyMYaXKC2F+rhEhbWNqV7w4CgZpT85FcSQFTY0/FSADvLGuM6DLG20 aIYN9ESe/2S/vqc8zcMvzaCq04QLbOVsNmk/q4Su4DGbtIx5VFA50BX8UD1N0JNO3nSC ih0E4RTcEMFbvRXd4c1IEBVnhisMQrf9z53btpxvOHzMKwReeNVjkskyOL8lFiLVGJ1K mj+tByAgpu7O1qvOe9+4Qz7U42Pnbog5QD7YZx0iFq7yNn1MGUeNAk4HO6ahvGagysII ajMw== X-Gm-Message-State: AOJu0YwxBm3kVsh7cr3f4EUy5Ukf1a/TbOoYxiAzwrEwtRSiUTyB6zMV Yz/52SdtjOJPxlYYqIQAidIgruO30nXmrl2sk5xUcspQndymMJ8OdxO5b9uAs6C20jShczrbbtS cKDZmOuM= X-Gm-Gg: ATEYQzzSNcGX4pTtDydVK4bADMzIo7TElxevQMpTJfkvzQV/OhrfOemr07FTLW9zx3q xhyDEILToBqLV8oAm3+q4KVx7PT5SYznkB7jzR4zk1h1Ifgw+ATbGzjf4AjhsG+amdQbySIIOP6 M/rgZV1PgzewnxobUdzC2MHzb3I5EHBuH1lzPq8IKTFbIhT9P0q6LgPTpI20BG5E5LlNA66IlBS NucZHGloUwPubVhaaq24fyCwINB3r9P1CLub0b7u8AeUA0XesXjWSe6LRJ/tITZD12yoGpytlSe 1iEHySO9ytnSodf4IVAxsrLDxImNj+GW4tU2w4qH3Ept/2MoDbjjuC5WbJuo6+87YKLAWZM9pdd Mf4WBBLx27zCUXNHlHZlMNDySr5lFv7bWCL4LfKcKAsMvRIvXMuD+eFx/L3lYgr0uM8+WWUSv4u yNIpq4k2SeX0F0jYxCGN22PYjwDWxhUUWk06CVYQz4tWXm5+fVPDYTWY4YhoGQQT3McZEdLCNM7 aQT4unHpDE= X-Received: by 2002:a05:6402:1d52:b0:66b:eb2e:8af9 with SMTP id 4fb4d7f45d1cf-66beb2e8d36mr1854220a12.0.1774951039639; Tue, 31 Mar 2026 02:57:19 -0700 (PDT) Received: from adam.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-66b7607a653sm3413599a12.24.2026.03.31.02.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 02:57:19 -0700 (PDT) From: Adam Duskett To: openembedded-core@lists.openembedded.org Cc: Adam Duskett Subject: [PATCH v8 5/7] meta/lib/oe/rootfs.py: assign warn_check regex string to a variable Date: Tue, 31 Mar 2026 11:57:11 +0200 Message-ID: <20260331095714.1285106-5-adam.duskett@amarulasolutions.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> References: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Mar 2026 09:57:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234277 DNF5 has a hardcoded warning when gpg checks are disabled. As such, the rpm rootfs.py PkgRootfs class needs to have a a negative lookahead filter specific for the following warning: "Warning: skipped OpenPGP checks" if RPM_SIGN_PACKAGES != 1. This filter is added in the next patch. Signed-off-by: Adam Duskett --- meta/lib/oe/rootfs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 14befac8fa..7ef7e71f9e 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -25,6 +25,7 @@ class Rootfs(object, metaclass=ABCMeta): self.deploydir = self.d.getVar('IMGDEPLOYDIR') self.progress_reporter = progress_reporter self.logcatcher = logcatcher + self.warn_check_regex = r'^(warn|Warn|WARNING:)' self.install_order = Manifest.INSTALL_ORDER @@ -84,7 +85,7 @@ class Rootfs(object, metaclass=ABCMeta): bb.warn(msg) def _log_check_warn(self): - self._log_check_common('warning', '^(warn|Warn|WARNING:)') + self._log_check_common('warning', self.warn_check_regex) def _log_check_error(self): self._log_check_common('error', self.log_check_regex) From patchwork Tue Mar 31 09:57:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 84893 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 8086DFF60FF for ; Tue, 31 Mar 2026 09:57:29 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16315.1774951042621148328 for ; Tue, 31 Mar 2026 02:57:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=E4Al3FM4; spf=pass (domain: amarulasolutions.com, ip: 209.85.208.66, mailfrom: adam.duskett@amarulasolutions.com) Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-66bf6fe1211so217892a12.0 for ; Tue, 31 Mar 2026 02:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1774951041; x=1775555841; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oas5w9IsgqHqIr8AWFdm5KXlrm1F02E4BeKMpJbxsRk=; b=E4Al3FM4FS5pz6jCqxggobWeX9bPYUWYKiinJCuNittxRSGVAxSsl/RFAXJ4AOREUf xzZGkP251wvdPyaoIuprfrbOuCdeAuzM9NcSmegigJoiicKVIQ3YcSSbffApf//Gaj2U uAMJ72n5mwzrsPJzE4dU2tdKHWgSwtRJv4mKc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774951041; x=1775555841; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=oas5w9IsgqHqIr8AWFdm5KXlrm1F02E4BeKMpJbxsRk=; b=cmBupmKKL1NrqG7AvboWutikN+4CvhecxidIJrZbQQb1r2pFaJcBCxvMJVN56lbTEH N1DSa2g11Nnva8/GUz4q7ZfnPyVWnENCy+Vu9OK8oqHCbceVlDUDzqslwy6cyx8DfFPH XhbbOgaDYwz+EyThHJIWPju6lnrntCH9I87D4WA6AQ9gSTB5I1iiFQlvaokgEtk5nsIA 9cP6c3vbfL2gRHuZHpbNt8JOcZgsvDcgKWTB+l9uBLM5jaoWYGLEZXU9CC/gyibeeNQK w4fbNH7ZfN+K6NoIBakm6KYBCqEls8x7TnnK3zmh9pwdG3uhbiGOcKis3YoQFF/az0bJ ozcg== X-Gm-Message-State: AOJu0YwU6kveIS4kf9Vtro63P6s7Axi0+oYzLJ4FZKf5USwQ02DBM6PZ /VGj+UvNhBQpo09rdtUvdltoSllW/GzMJlPqhoVSoRj3oFlZ+7dwcRXEMgnSfUae/hFqakp0zAj 2e9cunRFNXQ== X-Gm-Gg: ATEYQzxkaYuUP7vW33trSbrgahPfE3gjBpO1r7NX7dnNy4t+fJugxNTvticoiw28Xzi uw71G5adBMuIU0/5z3CFR6ovKytc//lavItSBNsBNNXkdzuvZSn7yDlwyOznsyB3vLRhkAQLeLH gKd6IY65TwRM8M6rFEJEsMLpPe3+Lo99iSH22oVGeaNdbaW++r4KwPkpKSU1hsyD2qlNYr58vyu OHIFofZQNSH+9/zohPEIl6SN84zK4b/9WerMG9YQWWJ/ByWHzyCN72elNMIKnmoSnwp8ztJbZgq w/oIIKudOrgV44Olu5XHeQ14th6DxHlXbNAbpFr36ZrrIQtWSsd1Bly4Oxa5xpiPMtvpr85+ZxQ OKOZ5DPHdOxCQ2KCCZgxbUQWNRb6IHfjrrRcngzPVnhGTraABe15y9tRI0Xyu74uLFhaljbVRNf 2XDDT/hbT18rZ4L/2sysZHqURWPiNhcOtUFmHEc0izAEe4DqO0XjhhyoMsmiW2VlnDJP0Rq4I3U yfdGqCXWFg= X-Received: by 2002:a05:6402:274e:b0:66b:aa4a:c542 with SMTP id 4fb4d7f45d1cf-66baa4ac6f4mr2473632a12.1.1774951040448; Tue, 31 Mar 2026 02:57:20 -0700 (PDT) Received: from adam.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-66b7607a653sm3413599a12.24.2026.03.31.02.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 02:57:19 -0700 (PDT) From: Adam Duskett To: openembedded-core@lists.openembedded.org Cc: Adam Duskett Subject: [PATCH v8 6/7] dnf: Upgrade to 5.4.0.0 Date: Tue, 31 Mar 2026 11:57:12 +0200 Message-ID: <20260331095714.1285106-6-adam.duskett@amarulasolutions.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> References: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Mar 2026 09:57:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234279 Completely rewritten in C++, there are several changes needed to facilitate moving from DNF4 to DNF5. Below are some significant items to note: - Added a negative lookahead filter for the following warning if RPM_SIGN_PACKAGES != '1': "Warning: skipped OpenPGP checks" This warning is hard-coded and piped to stderr if gpg checks are disabled. However, most users do not sign their RPM packages and use dnf to simply construct the rootfs. - The "-v/--verbose" cli option is removed. As such, remove the argument everywhere it was called.[1] - the rpmverbosity cli option is replaced with --setopt=rpmverbosity - Change gpgcheck to pkg_gpgcheck as this is what the documentation recommends.[2] - --nogpgcheck is now --no-gpgchecks - --setopt=protect_running_kernel=False has to be set or else every dnf transaction complains that /boot/vmlinuz-${kernel_version} does not exist in /var/log/dnf5.log. There is an open issue on github[3] to enable the currently not-yet implemented `autocheck_running_kernel option`, but it has been open for quite some time and the protect_running_kernel option supresses the message. - Move --skip-broken to after the install argument as the global --skip-broken argument is removed. - /var/cache/dnf is replaced with /var/cache/libdnf5 - Add `features += 'PACKAGECONFIG:append:pn-rpm = " sequoia"\n'` `features += 'PACKAGECONFIG:append:pn-librepo = " sequoia"\n'` to test_testimage_dnf as librepo currently does not work with gpgme. While DNF5 has many config options, unfortunately, the majority of them depends on sdbus-c++, which is not included in OE-core. However, the package is included in meta-openembedded, so it's best to include the PACKAGECONFIG options in the recipe and leave them off by default. 1: https://github.com/rpm-software-management/dnf5/issues/464 2: https://dnf5.readthedocs.io/en/latest/dnf5.conf.5.html 3: https://github.com/rpm-software-management/dnf5/issues/1255 Signed-off-by: Adam Duskett --- v7 -> v8: Added a negative lookahead filter for PGP warnings .../lib/oeqa/runtime/cases/dnf_runtime.py | 6 +- meta/conf/distro/include/maintainers.inc | 2 +- meta/lib/oe/package_manager/rpm/__init__.py | 17 +- meta/lib/oe/package_manager/rpm/rootfs.py | 3 + meta/lib/oeqa/runtime/cases/dnf.py | 16 +- meta/lib/oeqa/selftest/cases/runtime_test.py | 5 + ...tly-install-tmpfiles.d-configuration.patch | 18 -- ...ode-etc-and-systemd-unit-directories.patch | 26 --- ...-hardcode-the-systemd-unit-directory.patch | 29 +++ .../0001-dnf-write-the-log-lock-to-root.patch | 29 --- .../0001-lock.py-fix-Exception-handling.patch | 62 ------ ...et-python-path-for-completion_helper.patch | 21 -- .../dnf/0002-cmake-set-CMP0190-to-OLD.patch | 51 +++++ ...0003-Do-not-hardcode-system_cachedir.patch | 36 ++++ ...004-add-support-for-gcc-12-and-below.patch | 97 ++++++++++ ...Do-not-prepend-installroot-to-logdir.patch | 28 --- ...rm-arch-mapping-issues-for-qemuarmv5.patch | 59 ++++++ .../dnf/0006-dnf-automatic-use-bin-sh.patch | 27 +++ ...service-files-if-WITH_SYSTEMD-is-set.patch | 74 +++++++ ...PYTHON_INSTALL_DIR-by-running-python.patch | 24 --- .../0030-Run-python-scripts-using-env.patch | 34 ---- meta/recipes-devtools/dnf/dnf_4.24.0.bb | 96 ---------- meta/recipes-devtools/dnf/dnf_5.4.0.0.bb | 181 ++++++++++++++++++ 23 files changed, 585 insertions(+), 356 deletions(-) delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch create mode 100644 meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-the-systemd-unit-directory.patch delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch create mode 100644 meta/recipes-devtools/dnf/dnf/0002-cmake-set-CMP0190-to-OLD.patch create mode 100644 meta/recipes-devtools/dnf/dnf/0003-Do-not-hardcode-system_cachedir.patch create mode 100644 meta/recipes-devtools/dnf/dnf/0004-add-support-for-gcc-12-and-below.patch delete mode 100644 meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch create mode 100644 meta/recipes-devtools/dnf/dnf/0005-libdnf-fix-arm-arch-mapping-issues-for-qemuarmv5.patch create mode 100644 meta/recipes-devtools/dnf/dnf/0006-dnf-automatic-use-bin-sh.patch create mode 100644 meta/recipes-devtools/dnf/dnf/0007-only-install-service-files-if-WITH_SYSTEMD-is-set.patch delete mode 100644 meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch delete mode 100644 meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch delete mode 100644 meta/recipes-devtools/dnf/dnf_4.24.0.bb create mode 100644 meta/recipes-devtools/dnf/dnf_5.4.0.0.bb diff --git a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py index d2f0f88f7d..27158b5193 100644 --- a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py +++ b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py @@ -41,11 +41,11 @@ class DnfSelftest(DnfTest): import re # Use '-y' for non-interactive mode: automatically import the feed signing key - output_makecache = self.dnf('-vy makecache') + output_makecache = self.dnf('-y makecache') self.assertTrue(re.match(r".*Failed to synchronize cache", output_makecache, re.DOTALL) is None, msg = "dnf makecache failed to synchronize repo: %s" %(output_makecache)) self.assertTrue(re.match(r".*Metadata cache created", output_makecache, re.DOTALL) is not None, msg = "dnf makecache failed: %s" %(output_makecache)) - output_repoinfo = self.dnf('-v repoinfo') - matchobj = re.match(r".*Repo-pkgs\s*:\s*(?P[0-9]+)", output_repoinfo, re.DOTALL) + output_repoinfo = self.dnf('repoinfo') + matchobj = re.match(r".*Total packages\s*:\s*(?P[0-9]+)", output_repoinfo, re.DOTALL) self.assertTrue(matchobj is not None, msg = "Could not find the amount of packages in dnf repoinfo output: %s" %(output_repoinfo)) self.assertTrue(int(matchobj.group('n_pkgs')) > 0, msg = "Amount of remote packages is not more than zero: %s\n" %(output_repoinfo)) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 0ff519d54e..4badb54396 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -157,7 +157,7 @@ RECIPE_MAINTAINER:pn-diffutils = "Chen Qi " RECIPE_MAINTAINER:pn-distcc = "Hongxu Jia " RECIPE_MAINTAINER:pn-distcc-config = "Yi Zhao " RECIPE_MAINTAINER:pn-dmidecode = "Unassigned " -RECIPE_MAINTAINER:pn-dnf = "Unassigned " +RECIPE_MAINTAINER:pn-dnf = "Adam Duskett " RECIPE_MAINTAINER:pn-docbook-xml-dtd4 = "Yi Zhao " RECIPE_MAINTAINER:pn-docbook-xsl-stylesheets = "Yi Zhao " RECIPE_MAINTAINER:pn-dos2unix = "Khem Raj " diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py index 1d831745ff..d617ca0404 100644 --- a/meta/lib/oe/package_manager/rpm/__init__.py +++ b/meta/lib/oe/package_manager/rpm/__init__.py @@ -163,7 +163,7 @@ class RpmPM(PackageManager): gpg_opts += 'gpgkey=file://%s/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-%s-%s\n' % (self.d.getVar('sysconfdir'), self.d.getVar('DISTRO'), self.d.getVar('DISTRO_CODENAME')) if self.d.getVar('RPM_SIGN_PACKAGES') != '1': - gpg_opts += 'gpgcheck=0\n' + gpg_opts += 'pkg_gpgcheck=0\n' bb.utils.mkdirhier(oe.path.join(self.target_rootfs, "etc", "yum.repos.d")) remote_uris = self.construct_uris(feed_uris.split(), feed_base_paths.split()) @@ -200,11 +200,11 @@ class RpmPM(PackageManager): package_exclude = self.d.getVar('PACKAGE_EXCLUDE') exclude_pkgs = (bad_recommendations.split() if bad_recommendations else []) + (package_exclude.split() if package_exclude else []) - output = self._invoke_dnf((["--skip-broken"] if attempt_only else []) + - (["-x", ",".join(exclude_pkgs)] if len(exclude_pkgs) > 0 else []) + + output = self._invoke_dnf((["-x", ",".join(exclude_pkgs)] if len(exclude_pkgs) > 0 else []) + (["--setopt=install_weak_deps=False"] if (hard_depends_only or self.d.getVar('NO_RECOMMENDATIONS') == "1") else []) + - (["--nogpgcheck"] if self.d.getVar('RPM_SIGN_PACKAGES') != '1' else ["--setopt=gpgcheck=True"]) + + (["--no-gpgchecks"] if self.d.getVar('RPM_SIGN_PACKAGES') != '1' else ["--setopt=pkg_gpgcheck=True"]) + ["install"] + + (["--skip-broken"] if attempt_only else []) + pkgs) failed_scriptlets_pkgnames = collections.OrderedDict() @@ -313,10 +313,15 @@ class RpmPM(PackageManager): def _invoke_dnf(self, dnf_args, fatal = True, print_output = True ): os.environ['RPM_ETCCONFIGDIR'] = self.target_rootfs + # Set XDG_CACHE_HOME to avoid dnf attempting to install oe-repo system cache to a /tmp/ directory on the host. + os.environ['XDG_CACHE_HOME'] = oe.path.join(os.path.join(self.target_rootfs, "var/cache/libdnf5")) + dnf_cmd = bb.utils.which(os.getenv('PATH'), "dnf") - standard_dnf_args = ["-v", "--rpmverbosity=info", "-y", - "-c", oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), + standard_dnf_args = ["-y", + "--config", oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), + "--setopt=rpmverbosity=info", "--setopt=reposdir=%s" %(oe.path.join(self.target_rootfs, "etc/yum.repos.d")), + "--setopt=pluginconfpath=%s" %(os.path.join(self.d.getVar('STAGING_DIR_NATIVE'), "etc/dnf/dnf.conf")), "--installroot=%s" % (self.target_rootfs), "--setopt=logdir=%s" % (self.d.getVar('T')) ] diff --git a/meta/lib/oe/package_manager/rpm/rootfs.py b/meta/lib/oe/package_manager/rpm/rootfs.py index 698685c067..8d54b5ab48 100644 --- a/meta/lib/oe/package_manager/rpm/rootfs.py +++ b/meta/lib/oe/package_manager/rpm/rootfs.py @@ -17,6 +17,9 @@ class PkgRootfs(Rootfs): r'|exit 1\b|ERROR: |Error: |Error |ERROR '\ r'|Failed |Failed: |Failed$|Failed\(\d+\):)' + if self.d.getVar('RPM_SIGN_PACKAGES') != '1': + self.warn_check_regex = r'^(?!.*Warning: skipped OpenPGP checks)(warn|Warn|WARNING:)' + self.manifest = PkgManifest(d, manifest_dir) self.pm = RpmPM(d, diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py index 3ccb18ce83..1becc8d8a0 100644 --- a/meta/lib/oeqa/runtime/cases/dnf.py +++ b/meta/lib/oeqa/runtime/cases/dnf.py @@ -17,7 +17,7 @@ from oeqa.runtime.decorator.package import OEHasPackage class DnfTest(OERuntimeTestCase): def dnf(self, command, expected = 0): - command = 'dnf %s' % command + command = 'dnf --setopt=protect_running_kernel=False %s' % command status, output = self.target.run(command, 1500) message = os.linesep.join([command, output]) self.assertEqual(status, expected, message) @@ -48,7 +48,7 @@ class DnfBasicTest(DnfTest): @OETestDepends(['dnf.DnfBasicTest.test_dnf_help']) def test_dnf_history(self): - self.dnf('history') + self.dnf('history list') class DnfRepoTest(DnfTest): @@ -68,7 +68,7 @@ class DnfRepoTest(DnfTest): deploy_url = 'http://%s:%s/' %(self.target.server_ip, self.repo_server.port) cmdlinerepoopts = ["--repofrompath=oe-testimage-repo-%s,%s%s" %(arch, deploy_url, arch) for arch in pkgarchs] - output = self.dnf(" ".join(cmdlinerepoopts) + " --nogpgcheck " + command) + output = self.dnf(" ".join(cmdlinerepoopts) + " --no-gpgchecks " + command) return output @OETestDepends(['dnf.DnfBasicTest.test_dnf_help']) @@ -96,7 +96,7 @@ class DnfRepoTest(DnfTest): def test_dnf_install_from_disk(self): self.dnf_with_repo('remove -y dnf-test-dep') self.dnf_with_repo('install -y --downloadonly dnf-test-dep') - status, output = self.target.run('find /var/cache/dnf -name dnf-test-dep*rpm') + status, output = self.target.run('find /var/cache/libdnf5 -name dnf-test-dep*rpm') self.assertEqual(status, 0, output) self.dnf_with_repo('install -y %s' % output) @@ -134,8 +134,8 @@ class DnfRepoTest(DnfTest): self.target.run('cp -r /etc/dnf %s/etc' % rootpath, 1500) self.target.run('cp /bin/sh %s/bin' % rootpath, 1500) self.target.run('mount -o bind /dev %s/dev/' % rootpath, 1500) - self.dnf_with_repo('install --installroot=%s -v -y --rpmverbosity=debug busybox' % rootpath) - status, output = self.target.run('test -e %s/var/cache/dnf' % rootpath, 1500) + self.dnf_with_repo('install --installroot=%s -y busybox' % rootpath) + status, output = self.target.run('test -e %s/var/cache/libdnf5' % rootpath, 1500) self.assertEqual(0, status, output) status, output = self.target.run('test -e %s/bin/busybox' % rootpath, 1500) self.assertEqual(0, status, output) @@ -158,8 +158,8 @@ class DnfRepoTest(DnfTest): self.target.run('cp -r /etc/dnf %s/etc' % rootpath) self.target.run('cp /bin/busybox %s/bin/sh' % rootpath) self.target.run('mount -o bind /dev %s/dev/' % rootpath) - self.dnf_with_repo('install --installroot=%s -v -y --rpmverbosity=debug busybox' % rootpath) - status, output = self.target.run('test -e %s/var/cache/dnf' % rootpath) + self.dnf_with_repo('install --installroot=%s -y busybox' % rootpath) + status, output = self.target.run('test -e %s/var/cache/libdnf5' % rootpath) self.assertEqual(0, status, output) status, output = self.target.run('test -e %s/bin/busybox' % rootpath) self.assertEqual(0, status, output) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index a337194f9b..abca3d04d3 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -164,6 +164,11 @@ TEST_RUNQEMUPARAMS += " slirp" features += 'EXTRA_IMAGE_FEATURES += "package-management"\n' features += 'PACKAGE_CLASSES = "package_rpm"\n' + # librepo and rpm require sequoia + # https://github.com/rpm-software-management/dnf5/issues/2539 + features += 'PACKAGECONFIG:append:pn-rpm = " sequoia"\n' + features += 'PACKAGECONFIG:append:pn-librepo = " sequoia"\n' + bitbake('gnupg-native -c addto_recipe_sysroot') # Enable package feed signing 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 deleted file mode 100644 index fd942228b9..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch +++ /dev/null @@ -1,18 +0,0 @@ -From f70eb308c837f2c944e23bb680a501a605004d65 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 26 Jan 2017 16:36:20 +0200 -Subject: [PATCH] Corretly install tmpfiles.d configuration - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - etc/tmpfiles.d/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/tmpfiles.d/CMakeLists.txt b/etc/tmpfiles.d/CMakeLists.txt -index f69c773e..3eb6d0e8 100644 ---- a/etc/tmpfiles.d/CMakeLists.txt -+++ b/etc/tmpfiles.d/CMakeLists.txt -@@ -1 +1 @@ --INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/) -+INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/) 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 deleted file mode 100644 index 9d978cdc5f..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c2b2b91b58f4531d4baf0a01f5d868d71e577a84 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 - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e71e9517..8fcb2069 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,8 +3,8 @@ PROJECT (dnf NONE) - - INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake) - --SET( SYSCONFDIR /etc) --SET( SYSTEMD_DIR /usr/lib/systemd/system) -+SET( SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR}) -+SET( SYSTEMD_DIR $ENV{systemd_system_unitdir}) - - IF (NOT PYTHON_DESIRED) - FIND_PACKAGE (PythonInterp REQUIRED) diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-the-systemd-unit-directory.patch b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-the-systemd-unit-directory.patch new file mode 100644 index 0000000000..f82a0fca3c --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-the-systemd-unit-directory.patch @@ -0,0 +1,29 @@ +From c263a746dac19d140fb31d07f1c4d4cb96750666 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 27 Nov 2025 11:07:48 +0100 +Subject: [PATCH] Do not hardcode the systemd unit directory + +Upstream-Status: Inappropriate [oe-core specific] + +Rebased for 5.3.0.0 +Signed-off-by: Adam Duskett +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0507e30..0537e85 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,7 @@ project(dnf5 LANGUAGES CXX C VERSION ${VERSION_PRIME}.${VERSION_MAJOR}.${VERSION + cmake_policy(VERSION ${CMAKE_VERSION}) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +-set(SYSTEMD_DIR "/usr/lib/systemd/system") ++set(SYSTEMD_DIR $ENV{systemd_system_unitdir}) + + message("Building ${PROJECT_NAME} version ${PROJECT_VERSION}") + +-- +2.52.0 + 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 deleted file mode 100644 index 18f9a30949..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 049e2832284ab883e185d9020c881518a68e6c38 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 - -Writing it to /var/log appears to be racing with installation -of base-files, and if lock is created first, base-files -will refuse to install (due to the target directory -already existing, and base-files creating it as a symlink). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - dnf/logging.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dnf/logging.py b/dnf/logging.py -index ef0b25f3..94610af6 100644 ---- a/dnf/logging.py -+++ b/dnf/logging.py -@@ -118,7 +118,7 @@ class MultiprocessRotatingFileHandler(logging.handlers.RotatingFileHandler): - def __init__(self, filename, mode='a', maxBytes=0, backupCount=0, encoding=None, delay=False): - super(MultiprocessRotatingFileHandler, self).__init__( - filename, mode, maxBytes, backupCount, encoding, delay) -- self.rotate_lock = dnf.lock.build_log_lock("/var/log/", True) -+ self.rotate_lock = dnf.lock.build_log_lock("/", True) - - def emit(self, record): - while True: diff --git a/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch b/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch deleted file mode 100644 index 6bffe9af0a..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3881757eabfde2ff54400ab127b106ab085d83f0 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 13 Mar 2024 11:22:05 +0800 -Subject: [PATCH] lock.py: fix Exception handling - -Before, when logdir is not writable, _try_lock will raise an Exception -like "Permission denied: '/var/log/log_lock.pid'", and in this case, -_unlock_thread will not be called and the variable count will not be -handled, it maybe cause log_lock.pid not be deleted in case like [1]. - -For [1], it is an cross compile case, when dnf install some packages to -rootfs, seems like some threads don't do chroot like work, some threads -do chroot like work. so for the threads don't do chroot, "Permission denied" -Exception happend, for the threads that do chroot, log_lock.pid will be -created under installroot/var/log/log_lock.pid, since variable count not -handled correct before, log_lock.pid may not be deleted correctly. - -So fixed like this, if _try_lock raise Exception, _unlock_thread first, -then raise the Exception. - -[1] https://github.com/rpm-software-management/dnf/issues/1963 - -Upstream-Status: Submitted [ https://github.com/rpm-software-management/dnf/pull/2065 ] - -Signed-off-by: Changqing Li ---- - dnf/lock.py | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/dnf/lock.py b/dnf/lock.py -index 6817aac9..5718062a 100644 ---- a/dnf/lock.py -+++ b/dnf/lock.py -@@ -128,7 +128,11 @@ class ProcessLock(object): - self._lock_thread() - prev_pid = -1 - my_pid = os.getpid() -- pid = self._try_lock(my_pid) -+ try: -+ pid = self._try_lock(my_pid) -+ except Exception: -+ self._unlock_thread() -+ raise - while pid != my_pid: - if pid != -1: - if not self.blocking: -@@ -140,7 +144,11 @@ class ProcessLock(object): - logger.info(msg) - prev_pid = pid - time.sleep(1) -- pid = self._try_lock(my_pid) -+ try: -+ pid = self._try_lock(my_pid) -+ except Exception: -+ self._unlock_thread() -+ raise - - def __exit__(self, *exc_args): - if self.count == 1: --- -2.25.1 - 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 deleted file mode 100644 index fcd970a7ae..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch +++ /dev/null @@ -1,21 +0,0 @@ -From fa32c7dcabaa3c00d3620a3266e49629365c0cbe 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 0da0f2a2..9330d15b 100644 ---- a/dnf/cli/completion_helper.py.in -+++ b/dnf/cli/completion_helper.py.in -@@ -1,4 +1,4 @@ --#!@PYTHON_EXECUTABLE@ -+#!/usr/bin/env python3 - # - # This file is part of dnf. - # diff --git a/meta/recipes-devtools/dnf/dnf/0002-cmake-set-CMP0190-to-OLD.patch b/meta/recipes-devtools/dnf/dnf/0002-cmake-set-CMP0190-to-OLD.patch new file mode 100644 index 0000000000..3ac3923956 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0002-cmake-set-CMP0190-to-OLD.patch @@ -0,0 +1,51 @@ +From 8eb5a6208fd9edfa7796d974b2e5256b05ffe001 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 27 Nov 2025 11:49:43 +0100 +Subject: [PATCH] cmake: set CMP0190 to OLD + +Starting with CMake 4.1, cross-compiling python3 requires setting +-DCMAKE_CROSSCOMPILING_EMULATOR which can be done by inheriting +cmake-qemu. However, this leads to the following error: +Interpreter: Cannot run the interpreter ".../python3-native/python3" + +This is due to the target sysroot python3 binary not being installed +because it can't be executed. + +Set CMP0190 to old to force the old behavior. + +https://cmake.org/cmake/help/latest/policy/CMP0190.html + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Adam Duskett +--- + bindings/python3/CMakeLists.txt | 1 + + libdnf5-plugins/python_plugins_loader/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/bindings/python3/CMakeLists.txt b/bindings/python3/CMakeLists.txt +index fa7033d..4bfa434 100644 +--- a/bindings/python3/CMakeLists.txt ++++ b/bindings/python3/CMakeLists.txt +@@ -6,6 +6,7 @@ endif() + message("Building bindings for python3") + + ++cmake_policy(SET CMP0190 OLD) + find_package(Python3 REQUIRED COMPONENTS Interpreter Development) + include_directories(${Python3_INCLUDE_DIRS}) + +diff --git a/libdnf5-plugins/python_plugins_loader/CMakeLists.txt b/libdnf5-plugins/python_plugins_loader/CMakeLists.txt +index 5454a5d..d4a9915 100644 +--- a/libdnf5-plugins/python_plugins_loader/CMakeLists.txt ++++ b/libdnf5-plugins/python_plugins_loader/CMakeLists.txt +@@ -6,6 +6,7 @@ if(NOT WITH_PYTHON_PLUGINS_LOADER) + return() + endif() + ++cmake_policy(SET CMP0190 OLD) + find_package(Python3 REQUIRED COMPONENTS Interpreter Development) + find_package(SWIG REQUIRED) + include_directories(${Python3_INCLUDE_DIRS}) +-- +2.52.0 + diff --git a/meta/recipes-devtools/dnf/dnf/0003-Do-not-hardcode-system_cachedir.patch b/meta/recipes-devtools/dnf/dnf/0003-Do-not-hardcode-system_cachedir.patch new file mode 100644 index 0000000000..af934e8af7 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0003-Do-not-hardcode-system_cachedir.patch @@ -0,0 +1,36 @@ +From d0718ed10c1c255850fff5922f533bceef10f659 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 27 Nov 2025 11:50:20 +0100 +Subject: [PATCH] Do not hardcode system_cachedir + +Because dnf is ran in a fakeroot environment, the UID of the +"user" is 0, and the hardcoded paths to the host system are +attempted, leading to the following error: + +[log_check] DEBUG: Failed to expire repository cache in path "/var/cache/libdnf5/ + +Remove the check for geteuid() == 0 and rely only on the +user cache dir. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Adam Duskett +--- + libdnf5/conf/config_main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libdnf5/conf/config_main.cpp b/libdnf5/conf/config_main.cpp +index a83e4a2..ebdea4d 100644 +--- a/libdnf5/conf/config_main.cpp ++++ b/libdnf5/conf/config_main.cpp +@@ -239,7 +239,7 @@ class ConfigMain::Impl { + // Repo main config + + OptionNumber retries{10}; +- OptionPath cachedir{geteuid() == 0 ? SYSTEM_CACHEDIR : libdnf5::xdg::get_user_cache_dir() / "libdnf5"}; ++ OptionPath cachedir{libdnf5::xdg::get_user_cache_dir() / "libdnf5"}; + OptionBool fastestmirror{false}; + OptionStringAppendList excludeenvs{std::vector{}}; + OptionStringAppendList excludegroups{std::vector{}}; +-- +2.52.0 + diff --git a/meta/recipes-devtools/dnf/dnf/0004-add-support-for-gcc-12-and-below.patch b/meta/recipes-devtools/dnf/dnf/0004-add-support-for-gcc-12-and-below.patch new file mode 100644 index 0000000000..a3be14f3c6 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0004-add-support-for-gcc-12-and-below.patch @@ -0,0 +1,97 @@ +From 930b075be572a04c5da78b002d2258b1dab85321 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Tue, 17 Feb 2026 17:03:46 +0100 +Subject: [PATCH] add support for gcc 12 and below + + - Add missing headers for gcc <= 12 + - Add support for libfmt if the format header is not found + +Note: This patch should be removed once the minimum GCC version +for Yocto is >= 13. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Adam Duskett +--- + libdnf5/CMakeLists.txt | 9 +++++++++ + libdnf5/base/goal_elements.cpp | 2 +- + libdnf5/conf/config_main.cpp | 8 ++++++++ + libdnf5/logger/memory_buffer_logger.cpp | 1 + + 4 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/libdnf5/CMakeLists.txt b/libdnf5/CMakeLists.txt +index 770fc86..cf27081 100644 +--- a/libdnf5/CMakeLists.txt ++++ b/libdnf5/CMakeLists.txt +@@ -7,6 +7,9 @@ if (NOT WITH_MODULEMD) + list(REMOVE_ITEM LIBDNF5_SOURCES ${LIBDNF5_SOURCES_MODULES}) + endif() + ++include(CheckIncludeFileCXX) ++check_include_file_cxx("format" CXX_FORMAT_SUPPORT) ++ + # gather all pkg-config requires and write them to a .pc file later + list(APPEND LIBDNF5_PC_REQUIRES) + list(APPEND LIBDNF5_PC_REQUIRES_PRIVATE) +@@ -45,6 +48,12 @@ set_target_properties(libdnf5 PROPERTIES SOVERSION ${DNF_SO_VERSION}) + # required to have dlopen symbol + target_link_libraries(libdnf5 PUBLIC ${CMAKE_DL_LIBS}) + ++if (NOT CXX_FORMAT_SUPPORT) ++ find_package(fmt REQUIRED) ++ target_link_libraries(libdnf5_obj PRIVATE fmt::fmt) ++ target_compile_definitions(libdnf5_obj PUBLIC USE_FMTLIB) ++endif() ++ + # required by clang + target_link_libraries(libdnf5 PUBLIC stdc++) + +diff --git a/libdnf5/base/goal_elements.cpp b/libdnf5/base/goal_elements.cpp +index 054232a..87a1fca 100644 +--- a/libdnf5/base/goal_elements.cpp ++++ b/libdnf5/base/goal_elements.cpp +@@ -17,7 +17,7 @@ + // You should have received a copy of the GNU Lesser General Public License + // along with libdnf. If not, see . + +- ++#include + #include "libdnf5/base/goal_elements.hpp" + + #include "libdnf5/common/exception.hpp" +diff --git a/libdnf5/conf/config_main.cpp b/libdnf5/conf/config_main.cpp +index 1f0b64b..a926dd5 100644 +--- a/libdnf5/conf/config_main.cpp ++++ b/libdnf5/conf/config_main.cpp +@@ -37,9 +37,17 @@ + #include + #include + #include ++#include + #include + #include + ++#ifdef USE_FMTLIB ++#include ++namespace std { ++ using fmt::format; ++} ++#endif ++ + namespace libdnf5 { + + /// @brief Converts a friendly bandwidth option to bytes +diff --git a/libdnf5/logger/memory_buffer_logger.cpp b/libdnf5/logger/memory_buffer_logger.cpp +index 85bf707..89307e9 100644 +--- a/libdnf5/logger/memory_buffer_logger.cpp ++++ b/libdnf5/logger/memory_buffer_logger.cpp +@@ -20,6 +20,7 @@ + #include "libdnf5/logger/memory_buffer_logger.hpp" + + #include ++#include + + namespace libdnf5 { + +-- +2.53.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 deleted file mode 100644 index a1c58d6563..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0e7fc4a8523aad616493e6ad33c509e1e530d852 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 11 Jan 2017 15:10:13 +0200 -Subject: [PATCH] Do not prepend installroot to logdir. - -This would otherwise write the logs into rootfs/var/log -(whereas we want them in $T), -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 d3844df3..ac080f79 100644 ---- a/dnf/cli/cli.py -+++ b/dnf/cli/cli.py -@@ -954,7 +954,7 @@ class Cli(object): - logger.warning(_("Unable to detect release version (use '--releasever' to specify " - "release version)")) - -- for opt in ('cachedir', 'logdir', 'persistdir'): -+ for opt in ('cachedir', 'persistdir'): - conf.prepend_installroot(opt) - - self.base._logging._setup_from_dnf_conf(conf) diff --git a/meta/recipes-devtools/dnf/dnf/0005-libdnf-fix-arm-arch-mapping-issues-for-qemuarmv5.patch b/meta/recipes-devtools/dnf/dnf/0005-libdnf-fix-arm-arch-mapping-issues-for-qemuarmv5.patch new file mode 100644 index 0000000000..213382a4df --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0005-libdnf-fix-arm-arch-mapping-issues-for-qemuarmv5.patch @@ -0,0 +1,59 @@ +From 32e926c627a3d0e81ce14890464abc5e5be74558 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 27 Nov 2025 11:48:43 +0100 +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. + +This arm mapping code can work or in the case of qemuarmv5, it doesn't as it +creates armv5hl which doesn't exist and causes errrors. We can simply remove +it, we don't need it. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Richard Purdie + +Rebased for 5.3.0.0 +Signed-off-by: Adam Duskett +--- + libdnf5/utils/system.cpp | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/libdnf5/utils/system.cpp b/libdnf5/utils/system.cpp +index ecdc57e..35d8801 100644 +--- a/libdnf5/utils/system.cpp ++++ b/libdnf5/utils/system.cpp +@@ -52,30 +52,6 @@ std::string detect_arch() { + throw RuntimeError(M_("Failed to execute uname()")); + } + +- if (!strncmp(un.machine, "armv", 4)) { +- /* un.machine is armvXE, where X is version number and E is +- * endianness (b or l); we need to add modifiers such as +- * h (hardfloat), n (neon). Neon is a requirement of armv8 so +- * as far as rpm is concerned armv8l is the equivalent of armv7hnl +- * (or 7hnb) so we don't explicitly add 'n' for 8+ as it's expected. */ +- char endian = un.machine[strlen(un.machine) - 1]; +- char * modifier = un.machine + 5; +- while (isdigit(*modifier)) /* keep armv7, armv8, armv9, armv10, armv100, ... */ +- modifier++; +- if (getauxval(AT_HWCAP) & HWCAP_ARM_VFP) +- *modifier++ = 'h'; +- if ((atoi(un.machine + 4) == 7) && (getauxval(AT_HWCAP) & HWCAP_ARM_NEON)) +- *modifier++ = 'n'; +- *modifier++ = endian; +- *modifier = 0; +- } +-#ifdef __MIPSEL__ +- // support for little endian MIPS +- if (!strcmp(un.machine, "mips")) +- strcpy(un.machine, "mipsel"); +- else if (!strcmp(un.machine, "mips64")) +- strcpy(un.machine, "mips64el"); +-#endif + return un.machine; + } + +-- +2.52.0 + diff --git a/meta/recipes-devtools/dnf/dnf/0006-dnf-automatic-use-bin-sh.patch b/meta/recipes-devtools/dnf/dnf/0006-dnf-automatic-use-bin-sh.patch new file mode 100644 index 0000000000..63f0510c9a --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0006-dnf-automatic-use-bin-sh.patch @@ -0,0 +1,27 @@ +From 752636367ae986992219da82b1d34cf69584b350 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Tue, 17 Feb 2026 18:58:36 +0100 +Subject: [PATCH] dnf-automatic: use /bin/sh + +/bin/sh is guaranteed by POSIX but /usr/bin/sh is not. +This prevents packaging errors on systems without usrmerge as /usr/bin/sh does not exist. + +Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf5/pull/2613] +Signed-off-by: Adam Duskett +--- + dnf5-plugins/automatic_plugin/bin/dnf-automatic | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf5-plugins/automatic_plugin/bin/dnf-automatic b/dnf5-plugins/automatic_plugin/bin/dnf-automatic +index 6247767a82..69b8f2c11b 100755 +--- a/dnf5-plugins/automatic_plugin/bin/dnf-automatic ++++ b/dnf5-plugins/automatic_plugin/bin/dnf-automatic +@@ -1,4 +1,4 @@ +-#!/usr/bin/sh ++#!/bin/sh + # Compatibility wrapper to handle old "/usr/bin/dnf-automatic" name from dnf4. + + dnf5 automatic "$@" +-- +2.53.0 + diff --git a/meta/recipes-devtools/dnf/dnf/0007-only-install-service-files-if-WITH_SYSTEMD-is-set.patch b/meta/recipes-devtools/dnf/dnf/0007-only-install-service-files-if-WITH_SYSTEMD-is-set.patch new file mode 100644 index 0000000000..d7d56dcde8 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0007-only-install-service-files-if-WITH_SYSTEMD-is-set.patch @@ -0,0 +1,74 @@ +From 9b1ca81ae615c26506b8536824b1e0dcb8243b6a Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 23 Feb 2026 15:20:26 +0100 +Subject: [PATCH] only install service files if WITH_SYSTEMD is set + +No need to install systemd service files if a user configures dnf with +WITH_SYSTEMD=OFF + +Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf5/pull/2623] +Signed-off-by: Adam Duskett +--- + dnf5-plugins/automatic_plugin/CMakeLists.txt | 5 ++++- + dnf5daemon-server/dbus/CMakeLists.txt | 18 ++++++++++-------- + etc/CMakeLists.txt | 4 +++- + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/dnf5-plugins/automatic_plugin/CMakeLists.txt b/dnf5-plugins/automatic_plugin/CMakeLists.txt +index d0834cb..74d713d 100644 +--- a/dnf5-plugins/automatic_plugin/CMakeLists.txt ++++ b/dnf5-plugins/automatic_plugin/CMakeLists.txt +@@ -12,7 +12,10 @@ target_link_libraries(automatic_cmd_plugin PRIVATE libdnf5 libdnf5-cli) + target_link_libraries(automatic_cmd_plugin PRIVATE dnf5) + + install(TARGETS automatic_cmd_plugin LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/dnf5/plugins/) +-install(DIRECTORY "config/usr/" DESTINATION "${CMAKE_INSTALL_PREFIX}") ++install(DIRECTORY "config/usr/share" DESTINATION "${CMAKE_INSTALL_PREFIX}") ++if (WITH_SYSTEMD) ++ install(DIRECTORY "config/usr/lib" DESTINATION "${CMAKE_INSTALL_PREFIX}") ++endif() + + install(PROGRAMS bin/dnf-automatic TYPE BIN) + +diff --git a/dnf5daemon-server/dbus/CMakeLists.txt b/dnf5daemon-server/dbus/CMakeLists.txt +index 3f993a2..8d4ddfe 100644 +--- a/dnf5daemon-server/dbus/CMakeLists.txt ++++ b/dnf5daemon-server/dbus/CMakeLists.txt +@@ -2,15 +2,17 @@ set(SYSTEMD_UNIT_DIR /usr/lib/systemd/system) + set(DBUS_SHARE_DIR /usr/share/dbus-1) + set(DBUS_CONFIG_DIR ${DBUS_SHARE_DIR}/system.d) + +-install ( +- FILES "dnf5daemon-server.service" +- DESTINATION ${SYSTEMD_UNIT_DIR} +-) ++if (WITH_SYSTEMD) ++ install ( ++ FILES "dnf5daemon-server.service" ++ DESTINATION ${SYSTEMD_UNIT_DIR} ++ ) + +-install ( +- FILES "org.rpm.dnf.v0.service" +- DESTINATION ${DBUS_SHARE_DIR}/system-services +-) ++ install ( ++ FILES "org.rpm.dnf.v0.service" ++ DESTINATION ${DBUS_SHARE_DIR}/system-services ++ ) ++endif() + + install ( + FILES "org.rpm.dnf.v0.conf" +diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt +index 534840c..e5f3d38 100644 +--- a/etc/CMakeLists.txt ++++ b/etc/CMakeLists.txt +@@ -1 +1,3 @@ +-add_subdirectory("systemd") ++if (WITH_SYSTEMD) ++ add_subdirectory("systemd") ++endif() +-- +2.53.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 deleted file mode 100644 index 64ea7874d3..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d5b154ea69afdcd862299a0b7f255f6ece3686c6 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 - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e2e9e9e..2056089d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,7 +19,7 @@ ELSE () - MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) - ENDIF() - --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) - MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") - - ADD_SUBDIRECTORY (dnf) 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 deleted file mode 100644 index eb46113f3a..0000000000 --- a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d3556767b84f3687743fdad0a88af0739d736ea9 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 30 Dec 2016 18:29:37 +0200 -Subject: [PATCH] Run python scripts using env - -Otherwise the build tools hardcode the python path into them. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - bin/dnf-automatic.in | 2 +- - bin/dnf.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in -index 17e35a05..28827e38 100755 ---- a/bin/dnf-automatic.in -+++ b/bin/dnf-automatic.in -@@ -1,4 +1,4 @@ --#!@PYTHON_EXECUTABLE@ -+#!/usr/bin/env python3 - # dnf-automatic executable. - # - # Copyright (C) 2014-2016 Red Hat, Inc. -diff --git a/bin/dnf.in b/bin/dnf.in -index 55ceb3f2..e38973c7 100755 ---- a/bin/dnf.in -+++ b/bin/dnf.in -@@ -1,4 +1,4 @@ --#!@PYTHON_EXECUTABLE@ -+#!/usr/bin/env python3 - # The dnf executable script. - # - # Copyright (C) 2012-2016 Red Hat, Inc. diff --git a/meta/recipes-devtools/dnf/dnf_4.24.0.bb b/meta/recipes-devtools/dnf/dnf_4.24.0.bb deleted file mode 100644 index d40b85c4b0..0000000000 --- a/meta/recipes-devtools/dnf/dnf_4.24.0.bb +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolver" -DESCRIPTION = "Software package manager that installs, updates, and removes \ -packages on RPM-based Linux distributions. It automatically computes \ -dependencies and determines the actions required to install packages." -HOMEPAGE = "https://github.com/rpm-software-management/dnf" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \ - " - -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 \ - " - -SRC_URI:append:class-native = " file://0001-dnf-write-the-log-lock-to-root.patch" - -SRCREV = "e47634fbe3565d0580e89ec21adb7c1b308642ce" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -inherit cmake gettext bash-completion setuptools3-base systemd - -DEPENDS += "libdnf librepo libcomps" - -# manpages generation requires http://www.sphinx-doc.org/ -EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN} += " \ - python3-core \ - python3-codecs \ - python3-ctypes \ - python3-netclient \ - python3-email \ - python3-threading \ - python3-logging \ - python3-fcntl \ - librepo \ - python3-shell \ - libcomps \ - libdnf \ - python3-sqlite3 \ - python3-compression \ - python3-rpm \ - python3-json \ - python3-curses \ - python3-misc \ - " - -RDEPENDS:${PN}:class-native = "" - -RRECOMMENDS:${PN}:class-target += "gnupg" - -# Create a symlink called 'dnf' as 'make install' does not do it, but -# .spec file in dnf source tree does (and then Fedora and dnf documentation -# says that dnf binary is plain 'dnf'). -do_install:append() { - ln -rs ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf - ln -rs ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic -} - -# Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in -do_install:append:class-native() { - create_wrapper ${D}/${bindir}/dnf \ - SEQUOIA_CRYPTO_POLICY=${STAGING_DATADIR_NATIVE}/crypto-policies/back-ends/rpm-sequoia.config \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ - RPM_NO_CHROOT_FOR_SCRIPTS=1 -} - -do_install:append:class-nativesdk() { - create_wrapper ${D}/${bindir}/dnf \ - RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ - RPM_NO_CHROOT_FOR_SCRIPTS=1 -} - -SYSTEMD_SERVICE:${PN} = "dnf-makecache.service dnf-makecache.timer \ - dnf-automatic.service dnf-automatic.timer \ - dnf-automatic-download.service dnf-automatic-download.timer \ - dnf-automatic-install.service dnf-automatic-install.timer \ - dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ -" -SYSTEMD_AUTO_ENABLE ?= "disable" - -SKIP_RECIPE[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" - -# Packages for testing purposes -PACKAGES += "${PN}-test-main ${PN}-test-dep" -ALLOW_EMPTY:${PN}-test-main = "1" -ALLOW_EMPTY:${PN}-test-dep = "1" -RRECOMMENDS:${PN}-test-main = "${PN}-test-dep" diff --git a/meta/recipes-devtools/dnf/dnf_5.4.0.0.bb b/meta/recipes-devtools/dnf/dnf_5.4.0.0.bb new file mode 100644 index 0000000000..dd7a8a042e --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf_5.4.0.0.bb @@ -0,0 +1,181 @@ +SUMMARY = "DNF package manager rewritten in C++, using libsolv as a dependency resolver" +DESCRIPTION = "\ + DNF5 is a command-line package manager that automates the process of \ + installing, upgrading, configuring, and removing computer programs in a \ + consistent manner. It supports RPM packages, modulemd modules, and comps \ + groups and environments. \ +" +HOMEPAGE = "https://github.com/rpm-software-management/dnf5" +BUGTRACKER = "https://github.com/rpm-software-management/dnf5/issues" +CVE_PRODUCT = "rpm:dnf5 rpm-software-management:dnf5" +SECTION = "base" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-only" +LIC_FILES_CHKSUM = "\ + file://COPYING.md;md5=9733192df318d0f806fd668b92ba0ba6 \ + file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ +" + +DEPENDS = "\ + fmt \ + glib-2.0 \ + json-c \ + libmodulemd \ + librepo \ + libsolv \ + libtoml11 \ + libxml2 \ + sqlite3 \ + util-linux \ +" + +SRC_URI = "\ + git://github.com/rpm-software-management/dnf5.git;protocol=https;branch=main;tag=${PV} \ + file://0002-cmake-set-CMP0190-to-OLD.patch \ + file://0003-Do-not-hardcode-system_cachedir.patch \ + file://0004-add-support-for-gcc-12-and-below.patch \ + file://0005-libdnf-fix-arm-arch-mapping-issues-for-qemuarmv5.patch \ + file://0006-dnf-automatic-use-bin-sh.patch \ + file://0007-only-install-service-files-if-WITH_SYSTEMD-is-set.patch \ +" +SRC_URI:append:class-native = " file://0001-Do-not-hardcode-the-systemd-unit-directory.patch" +SRCREV = "4456507f5ffa34a665436e8dad49e134651d709f" + +inherit bash-completion cmake gettext pkgconfig siteinfo systemd +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3targetconfig', '', d)} + +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF,acl" +PACKAGECONFIG[dnfdaemon-client] = "-DWITH_DNF5DAEMON_CLIENT=ON,-DWITH_DNF5DAEMON_CLIENT=OFF,sdbus-c++" +PACKAGECONFIG[dnfdaemon-server] = "-DWITH_DNF5DAEMON_SERVER=ON,-DWITH_DNF5DAEMON_SERVER=OFF,sdbus-c++" +PACKAGECONFIG[plugins] = "-DWITH_DNF5_PLUGINS=ON,-DWITH_DNF5_PLUGINS=OFF,curl sdbus-c++ zlib" +PACKAGECONFIG[plugin-actions] = "-DWITH_PLUGIN_ACTIONS=ON,-DWITH_PLUGIN_ACTIONS=OFF" +PACKAGECONFIG[plugin-appstream] = "-DWITH_PLUGIN_APPSTREAM=ON,-DWITH_PLUGIN_APPSTREAM=OFF,appstream" +PACKAGECONFIG[plugin-expired-pgp-keys] = "-DWITH_PLUGIN_EXPIRED_PGP_KEYS=ON,-DWITH_PLUGIN_EXPIRED_PGP_KEYS=OFF,gnupg" +PACKAGECONFIG[plugin-local] = "-DWITH_PLUGIN_LOCAL=ON,-DWITH_PLUGIN_LOCAL=OFF" + +# sdbus-c++ and journalctl integration. +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,sdbus-c++" + +# build options - bindings +PACKAGECONFIG[python3] = "-DWITH_PYTHON3=ON,-DWITH_PYTHON3=OFF,python3 swig-native" + +# No sdbus-c++-native package. +PACKAGECONFIG:remove:class-native = "\ + dnfdaemon-client \ + dnfdaemon-server \ + plugins \ + plugin-manifest \ + systemd \ +" + +PACKAGE_BEFORE_PN += "\ + ${PN}-dnfdaemon-server \ + ${PN}-plugins \ + ${PN}-python3 \ + ${PN}-systemd \ +" + +# manpages generation requires http://www.sphinx-doc.org/ +EXTRA_OECMAKE:append = " \ + -DENABLE_SOLV_FOCUSNEW=ON \ + -DWITH_DNF5_OBSOLETES_DNF=OFF \ + -DWITH_DNF5=ON \ + -DWITH_GO=OFF \ + -DWITH_HTML=OFF \ + -DWITH_LIBDNF5_CLI=ON \ + -DWITH_MAN=OFF \ + -DWITH_PERL5=OFF \ + -DWITH_PLUGIN_RHSM=OFF \ + -DWITH_RUBY=OFF \ + -DWITH_TESTS=OFF \ + -DWITH_PLUGIN_MANIFEST=OFF \ +" + +# No sdbus-c++-native package exists so remove all options that depend on it. +EXTRA_OECMAKE:append:class-native = " \ + -DWITH_DNF5DAEMON_CLIENT=OFF \ + -DWITH_DNF5DAEMON_SERVER=OFF \ + -DWITH_DNF5_PLUGINS=OFF \ + -DWITH_PLUGIN_MANIFEST=OFF \ + -DWITH_SYSTEMD=OFF \ +" + +# Create a symlink called 'dnf' as 'make install' does not do it, but +# .spec file in dnf source tree does (and then Fedora and dnf documentation +# says that dnf binary is plain 'dnf'). +do_install:append() { + ln -rs ${D}/${bindir}/dnf5 ${D}/${bindir}/dnf + install -d ${D}${sysconfdir}/dnf + + # Breaks dnf because the builddep plugin is provided in the + # dnf-plugins-core package which is not available in oe-core. + rm -f ${D}${datadir}/dnf5/aliases.d/compatibility-plugins.conf +} + +# Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in +do_install:append:class-native() { + create_wrapper ${D}/${bindir}/dnf \ + SEQUOIA_CRYPTO_POLICY=${STAGING_DATADIR_NATIVE}/crypto-policies/back-ends/rpm-sequoia.config \ + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_NO_CHROOT_FOR_SCRIPTS=1 +} + +do_install:append:class-nativesdk() { + create_wrapper ${D}/${bindir}/dnf \ + RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ + RPM_NO_CHROOT_FOR_SCRIPTS=1 +} + +# Packages for testing purposes +PACKAGES += "${PN}-test-main ${PN}-test-dep" + +FILES:${PN} += "\ + ${bindir}/dnf* \ + ${datadir}/dbus-1/system-services/org.rpm.dnf.v0.service \ + ${datadir}/dnf5 \ + ${datadir}/polkit-1/actions/org.rpm.dnf* \ + ${datadir}/polkit-1/rules.d/org.rpm.dnf* \ + ${libdir}/dnf5 \ + ${libdir}/libdnf5* \ + ${sysconfdir}/dnf \ +" + +FILES:${PN}-bash-completion += "\ + ${datadir}/bash-completion/completions/dnf5 \ +" + +FILES:${PN}-dnfdaemon-server += "\ + ${systemd_system_unitdir}/dnf5daemon-server.service \ + ${datadir}/dbus-1/interfaces/org.rpm.dnf* \ + ${datadir}/dbus-1/system.d/org.rpm.dnf* \ +" + +FILES:${PN}-plugins += "\ + ${systemd_system_unitdir}/dnf-automatic.service \ + ${systemd_system_unitdir}/dnf-automatic.timer \ + ${systemd_system_unitdir}/dnf5-automatic.service \ + ${systemd_system_unitdir}/dnf5-automatic.timer \ +" + +FILES:${PN}-python3 += "\ + ${libdir}/${PYTHON_DIR}/site-packages/libdnf* \ +" + +FILES:${PN}-systemd += "\ + ${systemd_system_unitdir}/dnf5-makecache.service \ + ${systemd_system_unitdir}/dnf5-makecache.timer \ + ${systemd_system_unitdir}/dnf5-offline-transaction-cleanup.service \ + ${systemd_system_unitdir}/dnf5-offline-transaction.service \ +" + +SYSTEMD_AUTO_ENABLE ?= "disable" + +RRECOMMENDS:${PN}:class-target += "bash-completion gnupg" +RRECOMMENDS:${PN}-test-main = "${PN}-test-dep" +ALLOW_EMPTY:${PN}-test-main = "1" +ALLOW_EMPTY:${PN}-test-dep = "1" + +SKIP_RECIPE[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build without package_rpm in PACKAGE_CLASSES due to disabled rpm support in libsolv', d)}" + +BBCLASSEXTEND = "native nativesdk" From patchwork Tue Mar 31 09:57:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 84889 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 68272FF60FD for ; Tue, 31 Mar 2026 09:57:29 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16612.1774951042876025676 for ; Tue, 31 Mar 2026 02:57:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=VVJD25K3; spf=pass (domain: amarulasolutions.com, ip: 209.85.208.67, mailfrom: adam.duskett@amarulasolutions.com) Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-65a1faf828bso805548a12.2 for ; Tue, 31 Mar 2026 02:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1774951041; x=1775555841; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aT0B5lqgSWgAS1t6IF675HO1bw8jbcemwzbMdHVvBbo=; b=VVJD25K30D+EaPq5ME7TO1QtYIIugs45FUI9tQ11bD0s+bmQgE1grviTNfybuQFG3/ NHx9kwO7b9mJ2JWIOEehKX3qrCC+i1unl5tcQf64119DW/9gECFuQ21t66c5iip9fIPX s1P7yhu1vEk06P7TI33AphFyCHQsv+a/GYmUA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774951041; x=1775555841; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=aT0B5lqgSWgAS1t6IF675HO1bw8jbcemwzbMdHVvBbo=; b=lBR06ggZxksXst/UtreXCtkCesM7cfQgs/oshNGG/IWHi17O6hJw+XLPYJzt1rLCHy s3CL3fIKgWF9FR+nYAh5AumSopZuG361PdBnfiT8p/lY1nqYKa++5wb24Pg9+xYE12xP mWY1PCqbqJozVVSP4jV5GJ5grbX/6fiMVYiY/9IlJYhxpBK+7vfCbshzjsNMmz3MF85P 1VhMeusrBT0/O3L7SSWm+UeA73bjgLkPWp1MqwoHCq2rQiLYu93rI9Iilh7qFioIN6Q8 0meMOfmvP/2UkJlrl4fjw84dGQdqUl/cBPv1rUNNleuTntWobUtQTpAplJZrkLaWhFnK fKvQ== X-Gm-Message-State: AOJu0YxRpBPa6ig4Prl55uatzrXBZeouau0f1gdOcr9+bE4uTn1xrQPH ++zfelGzP94EqO1ZRrDm5i4jQM/XdoMKktfV3XRr+RLIcR/BGC1jSG58SkAqTuRdGsaOLki/4Oe VlGhY0B37dQ== X-Gm-Gg: ATEYQzwTN2OOfCYRr8rDWAUJx83XdCsNorjhrldVvLZxpjZb8AXjPVmxS/kSoyrf1bk xfNsRpU2ZpmtHcIoMLa/o9HzHPfVWGjcbmoMp7GmBlsSLj/7/P2pePT7YzRTwB90TNuRUh78Ro8 ECmNbjQZeAAfrR+ZmJFETlYSwtwXO/YbkycLsrdlGAGJiZnl/sbstTl2rjMe9Oz8K5KKLbAG//8 jIOdgIb4HPIH02JQKJzQcuv1HdEd6WGaa947NVT8S4D/Srs4Zai7sZN9+/LLMhVF4kFlbd1Qqr0 oD6N1/QY6bD9RidskFzwCm5RJnIkY8A8DcXC8f2Sb9uFzUBiERlSh+YVp0rPvaraQSdUd3jMRUK 2nbQH+0U1ErmnPKInvNiUafPzHiavFE/rSLbqqI8vKSVa6aI9+wu9lNBWx0Wy/78+Vi1y/hkaqp aINDNco3j9JHhU76KY+hMcvCTLJEAtAPfdjtp4uyHpjc9Y+p1KiL+8bYUWuMSs1LtCE8LJI0899 bRF+q1FUzo= X-Received: by 2002:a05:6402:1e88:b0:66c:4d46:2df2 with SMTP id 4fb4d7f45d1cf-66c4d4631bcmr371798a12.7.1774951041084; Tue, 31 Mar 2026 02:57:21 -0700 (PDT) Received: from adam.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-66b7607a653sm3413599a12.24.2026.03.31.02.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 02:57:20 -0700 (PDT) From: Adam Duskett To: openembedded-core@lists.openembedded.org Cc: Adam Duskett Subject: [PATCH v8 7/7] libdnf: remove recipe Date: Tue, 31 Mar 2026 11:57:13 +0200 Message-ID: <20260331095714.1285106-7-adam.duskett@amarulasolutions.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> References: <20260331095714.1285106-1-adam.duskett@amarulasolutions.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Mar 2026 09:57:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234278 libdnf5 is now included in the dnf5 source tree. Signed-off-by: Adam Duskett --- meta/conf/distro/include/maintainers.inc | 1 - ...or-both-libsolv-and-libsolvext-libdn.patch | 26 ---------- ...FNM_EXTMATCH-if-not-already-like-und.patch | 39 -------------- .../0001-drop-FindPythonInstDir.cmake.patch | 39 -------------- ...-utils.cpp-fix-compilation-with-musl.patch | 51 ------------------- ...ables-with-pkg-config-cmake-s-own-mo.patch | 27 ---------- .../libdnf/libdnf/armarch.patch | 50 ------------------ meta/recipes-devtools/libdnf/libdnf_0.75.0.bb | 33 ------------ 8 files changed, 266 deletions(-) delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-utils-utils.cpp-fix-compilation-with-musl.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf/armarch.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf_0.75.0.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4badb54396..4d723d291b 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -334,7 +334,6 @@ RECIPE_MAINTAINER:pn-libcxx = "Khem Raj " RECIPE_MAINTAINER:pn-libdaemon = "Unassigned " RECIPE_MAINTAINER:pn-libdazzle = "Unassigned " RECIPE_MAINTAINER:pn-libdisplay-info = "Hiago De Franco " -RECIPE_MAINTAINER:pn-libdnf = "Unassigned " RECIPE_MAINTAINER:pn-libdrm = "Unassigned " RECIPE_MAINTAINER:pn-libedit = "Khem Raj " RECIPE_MAINTAINER:pn-libepoxy = "Unassigned " 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 deleted file mode 100644 index 54b1262672..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cd8a24156cefab80b673af233f66ff44c1b7c458 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 - - using both) - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] -Signed-off-by: Alexander Kanavin ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a6f14318..60c66e94 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ endif() - - - # build dependencies --PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) -+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) - set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) - - diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch b/meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch deleted file mode 100644 index 14ef362ccd..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 486d1c7826efb9e42bbb18b6537fd23a0a33b324 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Sun, 16 Nov 2025 23:29:18 +0000 -Subject: [PATCH] dnf-repo: Define FNM_EXTMATCH if not already (like under - musl). - -With musl, FNM_EXTMATCH is not defined: -dnf-repo.cpp -| dnf-repo.cpp: In function 'void dnf_repo_conf_load_overrides(DnfRepo*, const char*)': -| dnf-repo.cpp:971:50: error: 'FNM_EXTMATCH' was not declared in this scope; did you mean 'FNM_NOMATCH'? -| 971 | if (fnmatch(repo_id_pattern, repoId, FNM_EXTMATCH) != 0) { -| | ^~~~~~~~~~~~ -| | FNM_NOMATCH - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1737/commits/47ed831c1fdb32519f2d66fee91bc47f9521d1d4] - -Signed-off-by: Wang Mingyu ---- - libdnf/dnf-repo.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libdnf/dnf-repo.cpp b/libdnf/dnf-repo.cpp -index 44c0f8758..d53959414 100644 ---- a/libdnf/dnf-repo.cpp -+++ b/libdnf/dnf-repo.cpp -@@ -69,6 +69,10 @@ - #include - #include - -+#if !defined(FNM_EXTMATCH) -+#define FNM_EXTMATCH 0 -+#endif -+ - typedef struct - { - DnfRepoEnabled enabled; --- -2.43.0 - diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch deleted file mode 100644 index 850a862979..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5150fd9be924d2e9e74b2db664229423a4a00238 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Tue, 1 Jun 2021 10:23:59 +0800 -Subject: [PATCH] drop FindPythonInstDir.cmake - -Since commit [1] applied, PYTHON_INSTALL_DIR is not right -on nativesdk build -... -|Building for python3 -|-- Python install dir is -|tmp-glibc/work/x86_64-nativesdk-wrlinuxsdk-linux/nativesdk-libdnf/0.63.0-r0/ -recipe-sysroot-native/usr/lib/python3.9/site-packages -... - -Yocto manually set PYTHON_INSTALL_DIR from recipe, it is not -necessary to call FindPythonInstDir.cmake which will override -Yocto setting - -[1] https://github.com/rpm-software-management/libdnf/commit/f1cffbfb9f338da827e233c2d8ac3a25a6a59a69 - -Upstream-Status: Inappropriate [Yocto specific] - -Signed-off-by: Hongxu Jia ---- - cmake/modules/FindPythonInstDir.cmake | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/cmake/modules/FindPythonInstDir.cmake b/cmake/modules/FindPythonInstDir.cmake -index ed098ded..8b137891 100644 ---- a/cmake/modules/FindPythonInstDir.cmake -+++ b/cmake/modules/FindPythonInstDir.cmake -@@ -1,6 +1 @@ --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " --from sys import stdout --from sysconfig import get_path --path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'}) --stdout.write(path)" --OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+ diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-utils-utils.cpp-fix-compilation-with-musl.patch b/meta/recipes-devtools/libdnf/libdnf/0001-utils-utils.cpp-fix-compilation-with-musl.patch deleted file mode 100644 index 061e7dffbd..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-utils-utils.cpp-fix-compilation-with-musl.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 699608a4c03ebbf64c1d7b6f56d9811492175daa Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Mon, 17 Nov 2025 00:05:14 +0000 -Subject: [PATCH] utils/utils.cpp: fix compilation with musl - -The basename() function requires the libgen.h header when -compiling with musl-libc, otherwise it complains: -error: 'basename' was not declared in this scope; did you mean 'g_basename'? -Also, musl's basename requires char* instead of const char* argument: -error: invalid conversion from 'const char*' to 'char*' [-fpermissive] - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1737/commits/8720d5eeb0d348686d4c5f2ccb5a6c73d66eeff5] - -Signed-off-by: Wang Mingyu ---- - libdnf/utils/utils.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/libdnf/utils/utils.cpp b/libdnf/utils/utils.cpp -index f5d200b8a..501bc0ed2 100644 ---- a/libdnf/utils/utils.cpp -+++ b/libdnf/utils/utils.cpp -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -311,7 +312,7 @@ std::vector createSortedFileList( - auto * path_fname = basename(path); - bool found{false}; - for (const auto & path_in_list : paths) { -- if (strcmp(path_fname, basename(path_in_list.c_str())) == 0) { -+ if (strcmp(path_fname, basename((char*)path_in_list.c_str())) == 0) { - found = true; - break; - } -@@ -325,7 +326,7 @@ std::vector createSortedFileList( - - // sort all drop-in configuration files alphabetically by their names - std::sort(paths.begin(), paths.end(), [](const std::string & p1, const std::string & p2) { -- return strcmp(basename(p1.c_str()), basename(p2.c_str())) < 0; -+ return strcmp(basename((char*)p1.c_str()), basename((char*)p2.c_str())) < 0; - }); - - return paths; --- -2.43.0 - 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 deleted file mode 100644 index f55870802f..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a921a92f334a2a30741b906c206e041cef2d904d 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 - - doesn't work properly). - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] -Signed-off-by: Alexander Kanavin ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c6bd46a6..a6f14318 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,7 +51,8 @@ endif() - - - # build dependencies --find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext) -+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) -+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) - - - # build dependencies via pkg-config diff --git a/meta/recipes-devtools/libdnf/libdnf/armarch.patch b/meta/recipes-devtools/libdnf/libdnf/armarch.patch deleted file mode 100644 index 8a36f87227..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/armarch.patch +++ /dev/null @@ -1,50 +0,0 @@ -From baf4fc9f157e4c08c67d1a577b0f1e10f213a642 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. - -This arm mapping code can work or in the case of qemuarmv5, it doesn't as it creates -armv5hl which doesn't exist and causes errrors. We can simply remove it, we don't need it. - -Upstream-Status: Inappropriate [Relies on OE rpm config] ---- - 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; - -- if (!strncmp(un.machine, "armv", 4)) { -- /* un.machine is armvXE, where X is version number and E is -- * endianness (b or l); we need to add modifiers such as -- * h (hardfloat), n (neon). Neon is a requirement of armv8 so -- * as far as rpm is concerned armv8l is the equivilent of armv7hnl -- * (or 7hnb) so we don't explicitly add 'n' for 8+ as it's expected. */ -- char endian = un.machine[strlen(un.machine)-1]; -- char *modifier = un.machine + 5; -- while(isdigit(*modifier)) /* keep armv7, armv8, armv9, armv10, armv100, ... */ -- modifier++; -- if (getauxval(AT_HWCAP) & HWCAP_ARM_VFP) -- *modifier++ = 'h'; -- if ((atoi(un.machine+4) == 7) && (getauxval(AT_HWCAP) & HWCAP_ARM_NEON)) -- *modifier++ = 'n'; -- *modifier++ = endian; -- *modifier = 0; -- } --#ifdef __MIPSEL__ -- if (!strcmp(un.machine, "mips")) -- strcpy(un.machine, "mipsel"); -- else if (!strcmp(un.machine, "mips64")) -- strcpy(un.machine, "mips64el"); --#endif - *arch = g_strdup(un.machine); - return 0; - } diff --git a/meta/recipes-devtools/libdnf/libdnf_0.75.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.75.0.bb deleted file mode 100644 index ddcbc7d9ff..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf_0.75.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Library providing simplified C and Python API to libsolv" -HOMEPAGE = "https://github.com/rpm-software-management/libdnf" -DESCRIPTION = "This library provides a high level package-manager. It's core library of dnf, PackageKit and rpm-ostree. It's replacement for deprecated hawkey library which it contains inside and uses librepo under the hood." -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;protocol=https \ - file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ - file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ - file://0001-drop-FindPythonInstDir.cmake.patch \ - file://armarch.patch \ - file://0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch \ - file://0001-utils-utils.cpp-fix-compilation-with-musl.patch \ - " - -SRCREV = "d39573195e24b43687587a8d83b9f6ac274e2412" -UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" - -DEPENDS = "glib-2.0 libsolv librepo rpm libmodulemd json-c swig-native util-linux" - -inherit cmake pkgconfig setuptools3-base gettext - -COMPATIBLE_HOST_libc-musl = 'null' - -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 \ - -DWITH_GTKDOC=OFF -DWITH_MAN=OFF -DWITH_HTML=OFF \ - -DWITH_TESTS=OFF \ - -DWITH_ZCHUNK=OFF \ - " - -BBCLASSEXTEND = "native nativesdk" - -SKIP_RECIPE[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}"