From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/9] acpica: update to 20190405
Date: Tue, 23 Apr 2019 18:19:09 +0200 [thread overview]
Message-ID: <20190423161916.25572-2-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20190423161916.25572-1-alex.kanavin@gmail.com>
Drop manipulate-fds-instead-of-FILE.patch as upstream has fixed the issue
long time ago:
https://github.com/acpica/acpica/commit/ecb91f4c3a151cbb280ee445166e7c6f4dc441a5
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...{acpica_20180508.bb => acpica_20190405.bb} | 5 +-
.../manipulate-fds-instead-of-FILE.patch | 71 -------------------
2 files changed, 2 insertions(+), 74 deletions(-)
rename meta/recipes-extended/acpica/{acpica_20180508.bb => acpica_20190405.bb} (90%)
delete mode 100644 meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
diff --git a/meta/recipes-extended/acpica/acpica_20180508.bb b/meta/recipes-extended/acpica/acpica_20190405.bb
similarity index 90%
rename from meta/recipes-extended/acpica/acpica_20180508.bb
rename to meta/recipes-extended/acpica/acpica_20190405.bb
index b5c89fafc59..c0ebd5a9317 100644
--- a/meta/recipes-extended/acpica/acpica_20180508.bb
+++ b/meta/recipes-extended/acpica/acpica_20190405.bb
@@ -18,10 +18,9 @@ DEPENDS = "bison flex bison-native"
SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \
file://rename-yy_scan_string-manually.patch \
- file://manipulate-fds-instead-of-FILE.patch \
"
-SRC_URI[md5sum] = "31691e2eb82b2064f78536a3423c18d6"
-SRC_URI[sha256sum] = "5d8fc9d9db9e04830d40bec9add04b21c05d466e0187d354815006fdd823cf15"
+SRC_URI[md5sum] = "9ee30c8ff3012e213bc3b21a9d632215"
+SRC_URI[sha256sum] = "7e144fd011c23a0a10be0b0d7448c527a4c0f621f1f835a271636e448bc96643"
UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
S = "${WORKDIR}/acpica-unix2-${PV}"
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 d8b5f9aa8a1..00000000000
--- a/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 540d80469e6a7dce6baf7214df90e86daffc5175 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
-musl because FILE is an undefined struct.
-
-Instead, use lower-level Unix functions to modify the file that stderr
-writes into. This works on the platforms that Yocto targets.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-
-Rebase on acpica 20170303
-
-Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
-
----
- source/compiler/aslfiles.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/source/compiler/aslfiles.c b/source/compiler/aslfiles.c
-index 82865db..cc072dc 100644
---- a/source/compiler/aslfiles.c
-+++ b/source/compiler/aslfiles.c
-@@ -43,6 +43,11 @@
-
- #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")
-@@ -606,6 +611,8 @@ FlOpenMiscOutputFiles (
-
- if (Gbl_DebugFlag)
- {
-+ int fd;
-+
- Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_DEBUG);
- if (!Filename)
- {
-@@ -617,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
-@@ -634,6 +641,8 @@ FlOpenMiscOutputFiles (
- exit (1);
- }
-
-+ Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle = stderr;
-+
- AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT);
- AslCompilerFileHeader (ASL_FILE_DEBUG_OUTPUT);
- }
--
2.17.1
next prev parent reply other threads:[~2019-04-23 16:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 16:19 [PATCH 1/9] msmtp: fix upstream version check Alexander Kanavin
2019-04-23 16:19 ` Alexander Kanavin [this message]
2019-04-23 16:33 ` [PATCH 2/9] acpica: update to 20190405 Burton, Ross
2019-04-23 16:50 ` Alexander Kanavin
2019-04-23 16:51 ` Burton, Ross
2019-04-23 16:19 ` [PATCH 3/9] gtk-doc.bbclass: unify option setting for meson-based recipes Alexander Kanavin
2019-04-24 6:50 ` Richard Purdie
2019-04-23 16:19 ` [PATCH 4/9] python-scons: update to 3.0.5 Alexander Kanavin
2019-04-23 16:19 ` [PATCH 5/9] python-setuptools: update to 41.0.1 Alexander Kanavin
2019-04-24 16:02 ` Richard Purdie
2019-04-24 16:20 ` Alexander Kanavin
2019-08-06 23:14 ` Paul Eggleton
2019-08-07 10:22 ` Alexander Kanavin
2019-08-07 10:49 ` Ross Burton
2019-04-23 16:19 ` [PATCH 6/9] python3-mako: update to 1.0.9 Alexander Kanavin
2019-04-23 16:19 ` [PATCH 7/9] python3-pbr: update to 5.1.3 Alexander Kanavin
2019-04-23 16:19 ` [PATCH 8/9] python3-pip: update to 19.0.3 Alexander Kanavin
2019-04-23 16:19 ` [PATCH 9/9] python3-pycairo: update to 1.18.1 Alexander Kanavin
2019-04-24 15:49 ` Richard Purdie
2019-04-24 16:30 ` Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190423161916.25572-2-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox