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-sato/webkit/webkitgtk/x32_support.patch | |
| 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-sato/webkit/webkitgtk/x32_support.patch')
| -rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch index 5f2383758..85d281e7f 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch @@ -1,13 +1,22 @@ -From: Daniel Schepler <dschepler@gmail.com> -Subject: Fix FTBFS in x32 -Bug-Debian: https://bugs.debian.org/700795 -Upstream-Status: Pending Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h +Upstream-Status: Pending + +From 897563a0397266d8ceb058f172e16b06419b2593 Mon Sep 17 00:00:00 2001 +From: Daniel Schepler <dschepler@gmail.com> +Date: Mon, 26 Mar 2018 17:48:34 +0300 +Subject: [PATCH] Fix FTBFS in x32 + =================================================================== ---- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h -+++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h -@@ -172,7 +172,11 @@ + +--- + Source/WTF/wtf/Platform.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 850e298..551c047 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -132,7 +132,11 @@ /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ #if defined(__x86_64__) \ || defined(_M_X64) @@ -17,5 +26,5 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h #define WTF_CPU_X86_64 1 +#endif #define WTF_CPU_X86_SSE2 1 + #define WTF_CPU_KNOWN 1 #endif - |