summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commit98e78f2e49bf3a77281fd581b0f1a5803615ef94 (patch)
treeabfa1d540e0d12be388c65ded23a4758ccad7389 /meta/recipes-devtools
parente49ac3eabba388444f83f96f068ed7c95f8a80be (diff)
downloadpoky-98e78f2e49bf3a77281fd581b0f1a5803615ef94.tar.gz
apt: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: a70103a6e400caaa87e1d36a7e59be7f3059a3bb) Signed-off-by: Ross Burton <ross.burton@intel.com> 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')
-rw-r--r--meta/recipes-devtools/apt/apt/disable-test.patch23
-rw-r--r--meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch10
-rw-r--r--meta/recipes-devtools/apt/apt/makerace.patch10
-rw-r--r--meta/recipes-devtools/apt/apt/no-nls-dpkg.patch12
-rw-r--r--meta/recipes-devtools/apt/apt/nodoc.patch12
5 files changed, 34 insertions, 33 deletions
diff --git a/meta/recipes-devtools/apt/apt/disable-test.patch b/meta/recipes-devtools/apt/apt/disable-test.patch
index 0532671747..d16b5c771b 100644
--- a/meta/recipes-devtools/apt/apt/disable-test.patch
+++ b/meta/recipes-devtools/apt/apt/disable-test.patch
@@ -17,10 +17,10 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
17 configure.ac | 7 ------- 17 configure.ac | 7 -------
18 2 files changed, 3 insertions(+), 13 deletions(-) 18 2 files changed, 3 insertions(+), 13 deletions(-)
19 19
20diff --git a/Makefile b/Makefile 20Index: apt-1.2.24/Makefile
21index 7680f08..69527a5 100644 21===================================================================
22--- a/Makefile 22--- apt-1.2.24.orig/Makefile
23+++ b/Makefile 23+++ apt-1.2.24/Makefile
24@@ -9,8 +9,8 @@ endif 24@@ -9,8 +9,8 @@ endif
25 .PHONY: default 25 .PHONY: default
26 default: startup all 26 default: startup all
@@ -32,9 +32,9 @@ index 7680f08..69527a5 100644
32 $(MAKE) -C vendor $@ 32 $(MAKE) -C vendor $@
33 $(MAKE) -C apt-pkg $@ 33 $(MAKE) -C apt-pkg $@
34 $(MAKE) -C apt-inst $@ 34 $(MAKE) -C apt-inst $@
35@@ -21,8 +21,6 @@ all headers library clean veryclean binary program doc manpages docbook test upd 35@@ -21,8 +21,6 @@ all headers library clean veryclean bina
36 $(MAKE) -C dselect $@ 36 $(MAKE) -C dselect $@
37 $(MAKE) -C doc $@ 37 # $(MAKE) -C doc $@
38 $(MAKE) -C po $@ 38 $(MAKE) -C po $@
39- # FIXME: -C test has issue swith parallel builds, investigate! 39- # FIXME: -C test has issue swith parallel builds, investigate!
40- -$(MAKE) -C test $@ 40- -$(MAKE) -C test $@
@@ -52,10 +52,10 @@ index 7680f08..69527a5 100644
52 52
53 dirs: startup 53 dirs: startup
54 54
55diff --git a/configure.ac b/configure.ac 55Index: apt-1.2.24/configure.ac
56index 1f05da5..e47f459 100644 56===================================================================
57--- a/configure.ac 57--- apt-1.2.24.orig/configure.ac
58+++ b/configure.ac 58+++ apt-1.2.24/configure.ac
59@@ -90,13 +90,6 @@ AC_CHECK_LIB(curl, curl_easy_init, 59@@ -90,13 +90,6 @@ AC_CHECK_LIB(curl, curl_easy_init,
60 AC_MSG_ERROR([failed: I need CURL due https support]), 60 AC_MSG_ERROR([failed: I need CURL due https support]),
61 ) 61 )
@@ -70,6 +70,3 @@ index 1f05da5..e47f459 100644
70 AC_SUBST(BDBLIB) 70 AC_SUBST(BDBLIB)
71 71
72 HAVE_ZLIB=no 72 HAVE_ZLIB=no
73--
742.1.4
75
diff --git a/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch b/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
index 801ae6dddb..899c6ef2fc 100644
--- a/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
+++ b/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
@@ -1,12 +1,14 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3--- a/apt-pkg/contrib/weakptr.h 3Index: apt-1.2.24/apt-pkg/contrib/weakptr.h
4+++ b/apt-pkg/contrib/weakptr.h 4===================================================================
5--- apt-1.2.24.orig/apt-pkg/contrib/weakptr.h
6+++ apt-1.2.24/apt-pkg/contrib/weakptr.h
5@@ -21,6 +21,7 @@ 7@@ -21,6 +21,7 @@
6 #ifndef WEAK_POINTER_H 8 #ifndef WEAK_POINTER_H
7 #define WEAK_POINTER_H 9 #define WEAK_POINTER_H
8 10
9+#include <cstdlib> 11+#include <cstdlib>
10 #include <set> 12 #include <set>
11 /** 13 #include <stddef.h>
12 * Class for objects providing support for weak pointers. 14
diff --git a/meta/recipes-devtools/apt/apt/makerace.patch b/meta/recipes-devtools/apt/apt/makerace.patch
index 46e3161b67..0c686d6e27 100644
--- a/meta/recipes-devtools/apt/apt/makerace.patch
+++ b/meta/recipes-devtools/apt/apt/makerace.patch
@@ -8,16 +8,16 @@ RP 2012/3/19
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Index: apt-0.9.9.4/buildlib/library.mak 11Index: apt-1.2.24/buildlib/library.mak
12=================================================================== 12===================================================================
13--- apt-0.9.9.4.orig/buildlib/library.mak 2013-07-31 15:45:07.320440575 +0300 13--- apt-1.2.24.orig/buildlib/library.mak
14+++ apt-0.9.9.4/buildlib/library.mak 2013-07-31 15:46:49.440440561 +0300 14+++ apt-1.2.24/buildlib/library.mak
15@@ -61,7 +61,7 @@ 15@@ -65,7 +65,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR
16 16
17 # Compilation rules 17 # Compilation rules
18 vpath %.cc $(SUBDIRS) 18 vpath %.cc $(SUBDIRS)
19-$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) 19-$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
20+$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(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) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ '$(abspath $<)'
23 $(DoDep) 23 $(DoDep)
diff --git a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
index a0996d4d44..98b6c96caa 100644
--- a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
+++ b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
@@ -1,8 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3--- a/apt-pkg/deb/dpkgpm.cc 3Index: apt-1.2.24/apt-pkg/deb/dpkgpm.cc
4+++ b/apt-pkg/deb/dpkgpm.cc 4===================================================================
5@@ -42,6 +42,12 @@ 5--- apt-1.2.24.orig/apt-pkg/deb/dpkgpm.cc
6+++ apt-1.2.24/apt-pkg/deb/dpkgpm.cc
7@@ -54,6 +54,12 @@
6 #include <apti18n.h> 8 #include <apti18n.h>
7 /*}}}*/ 9 /*}}}*/
8 10
@@ -14,8 +16,8 @@ Upstream-Status: Pending
14+ 16+
15 using namespace std; 17 using namespace std;
16 18
17 namespace 19 APT_PURE static string
18@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const 20@@ -1703,7 +1709,7 @@ void pkgDPkgPM::WriteApportReport(const
19 } 21 }
20 22
21 // check if its not a follow up error 23 // check if its not a follow up error
diff --git a/meta/recipes-devtools/apt/apt/nodoc.patch b/meta/recipes-devtools/apt/apt/nodoc.patch
index 449e42df4a..78cf53884a 100644
--- a/meta/recipes-devtools/apt/apt/nodoc.patch
+++ b/meta/recipes-devtools/apt/apt/nodoc.patch
@@ -3,16 +3,16 @@ Disable documentation
3Upstream-Status: Inappropriate [configuration] 3Upstream-Status: Inappropriate [configuration]
4Signed-off-by: Constantin Musca <constantinx.musca@intel.com> 4Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
5 5
6Index: apt-0.9.7.7/Makefile 6Index: apt-1.2.24/Makefile
7=================================================================== 7===================================================================
8--- apt-0.9.7.7.orig/Makefile 8--- apt-1.2.24.orig/Makefile
9+++ apt-0.9.7.7/Makefile 9+++ apt-1.2.24/Makefile
10@@ -17,7 +17,7 @@ all headers library clean veryclean bina 10@@ -19,7 +19,7 @@ all headers library clean veryclean bina
11 $(MAKE) -C cmdline $@ 11 $(MAKE) -C cmdline $@
12 $(MAKE) -C ftparchive $@ 12 $(MAKE) -C ftparchive $@
13 $(MAKE) -C dselect $@ 13 $(MAKE) -C dselect $@
14- $(MAKE) -C doc $@ 14- $(MAKE) -C doc $@
15+# $(MAKE) -C doc $@ 15+# $(MAKE) -C doc $@
16 $(MAKE) -C po $@ 16 $(MAKE) -C po $@
17 $(MAKE) -C test $@ 17 # FIXME: -C test has issue swith parallel builds, investigate!
18 18 -$(MAKE) -C test $@