summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-04-23 18:50:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-25 00:05:20 +0100
commit218ce6a595fff743bd52a2e57ae55410275cc852 (patch)
treec3b49102b2716c44ef0e2aabbdff15cb886ce59e /meta/recipes-extended
parent7f7a7cba4dcd99d7b36a0d747bfd1bba3f9c2288 (diff)
downloadpoky-218ce6a595fff743bd52a2e57ae55410275cc852.tar.gz
acpica: upgrade to 20190215
Drop yy_scan_string patch, this only affects builds with flex 2.6.2. We currently have 2.6.0 and when we upgrade it will be to at least 2.6.3, which fixes the regression. Drop manipulate_fds_instead-of-FILE.patch, the original problem was fix upstream in May 2015[1] so the 20170303 upgrade should have dropped this patch instead of rebasing. Call the upstream install target with variables set appropriately, instead of hand-coding an install. [1] https://github.com/acpica/acpica/commit/ecb91f4c3a151cbb280ee445166e7c6f4dc441a5 (From OE-Core rev: 4e95571120c8748b2b5ef4b6a06914232b19d457) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/acpica/acpica_20190215.bb (renamed from meta/recipes-extended/acpica/acpica_20180508.bb)25
-rw-r--r--meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch71
-rw-r--r--meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch64
3 files changed, 11 insertions, 149 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20180508.bb b/meta/recipes-extended/acpica/acpica_20190215.bb
index b5c89fafc5..d4789df933 100644
--- a/meta/recipes-extended/acpica/acpica_20180508.bb
+++ b/meta/recipes-extended/acpica/acpica_20190215.bb
@@ -16,12 +16,9 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
16 16
17DEPENDS = "bison flex bison-native" 17DEPENDS = "bison flex bison-native"
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 \ 20SRC_URI[md5sum] = "0ea9047bf15dfdf3583f5266cc6da718"
21 file://manipulate-fds-instead-of-FILE.patch \ 21SRC_URI[sha256sum] = "8f939ad6130862e05853837496500b3fb93037530e5ea0ca0298458522ffc2c7"
22 "
23SRC_URI[md5sum] = "31691e2eb82b2064f78536a3423c18d6"
24SRC_URI[sha256sum] = "5d8fc9d9db9e04830d40bec9add04b21c05d466e0187d354815006fdd823cf15"
25UPSTREAM_CHECK_URI = "https://acpica.org/downloads" 22UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
26 23
27S = "${WORKDIR}/acpica-unix2-${PV}" 24S = "${WORKDIR}/acpica-unix2-${PV}"
@@ -31,16 +28,16 @@ inherit update-alternatives
31ALTERNATIVE_PRIORITY = "100" 28ALTERNATIVE_PRIORITY = "100"
32ALTERNATIVE_${PN} = "acpixtract" 29ALTERNATIVE_${PN} = "acpixtract"
33 30
34EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" 31EXTRA_OEMAKE = "CC='${CC}' \
32 OPT_CFLAGS=-Wall \
33 DESTDIR=${D} \
34 PREFIX=${prefix} \
35 INSTALLDIR=${bindir} \
36 INSTALLFLAGS= \
37 "
35 38
36do_install() { 39do_install() {
37 install -D -p -m0755 generate/unix/bin*/iasl ${D}${bindir}/iasl 40 oe_runmake install
38 install -D -p -m0755 generate/unix/bin*/acpibin ${D}${bindir}/acpibin
39 install -D -p -m0755 generate/unix/bin*/acpiexec ${D}${bindir}/acpiexec
40 install -D -p -m0755 generate/unix/bin*/acpihelp ${D}${bindir}/acpihelp
41 install -D -p -m0755 generate/unix/bin*/acpinames ${D}${bindir}/acpinames
42 install -D -p -m0755 generate/unix/bin*/acpisrc ${D}${bindir}/acpisrc
43 install -D -p -m0755 generate/unix/bin*/acpixtract ${D}${bindir}/acpixtract
44} 41}
45 42
46# iasl*.bb is a subset of this recipe, so RREPLACE it 43# iasl*.bb is a subset of this recipe, so RREPLACE it
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
deleted file mode 100644
index d8b5f9aa8a..0000000000
--- a/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 540d80469e6a7dce6baf7214df90e86daffc5175 Mon Sep 17 00:00:00 2001
2From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Mon, 5 Jun 2017 13:26:38 +0900
4Subject: [PATCH] aslfiles.c: manipulate fds instead of FILE
5
6Copying what stdout/stderr point to is not portable and fails with
7musl because FILE is an undefined struct.
8
9Instead, use lower-level Unix functions to modify the file that stderr
10writes into. This works on the platforms that Yocto targets.
11
12Upstream-Status: Inappropriate [embedded specific]
13
14Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
15
16Rebase on acpica 20170303
17
18Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
19
20---
21 source/compiler/aslfiles.c | 15 ++++++++++++---
22 1 file changed, 12 insertions(+), 3 deletions(-)
23
24diff --git a/source/compiler/aslfiles.c b/source/compiler/aslfiles.c
25index 82865db..cc072dc 100644
26--- a/source/compiler/aslfiles.c
27+++ b/source/compiler/aslfiles.c
28@@ -43,6 +43,11 @@
29
30 #include "aslcompiler.h"
31 #include "acapps.h"
32+#include "dtcompiler.h"
33+#include <sys/types.h>
34+#include <sys/stat.h>
35+#include <fcntl.h>
36+#include <unistd.h>
37
38 #define _COMPONENT ACPI_COMPILER
39 ACPI_MODULE_NAME ("aslfiles")
40@@ -606,6 +611,8 @@ FlOpenMiscOutputFiles (
41
42 if (Gbl_DebugFlag)
43 {
44+ int fd;
45+
46 Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_DEBUG);
47 if (!Filename)
48 {
49@@ -617,10 +624,10 @@ FlOpenMiscOutputFiles (
50 /* Open the debug file as STDERR, text mode */
51
52 Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Filename = Filename;
53- Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle =
54- freopen (Filename, "w+t", stderr);
55
56- if (!Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle)
57+ fd = open(Filename, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
58+ if (fd < 0 ||
59+ dup2(fd, fileno(stderr)))
60 {
61 /*
62 * A problem with freopen is that on error, we no longer
63@@ -634,6 +641,8 @@ FlOpenMiscOutputFiles (
64 exit (1);
65 }
66
67+ Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle = stderr;
68+
69 AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT);
70 AslCompilerFileHeader (ASL_FILE_DEBUG_OUTPUT);
71 }
diff --git a/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch b/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch
deleted file mode 100644
index b62ca25ba2..0000000000
--- a/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From 2ab61e6ad5a9cfcde838379bc36babfaaa61afb8 Mon Sep 17 00:00:00 2001
2From: Patrick Ohly <patrick.ohly@intel.com>
3Date: Fri, 20 Jan 2017 13:50:17 +0100
4Subject: [PATCH] rename yy_scan_string manually
5
6flex 2.6.0 used to generate code where yy_scan_string was mapped
7to <custom prefix>_scan_string directly in the generated .c code.
8
9For example, generate/unix/iasl/obj/prparserlex.c:
10
11int
12PrInitLexer (
13 char *String)
14{
15
16 LexBuffer = PrParser_scan_string (String);
17 return (LexBuffer == NULL);
18}
19
20flex 2.6.3 no longer does that, leading to a compiler warning
21and link error about yy_scan_string().
22
23Both versions generate a preamble in the beginning of prparserlex.c
24that maps several yy_* names, but yy_scan_string is not among those:
25
26...
27...
28
29Upstream-Status: Inappropriate [workaround for https://github.com/westes/flex/issues/164]
30Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
31---
32 source/compiler/dtparser.l | 2 +-
33 source/compiler/prparser.l | 2 +-
34 2 files changed, 2 insertions(+), 2 deletions(-)
35
36diff --git a/source/compiler/dtparser.l b/source/compiler/dtparser.l
37index 3f4c2f3..eaa43ff 100644
38--- a/source/compiler/dtparser.l
39+++ b/source/compiler/dtparser.l
40@@ -120,7 +120,7 @@ DtInitLexer (
41 char *String)
42 {
43
44- LexBuffer = yy_scan_string (String);
45+ LexBuffer = DtParser_scan_string (String);
46 return (LexBuffer == NULL);
47 }
48
49diff --git a/source/compiler/prparser.l b/source/compiler/prparser.l
50index 10bd130..9cb3573 100644
51--- a/source/compiler/prparser.l
52+++ b/source/compiler/prparser.l
53@@ -127,7 +127,7 @@ PrInitLexer (
54 char *String)
55 {
56
57- LexBuffer = yy_scan_string (String);
58+ LexBuffer = PrParser_scan_string (String);
59 return (LexBuffer == NULL);
60 }
61
62--
632.11.0
64