summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/pciutils
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/pciutils')
-rw-r--r--meta/recipes-bsp/pciutils/pciutils/configure.patch12
-rw-r--r--meta/recipes-bsp/pciutils/pciutils/guess-fix.patch12
2 files changed, 2 insertions, 22 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch
index 66c9f91630..c87b3500f2 100644
--- a/meta/recipes-bsp/pciutils/pciutils/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch
@@ -80,7 +80,7 @@ diff -r af2b10cc3c14 lib/configure
80 fi 80 fi
81 [ -n "$RELEASE" ] && rel="${RELEASE}" 81 [ -n "$RELEASE" ] && rel="${RELEASE}"
82 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. 82 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
83@@ -49,6 +53,21 @@ 83@@ -49,6 +53,11 @@
84 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 84 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
85 echo " $host $rel $cpu $sys" 85 echo " $host $rel $cpu $sys"
86 86
@@ -89,16 +89,6 @@ diff -r af2b10cc3c14 lib/configure
89+ sys=linux 89+ sys=linux
90+fi 90+fi
91+ 91+
92+if [ "$host" = "linux--uclibc" ]
93+then
94+ sys=linux
95+fi
96+
97+if [ "$host" = "linux--uclibceabi" ]
98+then
99+ sys=linux
100+fi
101+
102 c=config.h 92 c=config.h
103 m=config.mk 93 m=config.mk
104 echo >$c '#define PCI_CONFIG_H' 94 echo >$c '#define PCI_CONFIG_H'
diff --git a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
index 540b4a0d13..f918e3bdc3 100644
--- a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
@@ -13,7 +13,7 @@ diff --git a/lib/configure b/lib/configure
13index 4318b05..84f6acb 100755 13index 4318b05..84f6acb 100755
14--- a/lib/configure 14--- a/lib/configure
15+++ b/lib/configure 15+++ b/lib/configure
16@@ -53,20 +53,7 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 16@@ -53,10 +53,7 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
17 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 17 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
18 echo " $host $rel $cpu $sys" 18 echo " $host $rel $cpu $sys"
19 19
@@ -21,16 +21,6 @@ index 4318b05..84f6acb 100755
21-then 21-then
22- sys=linux 22- sys=linux
23-fi 23-fi
24-
25-if [ "$host" = "linux--uclibc" ]
26-then
27- sys=linux
28-fi
29-
30-if [ "$host" = "linux--uclibceabi" ]
31-then
32- sys=linux
33-fi
34+{ echo "$host" | grep linux; } && sys=linux 24+{ echo "$host" | grep linux; } && sys=linux
35 25
36 c=config.h 26 c=config.h