summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-03-20 14:49:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-23 22:51:25 +0000
commit94fa96262a5868c615ccf407bd0c4c40ca9c8cae (patch)
treef4f49024a5888e045d07980e3f69e9f5a36f1dfc /meta
parent3c48fe13f357d54235a7e624de1f9a99b5e36e44 (diff)
downloadpoky-94fa96262a5868c615ccf407bd0c4c40ca9c8cae.tar.gz
apt: update 1.8.2.2 -> 2.2.2
Drop 0001-test-libapt-do-not-use-gtest-from-the-host.patch (replaced by WITH_TESTS option). Drop 0001-Do-not-configure-packages-on-installation.patch (no longer necessary). Adjust build dependencies. (From OE-Core rev: f0ede019c828249688e2b287b7845f4ebd2d6203) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch8
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch48
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch4
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch10
-rw-r--r--meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch40
-rw-r--r--meta/recipes-devtools/apt/apt_2.2.2.bb (renamed from meta/recipes-devtools/apt/apt_1.8.2.2.bb)9
6 files changed, 14 insertions, 105 deletions
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 cc422b74dc..8b28ede8a8 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 @@
1From cd164b353ba7958d51b2f33f4079fb9787c983e2 Mon Sep 17 00:00:00 2001 1From f629d1c3fcfb560ed24efc3e73d4e4999b1eab33 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 10 May 2019 14:16:47 +0200 3Date: Fri, 10 May 2019 14:16:47 +0200
4Subject: [PATCH] Disable documentation directory altogether 4Subject: [PATCH] Disable documentation directory altogether
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 83334ba..2cd4f8e 100644 16index 9745c13..7cfc9ee 100644
17--- a/CMakeLists.txt 17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
19@@ -232,7 +232,7 @@ add_subdirectory(apt-private) 19@@ -239,7 +239,7 @@ add_subdirectory(apt-pkg)
20 add_subdirectory(apt-inst) 20 add_subdirectory(apt-private)
21 add_subdirectory(cmdline) 21 add_subdirectory(cmdline)
22 add_subdirectory(completions) 22 add_subdirectory(completions)
23-add_subdirectory(doc) 23-add_subdirectory(doc)
diff --git a/meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch b/meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch
deleted file mode 100644
index 81b328a2ee..0000000000
--- a/meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 96d23fc57d1ff9c851d563d6d6a6c4752dc4f1b6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 21 May 2020 20:28:12 +0000
4Subject: [PATCH] Do not configure packages on installation
5
6This is done separately in do_rootfs().
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10
11---
12 apt-pkg/packagemanager.cc | 5 ++++-
13 1 file changed, 4 insertions(+), 1 deletion(-)
14
15diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
16index 156f7ad..0f6a87c 100644
17--- a/apt-pkg/packagemanager.cc
18+++ b/apt-pkg/packagemanager.cc
19@@ -1013,10 +1013,12 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
20 return false;
21
22 if (Immediate == true) {
23+#if 0
24 // Perform immediate configuration of the package.
25 if (SmartConfigure(Pkg, Depth + 1) == false)
26 _error->Error(_("Could not perform immediate configuration on '%s'. "
27 "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);
28+#endif
29 }
30
31 return true;
32@@ -1111,6 +1113,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
33 }
34 }
35
36+#if 0
37 // Final run through the configure phase
38 if (ConfigureAll() == false)
39 return Failed;
40@@ -1125,7 +1128,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
41 return Failed;
42 }
43 }
44-
45+#endif
46 return Completed;
47 }
48 // PM::DoInstallPostFork - compat /*{{{*/
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 1417153e81..e0e7e0cd58 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 @@
1From bf45c314867e5fb12141803fba06f3e45679d628 Mon Sep 17 00:00:00 2001 1From 382f8381ef8baf754057e376a6d9bf840ca6d543 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 10 May 2019 16:47:38 +0200 3Date: Fri, 10 May 2019 16:47:38 +0200
4Subject: [PATCH] Do not init tables from dpkg configuration 4Subject: [PATCH] Do not init tables from dpkg configuration
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 2 insertions(+), 2 deletions(-) 13 1 file changed, 2 insertions(+), 2 deletions(-)
14 14
15diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc 15diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
16index a619368..6e5a6cf 100644 16index b9d9b15..1725c59 100644
17--- a/apt-pkg/init.cc 17--- a/apt-pkg/init.cc
18+++ b/apt-pkg/init.cc 18+++ b/apt-pkg/init.cc
19@@ -281,8 +281,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) 19@@ -281,8 +281,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 37f969690c..c14dc2a414 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 @@
1From 34700bebc52659e7e3eecd252f65bd36e669eee8 Mon Sep 17 00:00:00 2001 1From a603b3281f3f60a87531c8cec4843f970170d409 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 21 May 2020 20:13:25 +0000 3Date: Thu, 21 May 2020 20:13:25 +0000
4Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our 4Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our
@@ -20,10 +20,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
20 1 file changed, 2 insertions(+), 7 deletions(-) 20 1 file changed, 2 insertions(+), 7 deletions(-)
21 21
22diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc 22diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
23index ffa880d..5875e86 100644 23index 46a6dee..8617a9e 100644
24--- a/apt-pkg/deb/dpkgpm.cc 24--- a/apt-pkg/deb/dpkgpm.cc
25+++ b/apt-pkg/deb/dpkgpm.cc 25+++ b/apt-pkg/deb/dpkgpm.cc
26@@ -1215,12 +1215,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() 26@@ -1211,12 +1211,6 @@ void pkgDPkgPM::BuildPackagesProgressMap()
27 } 27 }
28 } 28 }
29 } 29 }
@@ -35,8 +35,8 @@ index ffa880d..5875e86 100644
35- ++PackagesTotal; 35- ++PackagesTotal;
36 } 36 }
37 /*}}}*/ 37 /*}}}*/
38 bool pkgDPkgPM::Go(int StatusFd) /*{{{*/ 38 void pkgDPkgPM::StartPtyMagic() /*{{{*/
39@@ -1716,7 +1710,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) 39@@ -1710,7 +1704,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
40 40
41 // support subpressing of triggers processing for special 41 // support subpressing of triggers processing for special
42 // cases like d-i that runs the triggers handling manually 42 // cases like d-i that runs the triggers handling manually
diff --git a/meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch b/meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch
deleted file mode 100644
index 503b5a5c0b..0000000000
--- a/meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 28e389a0d1275e7693df84a7d4a58b28364be1a9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 22 Oct 2020 17:33:38 +0200
4Subject: [PATCH] test/libapt: do not use gtest from the host
5
6This really does not work when cross-compiling.
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 test/libapt/CMakeLists.txt | 16 ----------------
12 1 file changed, 16 deletions(-)
13
14diff --git a/test/libapt/CMakeLists.txt b/test/libapt/CMakeLists.txt
15index 035ff07..280b83c 100644
16--- a/test/libapt/CMakeLists.txt
17+++ b/test/libapt/CMakeLists.txt
18@@ -6,22 +6,6 @@ find_path(GTEST_ROOT src/gtest.cc
19 find_package(GTest)
20 set(GTEST_DEPENDENCIES)
21
22-if(NOT GTEST_FOUND AND EXISTS ${GTEST_ROOT})
23- include(ExternalProject)
24- ExternalProject_Add(gtest PREFIX ./gtest
25- SOURCE_DIR ${GTEST_ROOT}
26- INSTALL_COMMAND true)
27-
28- link_directories(${CMAKE_CURRENT_BINARY_DIR}/gtest/src/gtest-build)
29-
30- set(GTEST_LIBRARIES "-lgtest")
31- set(GTEST_DEPENDENCIES "gtest")
32- set(GTEST_FOUND TRUE)
33- find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS ${GTEST_ROOT}/include)
34-
35- message(STATUS "Found GTest at ${GTEST_ROOT}, headers at ${GTEST_INCLUDE_DIRS}")
36-endif()
37-
38 if(GTEST_FOUND)
39 # gtest produces some warnings with the set of warnings we activate,
40 # so disable the offending warnings while compiling tests for now
diff --git a/meta/recipes-devtools/apt/apt_1.8.2.2.bb b/meta/recipes-devtools/apt/apt_2.2.2.bb
index 6cda61a7d8..b838495da8 100644
--- a/meta/recipes-devtools/apt/apt_1.8.2.2.bb
+++ b/meta/recipes-devtools/apt/apt_2.2.2.bb
@@ -10,22 +10,19 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
10 file://0001-Disable-documentation-directory-altogether.patch \ 10 file://0001-Disable-documentation-directory-altogether.patch \
11 file://0001-Fix-musl-build.patch \ 11 file://0001-Fix-musl-build.patch \
12 file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \ 12 file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \
13 file://0001-test-libapt-do-not-use-gtest-from-the-host.patch \
14 " 13 "
15 14
16SRC_URI_append_class-native = " \ 15SRC_URI_append_class-native = " \
17 file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ 16 file://0001-Do-not-init-tables-from-dpkg-configuration.patch \
18 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ 17 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \
19 file://0001-Do-not-configure-packages-on-installation.patch \
20 " 18 "
21 19
22SRC_URI_append_class-nativesdk = " \ 20SRC_URI_append_class-nativesdk = " \
23 file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ 21 file://0001-Do-not-init-tables-from-dpkg-configuration.patch \
24 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ 22 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \
25 file://0001-Do-not-configure-packages-on-installation.patch \
26 " 23 "
27 24
28SRC_URI[sha256sum] = "f5030de22a5cc80db6fe0d42373b5df25d7dc56e94d9155f2eaa80dbd65e82fa" 25SRC_URI[sha256sum] = "c5449a4c2126a12497a9949cd10209926005d329f6ce7942a3781fa2fcf50487"
29LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" 26LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
30 27
31# the package is taken from snapshots.debian.org; that source is static and goes stale 28# the package is taken from snapshots.debian.org; that source is static and goes stale
@@ -40,12 +37,12 @@ USERADD_PARAM_${PN} = "--system --home /nonexistent --no-create-home _apt"
40 37
41BBCLASSEXTEND = "native nativesdk" 38BBCLASSEXTEND = "native nativesdk"
42 39
43DEPENDS += "virtual/libiconv virtual/libintl db gnutls lz4 zlib bzip2 xz" 40DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash"
44 41
45EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ 42EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \
46 -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \ 43 -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \
47 -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ 44 -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \
48 -DCMAKE_DISABLE_FIND_PACKAGE_Zstd=True \ 45 -DWITH_TESTS=False \
49" 46"
50 47
51do_configure_prepend () { 48do_configure_prepend () {