diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:05:32 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:38 +0100 |
commit | a81af375dfc51446b21548dce2afa6a77bc02df3 (patch) | |
tree | 6bad75fbcb98a56a3dc01dc5fb343257610a583f /meta/recipes-bsp/pciutils | |
parent | c8d6305ef514bf629d74e513c53d27966db9fcfc (diff) | |
download | poky-a81af375dfc51446b21548dce2afa6a77bc02df3.tar.gz |
pciutils: update 3.7.0 -> 3.8.0
Rebase configure.patch
Drop symlink creation; make install already does it.
(From OE-Core rev: 8b35bad89eafd51d49438725e781450d7907d0f2)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/pciutils')
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils/configure.patch | 46 | ||||
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils_3.8.0.bb (renamed from meta/recipes-bsp/pciutils/pciutils_3.7.0.bb) | 3 |
2 files changed, 29 insertions, 20 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index e444c13975..cf55b94808 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch | |||
@@ -1,9 +1,14 @@ | |||
1 | From 502c01e180d9085fcbeaf2fb46239999c4f335d2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <rpurdie@linux.intel.com> | ||
3 | Date: Wed, 31 Dec 2008 17:20:38 +0000 | ||
4 | Subject: [PATCH] pciutils: Upgarde 2.2.4 -> 3.0.3 | ||
5 | |||
1 | This patch: | 6 | This patch: |
2 | * ensures we link correctly | 7 | * ensures we link correctly |
3 | * allows us to optionally pass target information to configure rather than using uname | 8 | * allows us to optionally pass target information to configure rather than using uname |
4 | * select linux as the platform in most cases we care about | 9 | * select linux as the platform in most cases we care about |
5 | 10 | ||
6 | This is a merge of various tweaks to allow us to build pciutils including | 11 | This is a merge of various tweaks to allow us to build pciutils including |
7 | work from: | 12 | work from: |
8 | 13 | ||
9 | 7/30/2010 - Qing He <qing.he@intel.com> | 14 | 7/30/2010 - Qing He <qing.he@intel.com> |
@@ -13,23 +18,28 @@ Ionut Radu <ionutx.radu@intel.com> | |||
13 | 18 | ||
14 | Upstream-Status: Inappropriate [embedded specific] | 19 | Upstream-Status: Inappropriate [embedded specific] |
15 | 20 | ||
16 | Index: pciutils-3.5.6/Makefile | 21 | --- |
17 | =================================================================== | 22 | Makefile | 2 +- |
18 | --- pciutils-3.5.6.orig/Makefile | 23 | lib/configure | 14 ++++++++++---- |
19 | +++ pciutils-3.5.6/Makefile | 24 | 2 files changed, 11 insertions(+), 5 deletions(-) |
20 | @@ -96,7 +96,7 @@ example: example.o lib/$(PCILIB) | 25 | |
26 | diff --git a/Makefile b/Makefile | ||
27 | index 9319bb4..78a2d54 100644 | ||
28 | --- a/Makefile | ||
29 | +++ b/Makefile | ||
30 | @@ -108,7 +108,7 @@ example$(EXEEXT): example.o lib/$(PCILIB) | ||
21 | example.o: example.c $(PCIINC) | 31 | example.o: example.c $(PCIINC) |
22 | 32 | ||
23 | %: %.o | 33 | %$(EXEEXT): %.o |
24 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ | 34 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ |
25 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ | 35 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ |
26 | 36 | ||
27 | %.8 %.7 %.5: %.man | 37 | %.8 %.7 %.5: %.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)#" | 38 | 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)#;s#@PCI_IDS@#$(PCI_IDS)#" |
29 | Index: pciutils-3.5.6/lib/configure | 39 | diff --git a/lib/configure b/lib/configure |
30 | =================================================================== | 40 | index 45a416a..1afdaa6 100755 |
31 | --- pciutils-3.5.6.orig/lib/configure | 41 | --- a/lib/configure |
32 | +++ pciutils-3.5.6/lib/configure | 42 | +++ b/lib/configure |
33 | @@ -9,6 +9,10 @@ echo_n() { | 43 | @@ -9,6 +9,10 @@ echo_n() { |
34 | printf '%s' "$*" | 44 | printf '%s' "$*" |
35 | } | 45 | } |
@@ -38,7 +48,7 @@ Index: pciutils-3.5.6/lib/configure | |||
38 | +IDSDIR=$2 | 48 | +IDSDIR=$2 |
39 | +DNS=yes | 49 | +DNS=yes |
40 | + | 50 | + |
41 | if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then | 51 | if [ -z "$VERSION" ] ; then |
42 | echo >&2 "Please run the configure script from the top-level Makefile" | 52 | echo >&2 "Please run the configure script from the top-level Makefile" |
43 | exit 1 | 53 | exit 1 |
44 | @@ -16,8 +20,8 @@ fi | 54 | @@ -16,8 +20,8 @@ fi |
@@ -56,12 +66,12 @@ Index: pciutils-3.5.6/lib/configure | |||
56 | proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` | 66 | 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/_.*//'` | 67 | cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` |
58 | else | 68 | else |
59 | - cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` | 69 | - cpu=`uname -m | sed 's/^i.86-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` |
60 | + cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`} | 70 | + cpu=${4:-`uname -m | sed 's/^i.86-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`} |
61 | fi | 71 | fi |
62 | if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] | 72 | if [ "$sys" = "DragonFly" ] |
63 | then | 73 | then |
64 | @@ -35,7 +39,7 @@ if [ -z "$HOST" ] ; then | 74 | @@ -43,7 +47,7 @@ if [ -z "$HOST" ] ; then |
65 | then | 75 | then |
66 | sys=cygwin | 76 | sys=cygwin |
67 | fi | 77 | fi |
@@ -70,7 +80,7 @@ Index: pciutils-3.5.6/lib/configure | |||
70 | fi | 80 | fi |
71 | [ -n "$RELEASE" ] && rel="${RELEASE}" | 81 | [ -n "$RELEASE" ] && rel="${RELEASE}" |
72 | # 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. |
73 | @@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | 83 | @@ -52,6 +56,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
74 | sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | 84 | sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
75 | echo " $host $rel $cpu $sys" | 85 | echo " $host $rel $cpu $sys" |
76 | 86 | ||
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.8.0.bb index 7d1740f665..8455b286a8 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.8.0.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = "zlib kmod" | |||
11 | SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ | 11 | SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ |
12 | file://configure.patch" | 12 | file://configure.patch" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb" | 14 | SRC_URI[sha256sum] = "91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05" |
15 | 15 | ||
16 | inherit multilib_header pkgconfig | 16 | inherit multilib_header pkgconfig |
17 | 17 | ||
@@ -46,7 +46,6 @@ do_install () { | |||
46 | oe_runmake DESTDIR=${D} install install-lib | 46 | oe_runmake DESTDIR=${D} install install-lib |
47 | 47 | ||
48 | install -d ${D}${bindir} | 48 | install -d ${D}${bindir} |
49 | ln -s ../sbin/lspci ${D}${bindir}/lspci | ||
50 | 49 | ||
51 | oe_multilib_header pci/config.h | 50 | oe_multilib_header pci/config.h |
52 | } | 51 | } |