summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:55:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commit8b2c0db9a0437cc147c4891f6b7671bc2a1a7e46 (patch)
treeefcae60a0f2fed96761c8fadc3139336ec2c46a7 /meta/recipes-extended
parent541711cc33eb6b571f8fa1329595a25288f00d5b (diff)
downloadpoky-8b2c0db9a0437cc147c4891f6b7671bc2a1a7e46.tar.gz
cups: 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: 9f58bd731f33b90849d7d0cb8153dcfedf336ff4) 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-extended')
-rw-r--r--meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
index 5379eb6aa2..db013cf08c 100644
--- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
+++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
@@ -10,12 +10,12 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10 ppdc/Makefile | 30 +++++++++++++++--------------- 10 ppdc/Makefile | 30 +++++++++++++++---------------
11 1 files changed, 15 insertions(+), 15 deletions(-) 11 1 files changed, 15 insertions(+), 15 deletions(-)
12 12
13Index: cups-2.0.0/ppdc/Makefile 13Index: cups-2.2.6/ppdc/Makefile
14=================================================================== 14===================================================================
15--- cups-2.0.0.orig/ppdc/Makefile 15--- cups-2.2.6.orig/ppdc/Makefile
16+++ cups-2.0.0/ppdc/Makefile 16+++ cups-2.2.6/ppdc/Makefile
17@@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a 17@@ -228,8 +228,8 @@ genstrings: genstrings.o libcupsppdc.a
18 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ 18 $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
19 libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ 19 libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
20 $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) 20 $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
21- echo Generating localization strings... 21- echo Generating localization strings...
@@ -25,8 +25,8 @@ Index: cups-2.0.0/ppdc/Makefile
25 25
26 26
27 # 27 #
28@@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu 28@@ -246,9 +246,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu
29 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ 29 $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
30 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ 30 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
31 $(COMMONLIBS) $(LIBZ) 31 $(COMMONLIBS) $(LIBZ)
32- echo Testing PPD compiler... 32- echo Testing PPD compiler...
@@ -38,8 +38,8 @@ Index: cups-2.0.0/ppdc/Makefile
38 38
39 39
40 # 40 #
41@@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups 41@@ -274,17 +274,17 @@ ppdi-static: ppdc-static ppdi.o libcups
42 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ 42 $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
43 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ 43 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
44 $(COMMONLIBS) $(LIBZ) 44 $(COMMONLIBS) $(LIBZ)
45- echo Testing PPD importer... 45- echo Testing PPD importer...