From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../files/manipulate-fds-instead-of-FILE.patch | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch') diff --git a/poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch b/poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch index 5610ed9beb..d8b5f9aa8a 100644 --- a/poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch +++ b/poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch @@ -1,4 +1,4 @@ -From 69171c22f3872ecb4c1ab27985e93ca44084595e Mon Sep 17 00:00:00 2001 +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 @@ -16,18 +16,20 @@ Signed-off-by: Patrick Ohly Rebase on acpica 20170303 Signed-off-by: Fan Xin + --- - acpica-unix2-20170303/source/compiler/aslfiles.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) + source/compiler/aslfiles.c | 15 ++++++++++++--- + 1 file changed, 12 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 @@ +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 "dtcompiler.h" +#include +#include +#include @@ -35,7 +37,7 @@ index 809090c..97898b1 100644 #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslfiles") -@@ -607,6 +611,8 @@ FlOpenMiscOutputFiles ( +@@ -606,6 +611,8 @@ FlOpenMiscOutputFiles ( if (Gbl_DebugFlag) { @@ -44,7 +46,7 @@ index 809090c..97898b1 100644 Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_DEBUG); if (!Filename) { -@@ -618,10 +624,10 @@ FlOpenMiscOutputFiles ( +@@ -617,10 +624,10 @@ FlOpenMiscOutputFiles ( /* Open the debug file as STDERR, text mode */ Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Filename = Filename; @@ -58,7 +60,7 @@ index 809090c..97898b1 100644 { /* * A problem with freopen is that on error, we no longer -@@ -635,6 +641,8 @@ FlOpenMiscOutputFiles ( +@@ -634,6 +641,8 @@ FlOpenMiscOutputFiles ( exit (1); } @@ -67,6 +69,3 @@ index 809090c..97898b1 100644 AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT); AslCompilerFileHeader (ASL_FILE_DEBUG_OUTPUT); } --- -1.9.1 - -- cgit v1.2.3