summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:55:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commit0b9428006410f7e1fc358a475de8caf4d5293341 (patch)
treebb5a035ceceeefdbe32e1c669abb6802b943d616 /meta
parent8cec60990e31480fdd212611d47236bfc61dfa68 (diff)
downloadpoky-0b9428006410f7e1fc358a475de8caf4d5293341.tar.gz
pciutils: 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: 7d56245a4859727f85dc5ae6f881d0783dee1ce1) 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-bsp/pciutils/pciutils/configure.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch
index 55edfea3f6..a7e445733a 100644
--- a/meta/recipes-bsp/pciutils/pciutils/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch
@@ -13,11 +13,11 @@ Ionut Radu <ionutx.radu@intel.com>
13 13
14Upstream-Status: Inappropriate [embedded specific] 14Upstream-Status: Inappropriate [embedded specific]
15 15
16Index: pciutils-3.5.4/Makefile 16Index: pciutils-3.5.6/Makefile
17=================================================================== 17===================================================================
18--- pciutils-3.5.4.orig/Makefile 18--- pciutils-3.5.6.orig/Makefile
19+++ pciutils-3.5.4/Makefile 19+++ pciutils-3.5.6/Makefile
20@@ -96,7 +95,7 @@ example: example.o lib/$(PCILIB) 20@@ -96,7 +96,7 @@ example: example.o lib/$(PCILIB)
21 example.o: example.c $(PCIINC) 21 example.o: example.c $(PCIINC)
22 22
23 %: %.o 23 %: %.o
@@ -26,12 +26,12 @@ Index: pciutils-3.5.4/Makefile
26 26
27 %.8 %.7: %.man 27 %.8 %.7: %.man
28 M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#" 28 M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#"
29Index: pciutils-3.5.4/lib/configure 29Index: pciutils-3.5.6/lib/configure
30=================================================================== 30===================================================================
31--- pciutils-3.5.4.orig/lib/configure 31--- pciutils-3.5.6.orig/lib/configure
32+++ pciutils-3.5.4/lib/configure 32+++ pciutils-3.5.6/lib/configure
33@@ -14,6 +14,10 @@ echo_n() { 33@@ -9,6 +9,10 @@ echo_n() {
34 fi 34 printf '%s' "$*"
35 } 35 }
36 36
37+VERSION=$1 37+VERSION=$1
@@ -41,7 +41,7 @@ Index: pciutils-3.5.4/lib/configure
41 if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then 41 if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then
42 echo >&2 "Please run the configure script from the top-level Makefile" 42 echo >&2 "Please run the configure script from the top-level Makefile"
43 exit 1 43 exit 1
44@@ -21,8 +25,8 @@ fi 44@@ -16,8 +20,8 @@ fi
45 45
46 echo_n "Configuring libpci for your system..." 46 echo_n "Configuring libpci for your system..."
47 if [ -z "$HOST" ] ; then 47 if [ -z "$HOST" ] ; then
@@ -52,7 +52,7 @@ Index: pciutils-3.5.4/lib/configure
52 realsys="$sys" 52 realsys="$sys"
53 if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] 53 if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
54 then 54 then
55@@ -30,7 +34,7 @@ if [ -z "$HOST" ] ; then 55@@ -25,7 +29,7 @@ if [ -z "$HOST" ] ; then
56 proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` 56 proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
57 cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` 57 cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
58 else 58 else
@@ -61,7 +61,7 @@ Index: pciutils-3.5.4/lib/configure
61 fi 61 fi
62 if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] 62 if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
63 then 63 then
64@@ -40,7 +44,7 @@ if [ -z "$HOST" ] ; then 64@@ -35,7 +39,7 @@ if [ -z "$HOST" ] ; then
65 then 65 then
66 sys=cygwin 66 sys=cygwin
67 fi 67 fi
@@ -70,7 +70,7 @@ Index: pciutils-3.5.4/lib/configure
70 fi 70 fi
71 [ -n "$RELEASE" ] && rel="${RELEASE}" 71 [ -n "$RELEASE" ] && rel="${RELEASE}"
72 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. 72 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
73@@ -49,6 +53,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ 73@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^
74 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 74 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
75 echo " $host $rel $cpu $sys" 75 echo " $host $rel $cpu $sys"
76 76