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 --- ...-Add-Wunknown-attributes-when-using-clang.patch | 33 -------------- ...Do-not-use-__bswap_constant_-16-32-macros.patch | 35 --------------- .../efivar/0003-efivar-fix-for-cross-compile.patch | 42 ------------------ .../allow-multi-definitions-for-native.patch | 14 +++--- .../recipes-bsp/efivar/efivar/musl-strndupa.patch | 25 ----------- .../meta-oe/recipes-bsp/efivar/efivar_0.31.bb | 50 ---------------------- .../meta-oe/recipes-bsp/efivar/efivar_0.36.bb | 43 +++++++++++++++++++ 7 files changed, 52 insertions(+), 190 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb (limited to 'meta-openembedded/meta-oe/recipes-bsp/efivar') diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch deleted file mode 100644 index b4ce132a2..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d65c325dd8681edf2ee3332eeb0a547229c7ffb5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 24 Aug 2017 15:54:47 -0700 -Subject: [PATCH] efivar-dp.h: Add -Wunknown-attributes when using clang - -change !dp check to a comparision against NULL to silent clang warning -nonnull parameter 'dp' will evaluate to 'true' on first encounter - -Signed-off-by: Khem Raj - ---- - src/include/efivar/efivar-dp.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/include/efivar/efivar-dp.h b/src/include/efivar/efivar-dp.h -index 3a509b7..c140e8d 100644 ---- a/src/include/efivar/efivar-dp.h -+++ b/src/include/efivar/efivar-dp.h -@@ -783,9 +783,14 @@ extern int efidp_append_instance(const_efidp dp, const_efidp dpi, efidp *out); - * though older or other compilers might just ignore that attribute if they - * don't support it. Ugh. - */ -+#pragma GCC diagnostic push - #if defined(__GNUC__) && __GNUC__ >= 6 - #pragma GCC diagnostic ignored "-Wnonnull-compare" - #endif -+#if defined(__clang__) -+#pragma GCC diagnostic ignored "-Wunknown-attributes" -+#pragma GCC diagnostic ignored "-Wpointer-bool-conversion" -+#endif - - static inline int16_t - __attribute__((__artificial__)) diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch deleted file mode 100644 index 2a6eb065f..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dd4291265b7b3d7d7ffa1d8adf32781ae25dbfeb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Jul 2017 00:29:42 -0700 -Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros - -not available on musl - -Signed-off-by: Khem Raj - ---- - src/makeguids.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/makeguids.c b/src/makeguids.c -index da2f5f7..daf821a 100644 ---- a/src/makeguids.c -+++ b/src/makeguids.c -@@ -155,13 +155,13 @@ main(int argc, char *argv[]) - #if BYTE_ORDER == BIG_ENDIAN\n\ - #define cpu_to_be32(n) (n)\n\ - #define cpu_to_be16(n) (n)\n\ --#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ --#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ -+#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ -+#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ - #else\n\ - #define cpu_to_le32(n) (n)\n\ - #define cpu_to_le16(n) (n)\n\ --#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ --#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ -+#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ -+#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ - #endif\n\ - """); - diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch deleted file mode 100644 index 83105fe0d..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dea4a55714249b2734a36701120fd22c91c64ec2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Sat, 7 May 2016 02:06:47 -0400 -Subject: [PATCH] Makefile: fix efivar.pc not found - -It fixes efivar.pc not found: -... -| install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/ -| install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ -; install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ -; -| install: cannot stat 'efivar.pc': No such file or directory -| install: cannot stat 'efiboot.pc': No such file or directory -| make[1]: *** [install] Error 1 -| make[1]: Leaving directory `efivar/0.23-r0/git/src' -| make: *** [install] Error 2 -| ERROR: oe_runmake failed -... - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia - ---- - src/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index dcc7fc8..691aa8a 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -94,7 +94,9 @@ install : all - ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x) ;\ - ) - $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR) -- $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;) -+ $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(TOPDIR)/src/$(x).in $(DESTDIR)$(PCDIR)/$(x) ;\ -+ sed -i -e "s:@@LIBDIR@@:$(libdir):g" -e "s:@@VERSION@@:$(VERSION):g" \ -+ $(DESTDIR)$(PCDIR)/$(x); ) - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar - $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(includedir)/efivar/$(notdir $(x));) - $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch index f88af1fe1..043b07a65 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch +++ b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch @@ -1,6 +1,6 @@ -From c801dcb03d42eb533a9bead0b397d7ce4fc5a6fe Mon Sep 17 00:00:00 2001 -From: Kai Kang -Date: Wed, 10 Aug 2016 17:49:50 +0800 +From c10368b397483a2fc7b493c099d8416d902f8cd8 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 31 Jul 2018 14:18:35 +0800 Subject: [PATCH] allow multi definitions for native Upstream-Status: Pending @@ -14,12 +14,13 @@ Add link option '-z muldefs' to fix it. Signed-off-by: Kai Kang +Signed-off-by: Hongxu Jia --- Make.rules | 1 + 1 file changed, 1 insertion(+) diff --git a/Make.rules b/Make.rules -index 88b9aa7..799332f 100644 +index 042585b..257ba45 100644 --- a/Make.rules +++ b/Make.rules @@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version @@ -28,5 +29,8 @@ index 88b9aa7..799332f 100644 -Wl,--version-script=$(MAP) \ + -Wl,-z,muldefs \ -o $@ $^ $(LDLIBS) + ln -vfs $@ $@.1 - %.abixml : %.so +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch deleted file mode 100644 index 5864ac63e..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8000b9afc858472912aace985004b44f8eb467e0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 18 Aug 2017 09:49:49 -0700 -Subject: [PATCH] support musl - -Upstream-Status: Pending ---- - src/linux.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/linux.c b/src/linux.c -index 34ed479..1304f2b 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -40,6 +40,10 @@ - #include - #include - -+#if !defined(__GLIBC__) -+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) -+#endif -+ - #include "dp.h" - #include "linux.h" - #include "util.h" diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb deleted file mode 100644 index 9d4cdc97b..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Tools to manipulate UEFI variables" -DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" -HOMEPAGE = "https://github.com/rhinstaller/efivar" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" - -DEPENDS = "popt" -DEPENDS_append_class-target = " efivar-native" - -inherit pkgconfig - -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" - -SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" -SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://allow-multi-definitions-for-native.patch \ - file://0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch \ - file://musl-strndupa.patch \ - file://0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch \ - " -SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ - file://0003-efivar-fix-for-cross-compile.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ - " -SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.patch \ - " - -S = "${WORKDIR}/git" - -# Setting CROSS_COMPILE breaks pkgconfig, so just set AR -EXTRA_OEMAKE = "AR=${TARGET_PREFIX}gcc-ar" - -do_compile_prepend() { - sed -i -e s:-Werror::g ${S}/gcc.specs -} - -do_compile_class-native() { - oe_runmake -C src makeguids -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - -do_install_class-native() { - install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb new file mode 100644 index 000000000..20588ee97 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.36.bb @@ -0,0 +1,43 @@ +SUMMARY = "Tools to manipulate UEFI variables" +DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" +HOMEPAGE = "https://github.com/rhinstaller/efivar" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" + +DEPENDS = "popt" +DEPENDS_append_class-target = " efivar-native" + +inherit pkgconfig + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" + +SRCREV = "ef3449223ecd1e7b1098c523d66b2f960fe839ea" +SRC_URI = "git://github.com/rhinstaller/efivar.git \ + file://allow-multi-definitions-for-native.patch \ + " +SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ + " +SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.patch \ + " + +S = "${WORKDIR}/git" + +do_compile_prepend() { + sed -i -e s:-Werror::g ${S}/gcc.specs +} + +do_compile_class-native() { + oe_runmake -C src makeguids CC_FOR_BUILD="${BUILD_CC}" +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + +do_install_class-native() { + install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids +} + +BBCLASSEXTEND = "native" -- cgit v1.2.1