mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-14 08:02:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

acpica: Upgrade 20150515 -> 20170303

Browse Source 
1. Upgrade acpica from 20150515 to 20170303

2. Rebase the patch file for 20170303

(From OE-Core rev: c08ca9353fabb595de1011cf9d6db6ff6cc06ce3)

Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fan Xin
2017-06-05 13:51:10 +09:00
committed by Richard Purdie
parent d4dbdfc5d2
commit 4b80067c73
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-extended/acpica/acpica_20150515.bb → meta/recipes-extended/acpica/acpica_20170303.bb
View File

@@ -19,10 +19,10 @@ DEPENDS = "bison flex"
SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \
file://no-werror.patch \
file://rename-yy_scan_string-manually.patch \
file://manipulate-fds-instead-of-FILE.patch \
file://manipulate-fds-instead-of-FILE.patch;striplevel=2 \
"
SRC_URI[md5sum] = "2bc4a7ccc82de9df9fa964f784ecb29c"
SRC_URI[sha256sum] = "61204ec56d71bc9bfa2ee2ade4c66f7e8541772ac72ef8ccc20b3f339cc96374"
SRC_URI[md5sum] = "48ef4314fb4ffdd0c96f14dcf20544e1"
SRC_URI[sha256sum] = "b2d81e84107ac9a02be86ea43cbea7afa8fd4b4150270bc88c2d4c9fea0b8aad"
UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
S = "${WORKDIR}/acpica-unix2-${PV}"

59
meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
View File

@@ -1,6 +1,6 @@
From 33a57979738e5ab13950ec1c0e7298e41ef50929 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 23 Feb 2017 18:10:47 +0100
From 69171c22f3872ecb4c1ab27985e93ca44084595e Mon Sep 17 00:00:00 2001
From: Fan Xin <fan.xin@jp.fujitsu.com>
Date: Mon, 5 Jun 2017 13:26:38 +0900
Subject: [PATCH] aslfiles.c: manipulate fds instead of FILE
Copying what stdout/stderr point to is not portable and fails with
@@ -12,60 +12,61 @@ writes into. This works on the platforms that Yocto targets.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
source/compiler/aslfiles.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/source/compiler/aslfiles.c b/source/compiler/aslfiles.c
index 947e465..7a352b4 100644
--- a/source/compiler/aslfiles.c
+++ b/source/compiler/aslfiles.c
@@ -44,6 +44,11 @@
Rebase on acpica 20170303
Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
---
acpica-unix2-20170303/source/compiler/aslfiles.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/acpica-unix2-20170303/source/compiler/aslfiles.c b/acpica-unix2-20170303/source/compiler/aslfiles.c
index 809090c..97898b1 100644
--- a/acpica-unix2-20170303/source/compiler/aslfiles.c
+++ b/acpica-unix2-20170303/source/compiler/aslfiles.c
@@ -44,6 +44,10 @@
#include "aslcompiler.h"
#include "acapps.h"
#include "dtcompiler.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
#define _COMPONENT ACPI_COMPILER
ACPI_MODULE_NAME ("aslfiles")
@@ -569,6 +574,8 @@ FlOpenMiscOutputFiles (
@@ -607,6 +611,8 @@ FlOpenMiscOutputFiles (
if (Gbl_DebugFlag)
{
+ int fd;
+ int fd;
+
Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_DEBUG);
if (!Filename)
{
@@ -582,20 +589,15 @@ FlOpenMiscOutputFiles (
/* TBD: hide this behind a FlReopenFile function */
@@ -618,10 +624,10 @@ FlOpenMiscOutputFiles (
/* Open the debug file as STDERR, text mode */
Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Filename = Filename;
- Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle =
- freopen (Filename, "w+t", stderr);
-
- if (!Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle)
+ fd = open(Filename, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
+ if (fd < 0 ||
+ dup2(fd, fileno(stderr)))
{
- /*
- * A problem with freopen is that on error,
- * we no longer have stderr.
- */
Gbl_DebugFlag = FALSE;
- memcpy (stderr, stdout, sizeof (FILE));
FlFileError (ASL_FILE_DEBUG_OUTPUT, ASL_MSG_DEBUG_FILENAME);
AslAbort ();
/*
* A problem with freopen is that on error, we no longer
@@ -635,6 +641,8 @@ FlOpenMiscOutputFiles (
exit (1);
}
+ Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle = stderr;
+ Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle = stderr;
+
AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT);
AslCompilerFileHeader (ASL_FILE_DEBUG_OUTPUT);
}
--
2.1.4
1.9.1