diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-05 14:29:58 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 09:28:51 -0700 |
commit | 9d32d93779638b47df7b087b20148a62bc62f64e (patch) | |
tree | aa87508bdca8f14766afaf794b55ebef24460af4 /meta/recipes-devtools/apt/apt/noconfigure.patch | |
parent | 654ac86364cdf3b9f616a6019cd8211aef47d7da (diff) | |
download | poky-9d32d93779638b47df7b087b20148a62bc62f64e.tar.gz |
apt: update to 1.0.10.1
(From OE-Core rev: 37c8700560b6da569cdf9d7c306a9aa31dcdf06f)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/noconfigure.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt/noconfigure.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt/noconfigure.patch b/meta/recipes-devtools/apt/apt/noconfigure.patch new file mode 100644 index 0000000000..ebc67203b4 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/noconfigure.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
3 | |||
4 | |||
5 | diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc | ||
6 | index 249542c..0a1911f 100644 | ||
7 | --- a/apt-pkg/packagemanager.cc | ||
8 | +++ b/apt-pkg/packagemanager.cc | ||
9 | @@ -952,10 +952,12 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c | ||
10 | return false; | ||
11 | |||
12 | if (Immediate == true) { | ||
13 | +#if 0 | ||
14 | // Perform immedate configuration of the package. | ||
15 | if (SmartConfigure(Pkg, Depth + 1) == false) | ||
16 | _error->Error(_("Could not perform immediate configuration on '%s'. " | ||
17 | "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2); | ||
18 | +#endif | ||
19 | } | ||
20 | |||
21 | return true; | ||
22 | @@ -1038,6 +1040,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() | ||
23 | } | ||
24 | } | ||
25 | |||
26 | +#if 0 | ||
27 | // Final run through the configure phase | ||
28 | if (ConfigureAll() == false) | ||
29 | return Failed; | ||
30 | @@ -1052,6 +1055,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() | ||
31 | return Failed; | ||
32 | } | ||
33 | } | ||
34 | +#endif | ||
35 | |||
36 | return Completed; | ||
37 | } | ||