summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/acpica
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-05-20 15:04:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:14 +0100
commit027e088a011d6f440e94217e63b8ddfcb5c4acd6 (patch)
treef172618ab68ea84d3014c1a88090fc557a57743f /meta/recipes-extended/acpica
parenta2f714f3e563b9ffec00f2561bb8e568c8611122 (diff)
downloadpoky-027e088a011d6f440e94217e63b8ddfcb5c4acd6.tar.gz
acpica: Upgrade to 20180508 release
Drop upstreamed patches (From OE-Core rev: 74827bb63a237f3768406024bba777e9db8eda63) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/acpica')
-rw-r--r--meta/recipes-extended/acpica/acpica_20180508.bb (renamed from meta/recipes-extended/acpica/acpica_20170303.bb)11
-rw-r--r--meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch31
-rw-r--r--meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch29
3 files changed, 19 insertions, 52 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20170303.bb b/meta/recipes-extended/acpica/acpica_20180508.bb
index 51ae77b784..dfa9a18ccb 100644
--- a/meta/recipes-extended/acpica/acpica_20170303.bb
+++ b/meta/recipes-extended/acpica/acpica_20180508.bb
@@ -17,12 +17,11 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
17DEPENDS = "bison flex" 17DEPENDS = "bison flex"
18 18
19SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ 19SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \
20 file://rename-yy_scan_string-manually.patch \ 20 file://rename-yy_scan_string-manually.patch \
21 file://manipulate-fds-instead-of-FILE.patch;striplevel=2 \ 21 file://manipulate-fds-instead-of-FILE.patch \
22 file://0001-Linux-add-support-for-X32-ABI-compilation.patch \ 22 "
23 " 23SRC_URI[md5sum] = "31691e2eb82b2064f78536a3423c18d6"
24SRC_URI[md5sum] = "48ef4314fb4ffdd0c96f14dcf20544e1" 24SRC_URI[sha256sum] = "5d8fc9d9db9e04830d40bec9add04b21c05d466e0187d354815006fdd823cf15"
25SRC_URI[sha256sum] = "b2d81e84107ac9a02be86ea43cbea7afa8fd4b4150270bc88c2d4c9fea0b8aad"
26UPSTREAM_CHECK_URI = "https://acpica.org/downloads" 25UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
27 26
28S = "${WORKDIR}/acpica-unix2-${PV}" 27S = "${WORKDIR}/acpica-unix2-${PV}"
diff --git a/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch b/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch
deleted file mode 100644
index df74200068..0000000000
--- a/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From d22241efc0708c9799f17a20eabb52a48d6d6ea1 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 2 Jan 2018 12:35:32 +0800
4Subject: [PATCH] Linux: add support for X32 ABI compilation
5
6X32 follows ILP32 model. Check for ILP32 as well when checking for
7x86_64 to ensure the defines are correct for X32 ABI.
8
9Upstream-Status: Submitted [https://github.com/acpica/acpica/pull/348]
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 source/include/platform/aclinux.h | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h
17index 75b1d82..6b8ff73 100644
18--- a/source/include/platform/aclinux.h
19+++ b/source/include/platform/aclinux.h
20@@ -315,7 +315,7 @@
21 #define ACPI_FLUSH_CPU_CACHE()
22 #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
23
24-#if defined(__ia64__) || defined(__x86_64__) ||\
25+#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\
26 defined(__aarch64__) || defined(__PPC64__) ||\
27 defined(__s390x__)
28 #define ACPI_MACHINE_WIDTH 64
29--
302.7.4
31
diff --git a/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch b/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
index 5610ed9beb..d8b5f9aa8a 100644
--- a/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
+++ b/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
@@ -1,4 +1,4 @@
1From 69171c22f3872ecb4c1ab27985e93ca44084595e Mon Sep 17 00:00:00 2001 1From 540d80469e6a7dce6baf7214df90e86daffc5175 Mon Sep 17 00:00:00 2001
2From: Fan Xin <fan.xin@jp.fujitsu.com> 2From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Mon, 5 Jun 2017 13:26:38 +0900 3Date: Mon, 5 Jun 2017 13:26:38 +0900
4Subject: [PATCH] aslfiles.c: manipulate fds instead of FILE 4Subject: [PATCH] aslfiles.c: manipulate fds instead of FILE
@@ -16,18 +16,20 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
16Rebase on acpica 20170303 16Rebase on acpica 20170303
17 17
18Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> 18Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
19
19--- 20---
20 acpica-unix2-20170303/source/compiler/aslfiles.c | 14 +++++++++++--- 21 source/compiler/aslfiles.c | 15 ++++++++++++---
21 1 file changed, 11 insertions(+), 3 deletions(-) 22 1 file changed, 12 insertions(+), 3 deletions(-)
22 23
23diff --git a/acpica-unix2-20170303/source/compiler/aslfiles.c b/acpica-unix2-20170303/source/compiler/aslfiles.c 24diff --git a/source/compiler/aslfiles.c b/source/compiler/aslfiles.c
24index 809090c..97898b1 100644 25index 82865db..cc072dc 100644
25--- a/acpica-unix2-20170303/source/compiler/aslfiles.c 26--- a/source/compiler/aslfiles.c
26+++ b/acpica-unix2-20170303/source/compiler/aslfiles.c 27+++ b/source/compiler/aslfiles.c
27@@ -44,6 +44,10 @@ 28@@ -43,6 +43,11 @@
29
28 #include "aslcompiler.h" 30 #include "aslcompiler.h"
29 #include "acapps.h" 31 #include "acapps.h"
30 #include "dtcompiler.h" 32+#include "dtcompiler.h"
31+#include <sys/types.h> 33+#include <sys/types.h>
32+#include <sys/stat.h> 34+#include <sys/stat.h>
33+#include <fcntl.h> 35+#include <fcntl.h>
@@ -35,7 +37,7 @@ index 809090c..97898b1 100644
35 37
36 #define _COMPONENT ACPI_COMPILER 38 #define _COMPONENT ACPI_COMPILER
37 ACPI_MODULE_NAME ("aslfiles") 39 ACPI_MODULE_NAME ("aslfiles")
38@@ -607,6 +611,8 @@ FlOpenMiscOutputFiles ( 40@@ -606,6 +611,8 @@ FlOpenMiscOutputFiles (
39 41
40 if (Gbl_DebugFlag) 42 if (Gbl_DebugFlag)
41 { 43 {
@@ -44,7 +46,7 @@ index 809090c..97898b1 100644
44 Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_DEBUG); 46 Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_DEBUG);
45 if (!Filename) 47 if (!Filename)
46 { 48 {
47@@ -618,10 +624,10 @@ FlOpenMiscOutputFiles ( 49@@ -617,10 +624,10 @@ FlOpenMiscOutputFiles (
48 /* Open the debug file as STDERR, text mode */ 50 /* Open the debug file as STDERR, text mode */
49 51
50 Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Filename = Filename; 52 Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Filename = Filename;
@@ -58,7 +60,7 @@ index 809090c..97898b1 100644
58 { 60 {
59 /* 61 /*
60 * A problem with freopen is that on error, we no longer 62 * A problem with freopen is that on error, we no longer
61@@ -635,6 +641,8 @@ FlOpenMiscOutputFiles ( 63@@ -634,6 +641,8 @@ FlOpenMiscOutputFiles (
62 exit (1); 64 exit (1);
63 } 65 }
64 66
@@ -67,6 +69,3 @@ index 809090c..97898b1 100644
67 AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT); 69 AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT);
68 AslCompilerFileHeader (ASL_FILE_DEBUG_OUTPUT); 70 AslCompilerFileHeader (ASL_FILE_DEBUG_OUTPUT);
69 } 71 }
70--
711.9.1
72