| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 1 | From 96d23fc57d1ff9c851d563d6d6a6c4752dc4f1b6 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 21 May 2020 20:28:12 +0000 |
| 4 | Subject: [PATCH] Do not configure packages on installation |
| 5 | |
| 6 | This is done separately in do_rootfs(). |
| 7 | |
| 8 | Upstream-Status: Inappropriate [oe-core specific] |
| 9 | Signed-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 | |
| 15 | diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc |
| 16 | index 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 /*{{{*/ |