diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-31 17:52:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-04 13:27:31 +0100 |
commit | cae9a6c9c8cc1991b8e68b0816fc2db22e3ae129 (patch) | |
tree | 64e897bae1d8e17be8a8cbc9cd369e6e813245d3 /meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch | |
parent | fbb498abd98128a196d059175e3fec99eecee7dc (diff) | |
download | poky-cae9a6c9c8cc1991b8e68b0816fc2db22e3ae129.tar.gz |
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 <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch | 48 |
1 files changed, 48 insertions, 0 deletions
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 @@ | |||
1 | From 1ad21140787a6b8b0f774f75b50444d2c30a56f6 Mon Sep 17 00:00:00 2001 | ||
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 /*{{{*/ | ||