summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:55:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commitb308fd1181a1878e6151a807b816fb9673ddd62d (patch)
tree41aa4b5bdbe09fc8815541b86e11ae0897a62953 /meta
parent6116dbfcecc9499e230a90ebfe31dfb1c51239a4 (diff)
downloadpoky-b308fd1181a1878e6151a807b816fb9673ddd62d.tar.gz
avahi: 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: 6c0329389ffd82552c9302d70c8b2a1dfc94ce00) 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')
-rw-r--r--meta/recipes-connectivity/avahi/files/initscript.patch26
1 files changed, 16 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch
index 193889eb5c..c856c3df04 100644
--- a/meta/recipes-connectivity/avahi/files/initscript.patch
+++ b/meta/recipes-connectivity/avahi/files/initscript.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in 3Index: avahi-0.7/initscript/debian/avahi-daemon.in
4index 30a2c2f..b5848a8 100755 4===================================================================
5--- a/initscript/debian/avahi-daemon.in 5--- avahi-0.7.orig/initscript/debian/avahi-daemon.in
6+++ b/initscript/debian/avahi-daemon.in 6+++ avahi-0.7/initscript/debian/avahi-daemon.in
7@@ -1,2 +1,14 @@ 7@@ -1,5 +1,17 @@
8 #!/bin/sh 8 #!/bin/sh
9- 9-
10+### BEGIN INIT INFO 10+### BEGIN INIT INFO
@@ -20,11 +20,14 @@ index 30a2c2f..b5848a8 100755
20+# automatically 20+# automatically
21+### END INIT INFO 21+### END INIT INFO
22+# 22+#
23diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in 23 # This file is part of avahi.
24index ac34804..f95c340 100755 24 #
25--- a/initscript/debian/avahi-dnsconfd.in 25 # avahi is free software; you can redistribute it and/or modify it
26+++ b/initscript/debian/avahi-dnsconfd.in 26Index: avahi-0.7/initscript/debian/avahi-dnsconfd.in
27@@ -1,1 +1,14 @@ 27===================================================================
28--- avahi-0.7.orig/initscript/debian/avahi-dnsconfd.in
29+++ avahi-0.7/initscript/debian/avahi-dnsconfd.in
30@@ -1,4 +1,17 @@
28 #!/bin/sh 31 #!/bin/sh
29+### BEGIN INIT INFO 32+### BEGIN INIT INFO
30+# Provides: avahi-dnsconfd 33+# Provides: avahi-dnsconfd
@@ -39,3 +42,6 @@ index ac34804..f95c340 100755
39+# automatically 42+# automatically
40+### END INIT INFO 43+### END INIT INFO
41+# 44+#
45
46 # This file is part of avahi.
47 #