diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-support/boost/boost | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip |
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-support/boost/boost')
2 files changed, 48 insertions, 65 deletions
diff --git a/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch b/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch new file mode 100644 index 000000000..c2ac49e58 --- /dev/null +++ b/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch @@ -0,0 +1,48 @@ +From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Fri, 15 Jun 2018 16:21:56 +0800 +Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section + +Set .file section explicitly for .S files to avoid +the linker introduces the host path in symbols for +object files whose source file is .S +Otherwise, there is a host path in the symbols as below: +$ readelf --wide --symbols /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/libboost_context.so.1.67.0 + +42: 0000000000000000 0 FILE LOCAL DEFAULT ABS /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/asm/make_x86_64_sysv_elf_gas.o + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + libs/context/src/asm/make_i386_sysv_elf_gas.S | 1 + + libs/context/src/asm/make_x86_64_sysv_elf_gas.S | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S +index de77e88..b76de26 100644 +--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S ++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "make_i386_sysv_elf_gas.S" + .text + .globl make_fcontext + .align 2 +diff --git a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S +index 25a0c00..0ef3756 100644 +--- a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S ++++ b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "make_x86_64_sysv_elf_gas.S" + .text + .globl make_fcontext + .type make_fcontext,@function +-- +2.7.4 + diff --git a/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch deleted file mode 100644 index 26f3cbb05..000000000 --- a/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch +++ /dev/null @@ -1,65 +0,0 @@ -From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 10:29:17 -0700 -Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves - -Upstream-Status: Inappropriate -Signed-off-by: Christopher Larson <chris_larson@mentor.com> - ---- - tools/build/src/tools/gcc.jam | 39 --------------------------------------- - 1 file changed, 39 deletions(-) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index e4fc6c32..37914fd0 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -337,45 +337,6 @@ rule set-address-model-options ( targets * : sources * : properties * ) - { - local option ; - local target-os = [ feature.get-values target-os : $(properties) ] ; -- if $(target-os) = aix -- { -- if $(model) = 32 -- { -- option = -maix32 ; -- } -- else -- { -- option = -maix64 ; -- } -- } -- else if $(target-os) = hpux -- { -- if $(model) = 32 -- { -- option = -milp32 ; -- } -- else -- { -- option = -mlp64 ; -- } -- } -- else -- { -- local arch = [ feature.get-values architecture : $(properties) ] ; -- if $(arch) = power || $(arch) = sparc || $(arch) = x86 -- { -- if $(model) = 32 -- { -- option = -m32 ; -- } -- else if $(model) = 64 -- { -- option = -m64 ; -- } -- } -- # For darwin, the model can be 32_64. darwin.jam will handle that -- # on its own. -- } - OPTIONS on $(targets) += $(option) ; - } - } --- -2.15.1 - |