summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-07-18 12:01:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-19 08:41:40 +0100
commit7ad1653264b087615cf21632cd7884200eecf603 (patch)
treec109f44c3190342c5d39f205b42d8c901050807f
parentd1d2d45417d2028718635f52f5fb5bb0a86853c6 (diff)
downloadpoky-7ad1653264b087615cf21632cd7884200eecf603.tar.gz
libpciaccess:upgrade 0.14 -> 0.16
-Upgrade from libpciaccess_0.14.bb to libpciaccess_0.16.bb. -libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch Removed since this is included in 0.16. (From OE-Core rev: c2140b42c8516100c55c381d98e0f281b562d2db) Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch28
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess_0.16.bb (renamed from meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb)5
2 files changed, 2 insertions, 31 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
deleted file mode 100644
index f532858244..0000000000
--- a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From b6df5202306bd71158b482f25ca2e6919645d4dd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 4 Jun 2015 20:55:06 -0700
4Subject: [PATCH 4/4] Don't include sys/io.h on arm
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 src/linux_sysfs.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
14index 3f95e53..1e3aad3 100644
15--- a/src/linux_sysfs.c
16+++ b/src/linux_sysfs.c
17@@ -50,7 +50,7 @@
18 #include <dirent.h>
19 #include <errno.h>
20
21-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
22+#if defined(__i386__) || defined(__x86_64__)
23 #include <sys/io.h>
24 #else
25 #define inb(x) -1
26--
272.1.4
28
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.16.bb
index d030c31bd0..b58cb80dc3 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.16.bb
@@ -6,11 +6,10 @@ PCI bus and devices in a platform-independent way."
6require xorg-lib-common.inc 6require xorg-lib-common.inc
7 7
8SRC_URI += "\ 8SRC_URI += "\
9 file://0004-Don-t-include-sys-io.h-on-arm.patch \
10" 9"
11 10
12SRC_URI[md5sum] = "8f436e151d5106a9cfaa71857a066d33" 11SRC_URI[md5sum] = "b34e2cbdd6aa8f9cc3fa613fd401a6d6"
13SRC_URI[sha256sum] = "3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4" 12SRC_URI[sha256sum] = "214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489"
14 13
15LICENSE = "MIT & MIT-style" 14LICENSE = "MIT & MIT-style"
16LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" 15LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"