diff options
| author | Ionut Radu <ionutx.radu@intel.com> | 2013-07-31 16:58:51 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-03 10:33:08 +0100 |
| commit | 8d68f1695c7a57bb5b3d5635a48cf2987d589cd3 (patch) | |
| tree | 8f69b6da2f7a8aac251fce5d47826673b1ea615c /meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch | |
| parent | 338b0e7b0ff24aac2a81775dacb523b45ee83fbd (diff) | |
| download | poky-8d68f1695c7a57bb5b3d5635a48cf2987d589cd3.tar.gz | |
apt: Upgrade from 0.9.8.2 to 0.9.9.4
makerace.patch: adapted to the new version
(From OE-Core rev: ad69f62e42c131dcccd33b0e39c61a431f581bea)
Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch')
| -rw-r--r-- | meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch new file mode 100644 index 0000000000..712d5e7296 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
| 3 | |||
| 4 | Index: apt-0.9.7.7/apt-pkg/packagemanager.cc | ||
| 5 | =================================================================== | ||
| 6 | --- apt-0.9.7.7.orig/apt-pkg/packagemanager.cc | ||
| 7 | +++ apt-0.9.7.7/apt-pkg/packagemanager.cc | ||
| 8 | @@ -893,10 +893,12 @@ bool pkgPackageManager::SmartUnPack(PkgI | ||
| 9 | return false; | ||
| 10 | |||
| 11 | if (Immediate == true) { | ||
| 12 | +#if 0 | ||
| 13 | // Perform immedate configuration of the package. | ||
| 14 | if (SmartConfigure(Pkg, Depth + 1) == false) | ||
| 15 | _error->Warning(_("Could not perform immediate configuration on '%s'. " | ||
| 16 | "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2); | ||
| 17 | +#endif | ||
| 18 | } | ||
| 19 | |||
| 20 | return true; | ||
| 21 | @@ -986,6 +988,7 @@ pkgPackageManager::OrderResult pkgPackag | ||
| 22 | } | ||
| 23 | } | ||
| 24 | |||
| 25 | +#if 0 | ||
| 26 | // Final run through the configure phase | ||
| 27 | if (ConfigureAll() == false) | ||
| 28 | return Failed; | ||
| 29 | @@ -1000,6 +1003,7 @@ pkgPackageManager::OrderResult pkgPackag | ||
| 30 | return Failed; | ||
| 31 | } | ||
| 32 | } | ||
| 33 | +#endif | ||
| 34 | |||
| 35 | return Completed; | ||
| 36 | } | ||
