diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-extended/acpica | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-extended/acpica')
-rw-r--r-- | poky/meta/recipes-extended/acpica/acpica_20180508.bb (renamed from poky/meta/recipes-extended/acpica/acpica_20170303.bb) | 13 | ||||
-rw-r--r-- | poky/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch | 31 | ||||
-rw-r--r-- | poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch | 29 |
3 files changed, 20 insertions, 53 deletions
diff --git a/poky/meta/recipes-extended/acpica/acpica_20170303.bb b/poky/meta/recipes-extended/acpica/acpica_20180508.bb index 51ae77b78..b5c89fafc 100644 --- a/poky/meta/recipes-extended/acpica/acpica_20170303.bb +++ b/poky/meta/recipes-extended/acpica/acpica_20180508.bb @@ -14,15 +14,14 @@ LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -DEPENDS = "bison flex" +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;striplevel=2 \ - file://0001-Linux-add-support-for-X32-ABI-compilation.patch \ - " -SRC_URI[md5sum] = "48ef4314fb4ffdd0c96f14dcf20544e1" -SRC_URI[sha256sum] = "b2d81e84107ac9a02be86ea43cbea7afa8fd4b4150270bc88c2d4c9fea0b8aad" + file://rename-yy_scan_string-manually.patch \ + file://manipulate-fds-instead-of-FILE.patch \ + " +SRC_URI[md5sum] = "31691e2eb82b2064f78536a3423c18d6" +SRC_URI[sha256sum] = "5d8fc9d9db9e04830d40bec9add04b21c05d466e0187d354815006fdd823cf15" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix2-${PV}" diff --git a/poky/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch b/poky/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch deleted file mode 100644 index df7420006..000000000 --- a/poky/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d22241efc0708c9799f17a20eabb52a48d6d6ea1 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Tue, 2 Jan 2018 12:35:32 +0800 -Subject: [PATCH] Linux: add support for X32 ABI compilation - -X32 follows ILP32 model. Check for ILP32 as well when checking for -x86_64 to ensure the defines are correct for X32 ABI. - -Upstream-Status: Submitted [https://github.com/acpica/acpica/pull/348] - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - source/include/platform/aclinux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h -index 75b1d82..6b8ff73 100644 ---- a/source/include/platform/aclinux.h -+++ b/source/include/platform/aclinux.h -@@ -315,7 +315,7 @@ - #define ACPI_FLUSH_CPU_CACHE() - #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) - --#if defined(__ia64__) || defined(__x86_64__) ||\ -+#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\ - defined(__aarch64__) || defined(__PPC64__) ||\ - defined(__s390x__) - #define ACPI_MACHINE_WIDTH 64 --- -2.7.4 - 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 5610ed9be..d8b5f9aa8 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 <fan.xin@jp.fujitsu.com> 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 <patrick.ohly@intel.com> 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(-) + 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 <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> @@ -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 - |