From patchwork Tue Apr 15 13:32:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 61308 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 D2893C369CC for ; Tue, 15 Apr 2025 13:32:54 +0000 (UTC) Received: from a27-30.smtp-out.us-west-2.amazonses.com (a27-30.smtp-out.us-west-2.amazonses.com [54.240.27.30]) by mx.groups.io with SMTP id smtpd.web11.20158.1744723967768625174 for ; Tue, 15 Apr 2025 06:32:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=GmCpN8sq; dkim=pass header.i=@amazonses.com header.s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx header.b=PKwLoVxZ; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.30, mailfrom: 0101019639a71591-4857223d-a41e-455f-83f5-d5fdb12191fe-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1744723974; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=ObjT6ZV5BxSVRli0IOxNLdal4VYEmigUlrDa/ijbqlU=; b=GmCpN8sqd5P+VV96tkmTZRq9wJMkkAhoJYEvQjPCzbdZegu9Bb82lcmEPFfulBvX XBhIFvsQdM7FQAzvvcLj/MPtM70pLeo7eiwaN4ber4C3KtpSK8aYZ1Uh1q3IgYExFki bMQny4vkeFa03eUw8B0NZUPsTHT+h0LjnBgegK2A= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx; d=amazonses.com; t=1744723974; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=ObjT6ZV5BxSVRli0IOxNLdal4VYEmigUlrDa/ijbqlU=; b=PKwLoVxZJ3wt1DFLJM26LaJ/sBWEM9yhihgjSmH+N1ITC72E295ZEWjsNOUPH5AV p5+pMKdporzD91xGh18MCxf/B7g84FWTbM069HjujJM4wOTTt48yB9bQuT7JS43y8+G 3+Oz3u3yncO2mD//flnWwoD53tKk147rs0+xo+YM= MIME-Version: 1.0 From: auh@yoctoproject.org To: openembedded-core@lists.openembedded.org Cc: Subject: [AUH] apt: upgrading to 3.0.0 FAILED Message-ID: <0101019639a71591-4857223d-a41e-455f-83f5-d5fdb12191fe-000000@us-west-2.amazonses.com> Date: Tue, 15 Apr 2025 13:32:53 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2025.04.15-54.240.27.30 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Apr 2025 13:32:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214870 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *apt* to *3.0.0* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-apt-upgrade-2.6.1-3.0.0.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 01a6518d158d42c6d6be667390b0e0b34ef0c683 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Tue, 15 Apr 2025 07:01:08 +0000 Subject: [PATCH] apt: upgrade 2.6.1 -> 3.0.0 --- ...void-changing-install-paths-based-on.patch | 6 ++--- ...e-documentation-directory-altogether.patch | 7 +++-- ...-init-tables-from-dpkg-configuration.patch | 7 +++-- .../apt/apt/0001-Fix-musl-build.patch | 7 ++--- ...001-Remove-using-std-binary_function.patch | 10 +++---- ...n-dpkg-configure-a-at-the-end-of-our.patch | 9 +++---- .../0001-aptwebserver.cc-Include-array.patch | 5 ++-- .../0001-cmake-Do-not-build-po-files.patch | 10 +++---- ...l-Add-missing-include-cstdint-gcc-15.patch | 26 ------------------- .../apt/{apt_2.6.1.bb => apt_3.0.0.bb} | 5 ++-- 10 files changed, 30 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-devtools/apt/apt/0001-strutl-Add-missing-include-cstdint-gcc-15.patch rename meta/recipes-devtools/apt/{apt_2.6.1.bb => apt_3.0.0.bb} (94%) diff --git a/meta/recipes-devtools/apt/apt/0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch b/meta/recipes-devtools/apt/apt/0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch index 199f11bf20..698d7caf58 100644 --- a/meta/recipes-devtools/apt/apt/0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch +++ b/meta/recipes-devtools/apt/apt/0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch @@ -1,4 +1,4 @@ -From 9023589317843df4e57f8ebef1d9a8398ddb929d Mon Sep 17 00:00:00 2001 +From 1209598aad7b724008e6b7cc6c3de1e92b433106 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 28 May 2020 15:34:05 +0000 Subject: [PATCH] CMakeLists.txt: avoid changing install paths based on host @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2cd4f8e..4759812 100644 +index 9365e95..f460a8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -21,9 +21,9 @@ set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov") +@@ -28,9 +28,9 @@ set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov") set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "-lgcov") # Work around bug in GNUInstallDirs diff --git a/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch b/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch index 5443ff6caa..7145917ecd 100644 --- a/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch +++ b/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch @@ -1,4 +1,4 @@ -From f629d1c3fcfb560ed24efc3e73d4e4999b1eab33 Mon Sep 17 00:00:00 2001 +From ee862fe8b59e389c05f66ce8b002be66a8b86f37 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 10 May 2019 14:16:47 +0200 Subject: [PATCH] Disable documentation directory altogether @@ -7,16 +7,15 @@ Even when WITH_DOC=False, the build requires po4a to generate manpages. 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 668e2d762..62f441bfa 100644 +index 19e61cd..9365e95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -246,7 +246,7 @@ add_subdirectory(apt-private) +@@ -251,7 +251,7 @@ add_subdirectory(apt-private) endif() add_subdirectory(cmdline) add_subdirectory(completions) diff --git a/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch b/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch index 37a3133010..2a558adf14 100644 --- a/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch +++ b/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch @@ -1,4 +1,4 @@ -From b84280fec4e1d0d33eca78e76556023f8f8fe5b7 Mon Sep 17 00:00:00 2001 +From 4d7f31a48255f7b50a30015f5f0ea9113dd734bb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 10 May 2019 16:47:38 +0200 Subject: [PATCH] Do not init tables from dpkg configuration @@ -7,16 +7,15 @@ This would require sysroot relocation logic, and it's easier to just disable the Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin - --- apt-pkg/init.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc -index b9d9b15d2..1725c5966 100644 +index 61d45e3..97017d2 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc -@@ -281,8 +281,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) +@@ -295,8 +295,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) return _error->Error(_("Unable to determine a suitable packaging system type")); } diff --git a/meta/recipes-devtools/apt/apt/0001-Fix-musl-build.patch b/meta/recipes-devtools/apt/apt/0001-Fix-musl-build.patch index 0cefbedd6d..702386286e 100644 --- a/meta/recipes-devtools/apt/apt/0001-Fix-musl-build.patch +++ b/meta/recipes-devtools/apt/apt/0001-Fix-musl-build.patch @@ -1,4 +1,4 @@ -From 6b8547161b902b01b639d05a4cdf849d7694556f Mon Sep 17 00:00:00 2001 +From 02b4c8eaa049f556477372d956ca59f06a86f7f1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 22 May 2020 15:29:23 +0000 Subject: [PATCH] apt-pkg/contrib/srvrec.h: Explicitly include sys/types.h @@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+) diff --git a/apt-pkg/contrib/srvrec.h b/apt-pkg/contrib/srvrec.h -index e5d0f43..2010184 100644 +index 1e981d3..f4e26f1 100644 --- a/apt-pkg/contrib/srvrec.h +++ b/apt-pkg/contrib/srvrec.h @@ -9,6 +9,7 @@ @@ -23,6 +23,3 @@ index e5d0f43..2010184 100644 #include #include #include --- -2.20.1 - diff --git a/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch b/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch index 15b036b90d..85acd1823b 100644 --- a/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch +++ b/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch @@ -1,4 +1,4 @@ -From e91fb0618ce0a5d42f239d0fca602544858f0819 Mon Sep 17 00:00:00 2001 +From ec6d2d814acf464c9626bb939f7447276bd8d393 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 16 Aug 2022 08:44:18 -0700 Subject: [PATCH] Remove using std::binary_function @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc -index 0f6587281..0a253b12b 100644 +index 9c86d18..b877d49 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -48,6 +48,11 @@ @@ -54,7 +54,7 @@ index 0f6587281..0a253b12b 100644 void GetGeneral(Configuration &Setup,Configuration &Block); bool GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats); bool GenSources(Configuration &Setup,struct CacheDB::Stats &Stats); -@@ -869,7 +856,7 @@ static bool DoGenerateContents(Configuration &Setup, +@@ -867,7 +854,7 @@ static bool DoGenerateContents(Configuration &Setup, else I->ContentsMTime = A.st_mtime; } @@ -63,7 +63,7 @@ index 0f6587281..0a253b12b 100644 /* Now for Contents.. The process here is to do a make-like dependency check. Each contents file is verified to be newer than the package files -@@ -941,8 +928,8 @@ static bool Generate(CommandLine &CmdL) +@@ -939,8 +926,8 @@ static bool Generate(CommandLine &CmdL) LoadBinDir(PkgList,Setup); // Sort by cache DB to improve IO locality. @@ -74,7 +74,7 @@ index 0f6587281..0a253b12b 100644 // Generate packages if (_config->FindB("APT::FTPArchive::ContentsOnly", false) == false) -@@ -993,8 +980,8 @@ static bool Clean(CommandLine &CmdL) +@@ -991,8 +978,8 @@ static bool Clean(CommandLine &CmdL) LoadBinDir(PkgList,Setup); // Sort by cache DB to improve IO locality. diff --git a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch index 6f4d5b6e72..38296cb7e0 100644 --- a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +++ b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch @@ -1,4 +1,4 @@ -From a2dd661484536492b47d4c88998f2bf516749bc8 Mon Sep 17 00:00:00 2001 +From 4bd072402308cbb15ad1ddf8bde702bc68093d60 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 21 May 2020 20:13:25 +0000 Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our @@ -14,16 +14,15 @@ be passed into dpkg, and lead to the below similar error: Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Alexander Kanavin - --- apt-pkg/deb/dpkgpm.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc -index 93effa959..4375781d1 100644 +index 09f3e47..58cd80d 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc -@@ -1199,12 +1199,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() +@@ -1210,12 +1210,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() } } } @@ -36,7 +35,7 @@ index 93effa959..4375781d1 100644 } /*}}}*/ void pkgDPkgPM::StartPtyMagic() /*{{{*/ -@@ -1741,7 +1735,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) +@@ -1752,7 +1746,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) // support subpressing of triggers processing for special // cases like d-i that runs the triggers handling manually diff --git a/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch b/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch index 2c1e617e55..2aa6007ea9 100644 --- a/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch +++ b/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch @@ -1,4 +1,4 @@ -From 5985f366750a73c81c7d86893a2b959b4af062a5 Mon Sep 17 00:00:00 2001 +From 3355fda445084db4ac91b85f4dd34485d5b141e1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 26 May 2021 22:12:46 -0700 Subject: [PATCH] aptwebserver.cc: Include @@ -11,13 +11,12 @@ test/interactive-helper/aptwebserver.cc:36:55: error: constexpr variable cannot Upstream-Status: Submitted [https://github.com/Debian/apt/pull/133] Signed-off-by: Khem Raj - --- test/interactive-helper/aptwebserver.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc -index f4f8d95..361c7a9 100644 +index e9882ab..d2c7e35 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -23,6 +23,7 @@ diff --git a/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch b/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch index 036ce35963..ff441e09d3 100644 --- a/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch +++ b/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch @@ -1,4 +1,4 @@ -From 33347f9f8301633b01af4e208b7be5fdfcb0df0c Mon Sep 17 00:00:00 2001 +From b038a8e91dfd1dfd2631cf34fb0f4e9b0a166b1c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 20 Mar 2021 14:45:18 -0700 Subject: [PATCH] cmake: Do not build po files @@ -11,14 +11,14 @@ Fixes Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Khem Raj --- - CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) + CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index be157a55f..54163ae6c 100644 +index f460a8d..bdaf665 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -252,15 +252,6 @@ add_subdirectory(ftparchive) +@@ -257,15 +257,6 @@ add_subdirectory(ftparchive) add_subdirectory(methods) add_subdirectory(test) diff --git a/meta/recipes-devtools/apt/apt/0001-strutl-Add-missing-include-cstdint-gcc-15.patch b/meta/recipes-devtools/apt/apt/0001-strutl-Add-missing-include-cstdint-gcc-15.patch deleted file mode 100644 index b86ed8bb92..0000000000 --- a/meta/recipes-devtools/apt/apt/0001-strutl-Add-missing-include-cstdint-gcc-15.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9da1b0dbdcc90455bc9de49f73a96e7d18f83493 Mon Sep 17 00:00:00 2001 -From: Julian Andres Klode -Date: Tue, 18 Feb 2025 10:29:40 +0100 -Subject: [PATCH] strutl: Add missing #include [gcc 15] - -Closes: #1096322 - -Upstream-Status: Backport [https://salsa.debian.org/apt-team/apt/-/commit/f82dcd7e4ebb3f70d28e9feb3621676f8c0cc024] - -Signed-off-by: Khem Raj ---- - apt-pkg/contrib/strutl.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc -index 67100f1..c0a1cbc 100644 ---- a/apt-pkg/contrib/strutl.cc -+++ b/apt-pkg/contrib/strutl.cc -@@ -26,6 +26,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_3.0.0.bb similarity index 94% rename from meta/recipes-devtools/apt/apt_2.6.1.bb rename to meta/recipes-devtools/apt/apt_3.0.0.bb index d605d950dd..7774ef59b8 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_3.0.0.bb @@ -13,7 +13,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-cmake-Do-not-build-po-files.patch \ file://0001-aptwebserver.cc-Include-array.patch \ file://0001-Remove-using-std-binary_function.patch \ - file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \ + file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ + file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " SRC_URI:append:class-native = " \ @@ -26,7 +27,7 @@ SRC_URI:append:class-nativesdk = " \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI[sha256sum] = "86b888c901fa2e78f1bf52a2aaa2f400ff82a472b94ff0ac6631939ee68fa6fd" +SRC_URI[sha256sum] = "a811ef5c7b6653e4939deed77b34a84be4c4fe57fec1e65a950cca95f8c4226e" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale