diff options
author | Ionut Radu <ionutx.radu@intel.com> | 2013-06-27 13:07:13 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-02 22:23:46 +0100 |
commit | 70a26477ce93f0083cab98d1aeeb98ca6ec34343 (patch) | |
tree | 37de15b16e5b740ca920ada192ef32e8469d4638 /meta/recipes-devtools/apt/apt-0.9.8.1 | |
parent | fcea0bb9733fe5b8bd003e477a845b5612a5d960 (diff) | |
download | ast2050-yocto-poky-70a26477ce93f0083cab98d1aeeb98ca6ec34343.zip ast2050-yocto-poky-70a26477ce93f0083cab98d1aeeb98ca6ec34343.tar.gz |
apt: Updated from 0.9.8.1 to 0.9.8.2
(From OE-Core rev: 1500b4e7f6adec612efbdebad6a08a1efeeda7b6)
Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
[sgw - fixed apt-native checksums]
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.8.1')
9 files changed, 0 insertions, 188 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/disable-configure-in-makefile.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/disable-configure-in-makefile.patch deleted file mode 100644 index 7c2f64e..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/disable-configure-in-makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ -Disable configure at compilation stage - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: apt-0.9.7.7/Makefile -=================================================================== ---- apt-0.9.7.7.orig/Makefile -+++ apt-0.9.7.7/Makefile -@@ -33,7 +33,7 @@ veryclean: clean - # The startup target builds the necessary configure scripts. It should - # be used after a CVS checkout. - CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile --include buildlib/configure.mak -+#include buildlib/configure.mak - $(BUILDDIR)/include/config.h: buildlib/config.h.in - $(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in - $(BUILDDIR)/environment.mak: buildlib/environment.mak.in diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/fix-gcc-4.6-null-not-defined.patch deleted file mode 100644 index 70ecd95..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/fix-gcc-4.6-null-not-defined.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/apt-pkg/contrib/weakptr.h -+++ b/apt-pkg/contrib/weakptr.h -@@ -21,6 +21,7 @@ - #ifndef WEAK_POINTER_H - #define WEAK_POINTER_H - -+#include <cstdlib> - #include <set> - /** - * Class for objects providing support for weak pointers. diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/makerace.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/makerace.patch deleted file mode 100644 index 403711f..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/makerace.patch +++ /dev/null @@ -1,23 +0,0 @@ -I was seeing various issues with parallel make, mainly due to to what was likely -partially installed headers. If you change into the source directory and -"NOISY=1 make ../obj/apt-pkg/sourcelist.opic" in apt-pkg, you'll see it -doesn't have any dependencies on the headers being installed. This patch -fixes that so things build correctly. - -RP 2012/3/19 - -Upstream-Status: Pending - -Index: apt-0.7.14/buildlib/library.mak -=================================================================== ---- apt-0.7.14.orig/buildlib/library.mak -+++ apt-0.7.14/buildlib/library.mak -@@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR - - # Compilation rules - vpath %.cc $(SUBDIRS) --$(OBJ)/%.opic: %.cc -+$(OBJ)/%.opic: %.cc $($(LOCAL)-HEADERS) - echo Compiling $< to $@ - $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< - $(DoDep) diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/no-ko-translation.patch deleted file mode 100644 index 7aa408f..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/no-ko-translation.patch +++ /dev/null @@ -1,11 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - po/LINGUAS | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/po/LINGUAS -+++ b/po/LINGUAS -@@ -1 +1 @@ --ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ko ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW -+ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/no-nls-dpkg.patch deleted file mode 100644 index f1dd5fd..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/no-nls-dpkg.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/apt-pkg/deb/dpkgpm.cc -+++ b/apt-pkg/deb/dpkgpm.cc -@@ -42,6 +42,12 @@ - #include <apti18n.h> - /*}}}*/ - -+#ifdef USE_NLS -+#define _dpkg(x) dgettext("dpkg", x) -+#else -+#define _dpkg(x) x -+#endif -+ - using namespace std; - - namespace -@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const - } - - // check if its not a follow up error -- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); -+ const char *needle = _dpkg("dependency problems - leaving unconfigured"); - if(strstr(errormsg, needle) != NULL) { - std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; - return; diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/noconfigure.patch deleted file mode 100644 index 712d5e7..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/noconfigure.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: apt-0.9.7.7/apt-pkg/packagemanager.cc -=================================================================== ---- apt-0.9.7.7.orig/apt-pkg/packagemanager.cc -+++ apt-0.9.7.7/apt-pkg/packagemanager.cc -@@ -893,10 +893,12 @@ bool pkgPackageManager::SmartUnPack(PkgI - return false; - - if (Immediate == true) { -+#if 0 - // Perform immedate configuration of the package. - if (SmartConfigure(Pkg, Depth + 1) == false) - _error->Warning(_("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; -@@ -986,6 +988,7 @@ pkgPackageManager::OrderResult pkgPackag - } - } - -+#if 0 - // Final run through the configure phase - if (ConfigureAll() == false) - return Failed; -@@ -1000,6 +1003,7 @@ pkgPackageManager::OrderResult pkgPackag - return Failed; - } - } -+#endif - - return Completed; - } diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/nodoc.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/nodoc.patch deleted file mode 100644 index 449e42d..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/nodoc.patch +++ /dev/null @@ -1,18 +0,0 @@ -Disable documentation - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: apt-0.9.7.7/Makefile -=================================================================== ---- apt-0.9.7.7.orig/Makefile -+++ apt-0.9.7.7/Makefile -@@ -17,7 +17,7 @@ all headers library clean veryclean bina - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ -- $(MAKE) -C doc $@ -+# $(MAKE) -C doc $@ - $(MAKE) -C po $@ - $(MAKE) -C test $@ - diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/truncate-filename.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/truncate-filename.patch deleted file mode 100644 index db1c42b..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/truncate-filename.patch +++ /dev/null @@ -1,35 +0,0 @@ -strutl.cc: the filename can't be longer than 255 - -The URItoFileName translates the path into the filename, but the -filename can't be longer than 255 according to -/usr/include/linux/limits.h. - -Truncate it when it is longer than 240 (leave some spaces for -".Packages" and "._Release" suffix) - -Upstream-Status: Pending -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - apt-pkg/contrib/strutl.cc | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc ---- a/apt-pkg/contrib/strutl.cc -+++ b/apt-pkg/contrib/strutl.cc -@@ -399,7 +399,12 @@ string URItoFileName(const string &URI) - // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF"; - string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*"); - replace(NewURI.begin(),NewURI.end(),'/','_'); -- return NewURI; -+ -+ // Truncate from the head when it is longer than 240 -+ if(NewURI.length() > 240) -+ return NewURI.substr(NewURI.length() - 240, NewURI.length() - 1); -+ else -+ return NewURI; - } - /*}}}*/ - // Base64Encode - Base64 Encoding routine for short strings /*{{{*/ --- -1.7.10.4 - diff --git a/meta/recipes-devtools/apt/apt-0.9.8.1/use-host.patch b/meta/recipes-devtools/apt/apt-0.9.8.1/use-host.patch deleted file mode 100644 index f7eaaed..0000000 --- a/meta/recipes-devtools/apt/apt-0.9.8.1/use-host.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: apt-0.9.7.7/configure.in -=================================================================== ---- apt-0.9.7.7.orig/configure.in -+++ apt-0.9.7.7/configure.in -@@ -112,7 +112,7 @@ dnl This is often the dpkg architecture - dnl First check against the full canonical canoncial-system-type in $target - dnl and if that fails, just look for the cpu - AC_MSG_CHECKING(debian architecture) --archset="`dpkg-architecture -qDEB_HOST_ARCH`" -+archset="`echo $host_alias|cut -d'-' -f1`" - if test "x$archset" = "x"; then - AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) - fi |