From cae9a6c9c8cc1991b8e68b0816fc2db22e3ae129 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 31 May 2020 17:52:51 +0200 Subject: apt: update to 1.8.2.1 I took the opportunity to rewrite the recipe from scratch; there was just too much baggage in it. (From OE-Core rev: f058272de9cba188d96940c8c921cf31727fe4d1) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...Do-not-configure-packages-on-installation.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch (limited to 'meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch') 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 new file mode 100644 index 0000000000..2322bd8e78 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch @@ -0,0 +1,48 @@ +From 1ad21140787a6b8b0f774f75b50444d2c30a56f6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 21 May 2020 20:28:12 +0000 +Subject: [PATCH] Do not configure packages on installation + +This is done separately in do_rootfs(). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin + +--- + apt-pkg/packagemanager.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc +index 156f7ad..0f6a87c 100644 +--- a/apt-pkg/packagemanager.cc ++++ b/apt-pkg/packagemanager.cc +@@ -1013,10 +1013,12 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c + return false; + + if (Immediate == true) { ++#if 0 + // Perform immediate configuration of the package. + if (SmartConfigure(Pkg, Depth + 1) == false) + _error->Error(_("Could not perform immediate configuration on '%s'. " + "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2); ++#endif + } + + return true; +@@ -1111,6 +1113,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() + } + } + ++#if 0 + // Final run through the configure phase + if (ConfigureAll() == false) + return Failed; +@@ -1125,7 +1128,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() + return Failed; + } + } +- ++#endif + return Completed; + } + // PM::DoInstallPostFork - compat /*{{{*/ -- cgit v1.2.3-54-g00ecf