From patchwork Tue Apr 23 16:33:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 162724 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3988656jan; Tue, 23 Apr 2019 09:34:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGI5OP9NU2iuFE0ir94fermoQZiR9zvg0Q/TGE1k3KI8C5TJt9qilvS/t9c4hEnkDFxaSg X-Received: by 2002:a63:5560:: with SMTP id f32mr25773295pgm.334.1556037244807; Tue, 23 Apr 2019 09:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556037244; cv=none; d=google.com; s=arc-20160816; b=Uv0g52kcZFIz2ACsmkjg40xcfqluvXJ+7xpgmpqabKd8/vAEAf9XbEf4qb1olemoeR xW/X5w1c98mJX5dfcBkKIAwMgqHVDvc3xcTlz2f3bZ+0zf+JAcnX65MC2vs41s2Hn8pb 1p/D0LyqDwApGUiz1UYxVoTySQHWVSV3gF/Ur8Bb1BiRFIT55GpOW962gOJCArAkO7/r pG8KUD2TBKvwSJY/tLQ+SK9C+Zr66NKM2jFWbd+rJfCq7OESQ5bGOMjbaTeomJX75xzE /yzCH3aD38VsKTyB3nXkGbetfIU6UmDfMBAKKatlOW/31WXA6w03WLKPGyO7q7Cr+FkI rw0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=FskMCav9F9nPa4NrxBxQFZl6c3SrEL3iBjNLAXAzRo8=; b=epIhHM7hfDRdXxdoO0PZO/dUUsOSmPXT+hh0UIHNZaINJuvRiD99p6HAnsVAyAg1+u YyYyJjOrc0g39Itd9aDXFJ1cTizpbvIBrwrgqjfcWUyAfpK9a0AjyZighHQvVeROTvnZ eG25GcF91vAMecAsCzPb9Wjj38KC1aIOax72LjX78KWTxwPi9vOrkS4PQyeOiXSATPzx I4Ao2OFQDWbcG2drEVnN4mf/bdo2V2Wt/u4mWbMa08Aoowub9sLDCb5WTFeF+kci2T5Z tsIi8f8RZnROmv3jWOc8Yym2S3daHI/A8U3YfDLT+dOmh7ETtGqYwiOyAzs04MEXvjAY FQ6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=mczRqHDl; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id j9si16282966plb.233.2019.04.23.09.34.03; Tue, 23 Apr 2019 09:34:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=mczRqHDl; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3C2B77D2F9; Tue, 23 Apr 2019 16:34:01 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mail.openembedded.org (Postfix) with ESMTP id AEF887CFF8 for ; Tue, 23 Apr 2019 16:33:59 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id h18so863994wml.1 for ; Tue, 23 Apr 2019 09:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=r3vLQWLDXghDGH/X/VjqjjZGTg9DvaBOZCYtuPqsqKI=; b=mczRqHDlMZ0i9CvzYMkeeKanpF+v+yKHMGYCyYmQ7OPbJlI3AaIFcasF/1KC24uX92 X0qjpb5iorsdA6mC8+r5ggFSU6JAWKm/Ux5GO2n0GyXRbdqU3tkt9nZdfeb4/f6IvY/O /k/jh+SEw2pCb/pq6Wecgc46JBHUr2vScdMnvNL5Din8ull2cI7uoRuy+93UIfw9EGsv GA4l1NnSS5DDwTh93s8CfHocZ+eArNbdORuN0MElEHwfHiYLL8eqmWqTPDk8drjxe9kb TpL9wEELtRQR97WFs3wrDE7rPlv4Lkuuho/2lkh60tBcYqYWhKeMJdIoFNXsBiXAqr/k ol2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=r3vLQWLDXghDGH/X/VjqjjZGTg9DvaBOZCYtuPqsqKI=; b=Q0MSEHq+DWhZQmDGQ5KYbcP4zbCEzC5OL/E5U5Pu8hR97FUTyRXKKEQiimpm+rr/ot yb9vya1tVOouiOdOSXqDgQromY+fSl+lZTDre1RaJd8hLLP7E61dgAbtZsDMDquTJDa1 Rjf17FDpDoLyBX437xKF8vVIPHhhKwjCKDkxwxC0C8SZkyVT44pgccD/tD87f1M0LCUP 68xUS335dE+4M5yy86/nzFAi2+ZtwL0ZbfQ/6x2+szoB99Y8KmzLQJhZyVtzR3OZI3/O TV2+xgkSWLgJowPMdQYKd+ufKvDQRJZS6EzdX1jNHT2lKhQcNFBvp+AX0CfmM06eTXsO v7bA== X-Gm-Message-State: APjAAAVMeUZkr1VCZyBSxZHyCqFJmTyHYEezbvd4zDl17noYzy0d7tqb f3qY5ub75iultqKRhdDB4HGRL+Bt+Fs= X-Received: by 2002:a1c:e1c5:: with SMTP id y188mr3023034wmg.39.1556037239903; Tue, 23 Apr 2019 09:33:59 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id l21sm14237873wme.4.2019.04.23.09.33.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 09:33:59 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 23 Apr 2019 17:33:56 +0100 Message-Id: <20190423163356.27421-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] acpica: upgrade to 20190215 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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 Signed-off-by: Ross Burton --- .../{acpica_20180508.bb => acpica_20190215.bb} | 25 ++++---- .../files/manipulate-fds-instead-of-FILE.patch | 71 ---------------------- .../files/rename-yy_scan_string-manually.patch | 64 ------------------- 3 files changed, 11 insertions(+), 149 deletions(-) rename meta/recipes-extended/acpica/{acpica_20180508.bb => acpica_20190215.bb} (58%) delete mode 100644 meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch delete mode 100644 meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/acpica/acpica_20180508.bb b/meta/recipes-extended/acpica/acpica_20190215.bb similarity index 58% rename from meta/recipes-extended/acpica/acpica_20180508.bb rename to meta/recipes-extended/acpica/acpica_20190215.bb index b5c89fafc59..d4789df9335 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" 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 = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz" +SRC_URI[md5sum] = "0ea9047bf15dfdf3583f5266cc6da718" +SRC_URI[sha256sum] = "8f939ad6130862e05853837496500b3fb93037530e5ea0ca0298458522ffc2c7" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix2-${PV}" @@ -31,16 +28,16 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "acpixtract" -EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" +EXTRA_OEMAKE = "CC='${CC}' \ + OPT_CFLAGS=-Wall \ + DESTDIR=${D} \ + PREFIX=${prefix} \ + INSTALLDIR=${bindir} \ + INSTALLFLAGS= \ + " do_install() { - install -D -p -m0755 generate/unix/bin*/iasl ${D}${bindir}/iasl - install -D -p -m0755 generate/unix/bin*/acpibin ${D}${bindir}/acpibin - install -D -p -m0755 generate/unix/bin*/acpiexec ${D}${bindir}/acpiexec - install -D -p -m0755 generate/unix/bin*/acpihelp ${D}${bindir}/acpihelp - install -D -p -m0755 generate/unix/bin*/acpinames ${D}${bindir}/acpinames - install -D -p -m0755 generate/unix/bin*/acpisrc ${D}${bindir}/acpisrc - install -D -p -m0755 generate/unix/bin*/acpixtract ${D}${bindir}/acpixtract + oe_runmake install } # 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 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 -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 - -Rebase on acpica 20170303 - -Signed-off-by: Fan Xin - ---- - 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 -+#include -+#include -+#include - - #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); - } 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 b62ca25ba21..00000000000 --- a/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2ab61e6ad5a9cfcde838379bc36babfaaa61afb8 Mon Sep 17 00:00:00 2001 -From: Patrick Ohly -Date: Fri, 20 Jan 2017 13:50:17 +0100 -Subject: [PATCH] rename yy_scan_string manually - -flex 2.6.0 used to generate code where yy_scan_string was mapped -to _scan_string directly in the generated .c code. - -For example, generate/unix/iasl/obj/prparserlex.c: - -int -PrInitLexer ( - char *String) -{ - - LexBuffer = PrParser_scan_string (String); - return (LexBuffer == NULL); -} - -flex 2.6.3 no longer does that, leading to a compiler warning -and link error about yy_scan_string(). - -Both versions generate a preamble in the beginning of prparserlex.c -that maps several yy_* names, but yy_scan_string is not among those: - -... -... - -Upstream-Status: Inappropriate [workaround for https://github.com/westes/flex/issues/164] -Signed-off-by: Patrick Ohly ---- - source/compiler/dtparser.l | 2 +- - source/compiler/prparser.l | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/source/compiler/dtparser.l b/source/compiler/dtparser.l -index 3f4c2f3..eaa43ff 100644 ---- a/source/compiler/dtparser.l -+++ b/source/compiler/dtparser.l -@@ -120,7 +120,7 @@ DtInitLexer ( - char *String) - { - -- LexBuffer = yy_scan_string (String); -+ LexBuffer = DtParser_scan_string (String); - return (LexBuffer == NULL); - } - -diff --git a/source/compiler/prparser.l b/source/compiler/prparser.l -index 10bd130..9cb3573 100644 ---- a/source/compiler/prparser.l -+++ b/source/compiler/prparser.l -@@ -127,7 +127,7 @@ PrInitLexer ( - char *String) - { - -- LexBuffer = yy_scan_string (String); -+ LexBuffer = PrParser_scan_string (String); - return (LexBuffer == NULL); - } - --- -2.11.0 -