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>

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/disable-configure-in-makefile.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/disable-configure-in-makefile.patch
similarity index 100%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/disable-configure-in-makefile.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/disable-configure-in-makefile.patch

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/fix-gcc-4.6-null-not-defined.patch
similarity index 100%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/fix-gcc-4.6-null-not-defined.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/fix-gcc-4.6-null-not-defined.patch

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/makerace.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/makerace.patch
similarity index 66%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/makerace.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/makerace.patch
index 403711f..46e3161 100644 (file)
--- a/meta/recipes-devtools/apt/apt-0.9.8.2/makerace.patch
+++ b/meta/recipes-devtools/apt/apt-0.9.9.4/makerace.patch
@@ -8,16 +8,16 @@ RP 2012/3/19
 
 Upstream-Status: Pending
 
-Index: apt-0.7.14/buildlib/library.mak
+Index: apt-0.9.9.4/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
+--- apt-0.9.9.4.orig/buildlib/library.mak      2013-07-31 15:45:07.320440575 +0300
++++ apt-0.9.9.4/buildlib/library.mak   2013-07-31 15:46:49.440440561 +0300
+@@ -61,7 +61,7 @@
  
  # Compilation rules
  vpath %.cc $(SUBDIRS)
--$(OBJ)/%.opic: %.cc
-+$(OBJ)/%.opic: %.cc $($(LOCAL)-HEADERS)
+-$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
++$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(LOCAL)-HEADERS)
        echo Compiling $< to $@
        $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $<
        $(DoDep)

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch
similarity index 100%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/no-ko-translation.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch
similarity index 100%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch
similarity index 100%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/noconfigure.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/nodoc.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/nodoc.patch
similarity index 100%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/nodoc.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/nodoc.patch

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/truncate-filename.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/truncate-filename.patch
similarity index 100%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/truncate-filename.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/truncate-filename.patch

diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/use-host.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/use-host.patch
similarity index 100%
rename from meta/recipes-devtools/apt/apt-0.9.8.2/use-host.patch
rename to meta/recipes-devtools/apt/apt-0.9.9.4/use-host.patch

diff --git a/meta/recipes-devtools/apt/apt-native_0.9.8.2.bb b/meta/recipes-devtools/apt/apt-native_0.9.9.4.bb
similarity index 100%
rename from meta/recipes-devtools/apt/apt-native_0.9.8.2.bb
rename to meta/recipes-devtools/apt/apt-native_0.9.9.4.bb

diff --git a/meta/recipes-devtools/apt/apt_0.9.8.2.bb b/meta/recipes-devtools/apt/apt_0.9.9.4.bb
similarity index 74%
rename from meta/recipes-devtools/apt/apt_0.9.8.2.bb
rename to meta/recipes-devtools/apt/apt_0.9.9.4.bb
index 12952a9..ae9ed6c 100644 (file)
--- a/meta/recipes-devtools/apt/apt_0.9.8.2.bb
+++ b/meta/recipes-devtools/apt/apt_0.9.9.4.bb
@@ -3,8 +3,8 @@ RDEPENDS_${PN} = "dpkg"
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
 require apt.inc
 
-SRC_URI[md5sum] = "956bb906224a5662111d353ab11a0347"
-SRC_URI[sha256sum] = "cb0360e218490d875dc1e9e15c4e0ba0b53c7f512a6c98253f2eb07877be5106"
+SRC_URI[md5sum] = "72b3283acd9b99868da5545f0499b0da"
+SRC_URI[sha256sum] = "770cb94d7f4c922c2a1516f2b5ec852d3ad668a8c9c3713ac2528c861b7fa79a"
 
 require apt-package.inc