diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-02-08 09:00:55 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-13 12:19:14 +0000 |
commit | 575e4b22278081c86df1b0bce595d91a09a1cdbf (patch) | |
tree | 228f57f41867d14a35403f7821a26e75068a9b59 /meta | |
parent | 34535f3e0ca6f6e37e6457fc800dfbfff64d9298 (diff) | |
download | poky-575e4b22278081c86df1b0bce595d91a09a1cdbf.tar.gz |
pciutils: upgrade 3.6.2 -> 3.6.4
refresh the following patch:
configure.patch
(From OE-Core rev: 498e0f83040fe2e83805d8b13d69c17c74a520ba)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils/configure.patch | 4 | ||||
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils_3.6.4.bb (renamed from meta/recipes-bsp/pciutils/pciutils_3.6.2.bb) | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index a7e445733a..e444c13975 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch | |||
@@ -24,7 +24,7 @@ Index: pciutils-3.5.6/Makefile | |||
24 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ | 24 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ |
25 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ | 25 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ |
26 | 26 | ||
27 | %.8 %.7: %.man | 27 | %.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)#" | 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)#" |
29 | Index: pciutils-3.5.6/lib/configure | 29 | Index: pciutils-3.5.6/lib/configure |
30 | =================================================================== | 30 | =================================================================== |
@@ -70,7 +70,7 @@ Index: pciutils-3.5.6/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 | @@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ | 73 | @@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
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 | ||
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb index 413421cd8a..034bb63dc9 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb | |||
@@ -11,8 +11,8 @@ 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[md5sum] = "77963796d1be4f451b83e6da28ba4f82" | 14 | SRC_URI[md5sum] = "4343b37e19f319ce8f3d59c30031790e" |
15 | SRC_URI[sha256sum] = "db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" | 15 | SRC_URI[sha256sum] = "f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055" |
16 | 16 | ||
17 | inherit multilib_header pkgconfig | 17 | inherit multilib_header pkgconfig |
18 | 18 | ||