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 d37aa811cd..39c12517cd 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 2de44464abcf722decf6d33c6849639c77ea2b11 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,7 +11,7 @@ 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 99bbdba..99bded2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,9 +28,9 @@ set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov") 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 4bc6dce760..7ef1054095 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 f504ca94efcb933293c5243b0e1bba1ec871b89b 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,13 +7,12 @@ 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 142fadd..99bbdba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,7 +251,7 @@ add_subdirectory(apt-private) 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 d21f5a49c5..ff3d0610e8 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 1f9ee9f8ff3975746f0c8d8a1a4abbae87d8b584 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,13 +7,12 @@ 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 @@ -295,8 +295,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) 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 43ab6a4cd8..8982adcaca 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 0941deecc3845bbdf2e4df226f97273e67315651 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,13 +14,12 @@ 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 @@ -1210,12 +1210,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() 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 08815a3ec4..336568e397 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 c11341dfacfb2c82366fffca43b993cdbd2c22ff 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 @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index be157a55f..54163ae6c 100644 +index 99bded2..17da320 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,15 +257,6 @@ add_subdirectory(ftparchive) diff --git a/meta/recipes-devtools/apt/apt/0001-fix-compilation-with-musl.patch b/meta/recipes-devtools/apt/apt/0001-fix-compilation-with-musl.patch index d3c5fe658e..34eeb19661 100644 --- a/meta/recipes-devtools/apt/apt/0001-fix-compilation-with-musl.patch +++ b/meta/recipes-devtools/apt/apt/0001-fix-compilation-with-musl.patch @@ -1,4 +1,4 @@ -From a6b024ceb71c43977838d625f5ac64b7e4815a56 Mon Sep 17 00:00:00 2001 +From 1a29d16ac008398dc717c925241b1b1963450359 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Thu, 28 Aug 2025 08:11:58 +0200 Subject: [PATCH] fix compilation with musl @@ -24,7 +24,7 @@ Signed-off-by: Gyorgy Sarvari 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc -index ceedd96c7..74ed38c50 100644 +index ceedd96..74ed38c 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -35,6 +35,7 @@ @@ -44,6 +44,3 @@ index ceedd96c7..74ed38c50 100644 _config->Set("APT::Solver", "3.0"); else if (_config->Find("APT::Solver") != "3.0") _config->Set("APT::Solver", "internal"); --- -2.39.5 - diff --git a/meta/recipes-devtools/apt/apt_3.0.3.bb b/meta/recipes-devtools/apt/apt_3.0.4.bb similarity index 98% rename from meta/recipes-devtools/apt/apt_3.0.3.bb rename to meta/recipes-devtools/apt/apt_3.0.4.bb index 393008f05e..c56819f099 100644 --- a/meta/recipes-devtools/apt/apt_3.0.3.bb +++ b/meta/recipes-devtools/apt/apt_3.0.4.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-nativesdk = " \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI[sha256sum] = "5b5f6f6d26121742a83aa80d4ed0eb0c6ce9bea259518db412edefd95760e4ef" +SRC_URI[sha256sum] = "e853aec49afbe520ebcd4dbcbc98e1c55262c6bf1c119cf43e6aec69752443c6" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale