summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorIonut Radu <ionutx.radu@intel.com>2013-07-31 16:58:51 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 10:33:08 +0100
commit8d68f1695c7a57bb5b3d5635a48cf2987d589cd3 (patch)
tree8f69b6da2f7a8aac251fce5d47826673b1ea615c /meta
parent338b0e7b0ff24aac2a81775dacb523b45ee83fbd (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/disable-configure-in-makefile.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/disable-configure-in-makefile.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/fix-gcc-4.6-null-not-defined.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/fix-gcc-4.6-null-not-defined.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/makerace.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/makerace.patch)12
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/no-ko-translation.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/noconfigure.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/noconfigure.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/nodoc.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/nodoc.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/truncate-filename.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/truncate-filename.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.9.4/use-host.patch (renamed from meta/recipes-devtools/apt/apt-0.9.8.2/use-host.patch)0
-rw-r--r--meta/recipes-devtools/apt/apt-native_0.9.9.4.bb (renamed from meta/recipes-devtools/apt/apt-native_0.9.8.2.bb)0
-rw-r--r--meta/recipes-devtools/apt/apt_0.9.9.4.bb (renamed from meta/recipes-devtools/apt/apt_0.9.8.2.bb)4
11 files changed, 8 insertions, 8 deletions
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
index 7c2f64e3e6..7c2f64e3e6 100644
--- 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
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
index 801ae6dddb..801ae6dddb 100644
--- 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
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
index 403711f013..46e3161b67 100644
--- 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
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Index: apt-0.7.14/buildlib/library.mak 11Index: apt-0.9.9.4/buildlib/library.mak
12=================================================================== 12===================================================================
13--- apt-0.7.14.orig/buildlib/library.mak 13--- apt-0.9.9.4.orig/buildlib/library.mak 2013-07-31 15:45:07.320440575 +0300
14+++ apt-0.7.14/buildlib/library.mak 14+++ apt-0.9.9.4/buildlib/library.mak 2013-07-31 15:46:49.440440561 +0300
15@@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR 15@@ -61,7 +61,7 @@
16 16
17 # Compilation rules 17 # Compilation rules
18 vpath %.cc $(SUBDIRS) 18 vpath %.cc $(SUBDIRS)
19-$(OBJ)/%.opic: %.cc 19-$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
20+$(OBJ)/%.opic: %.cc $($(LOCAL)-HEADERS) 20+$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(LOCAL)-HEADERS)
21 echo Compiling $< to $@ 21 echo Compiling $< to $@
22 $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< 22 $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $<
23 $(DoDep) 23 $(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
index 7aa408f19e..7aa408f19e 100644
--- 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
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
index a0996d4d44..a0996d4d44 100644
--- 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
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
index 712d5e7296..712d5e7296 100644
--- a/meta/recipes-devtools/apt/apt-0.9.8.2/noconfigure.patch
+++ b/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
index 449e42df4a..449e42df4a 100644
--- a/meta/recipes-devtools/apt/apt-0.9.8.2/nodoc.patch
+++ b/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
index db1c42b66c..db1c42b66c 100644
--- 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
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
index 25caa3b0a5..25caa3b0a5 100644
--- 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
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
index babf4cfaf9..babf4cfaf9 100644
--- a/meta/recipes-devtools/apt/apt-native_0.9.8.2.bb
+++ b/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
index 12952a9b8b..ae9ed6cb66 100644
--- 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"
3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" 3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
4require apt.inc 4require apt.inc
5 5
6SRC_URI[md5sum] = "956bb906224a5662111d353ab11a0347" 6SRC_URI[md5sum] = "72b3283acd9b99868da5545f0499b0da"
7SRC_URI[sha256sum] = "cb0360e218490d875dc1e9e15c4e0ba0b53c7f512a6c98253f2eb07877be5106" 7SRC_URI[sha256sum] = "770cb94d7f4c922c2a1516f2b5ec852d3ad668a8c9c3713ac2528c861b7fa79a"
8 8
9require apt-package.inc 9require apt-package.inc
10 10