summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch33
-rw-r--r--meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch35
-rw-r--r--meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch42
-rw-r--r--meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch14
-rw-r--r--meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch25
-rw-r--r--meta-oe/recipes-bsp/efivar/efivar_0.36.bb (renamed from meta-oe/recipes-bsp/efivar/efivar_0.31.bb)11
6 files changed, 11 insertions, 149 deletions
diff --git a/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch b/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch
deleted file mode 100644
index b4ce132a25..0000000000
--- a/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From d65c325dd8681edf2ee3332eeb0a547229c7ffb5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 24 Aug 2017 15:54:47 -0700
4Subject: [PATCH] efivar-dp.h: Add -Wunknown-attributes when using clang
5
6change !dp check to a comparision against NULL to silent clang warning
7nonnull parameter 'dp' will evaluate to 'true' on first encounter
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12 src/include/efivar/efivar-dp.h | 5 +++++
13 1 file changed, 5 insertions(+)
14
15diff --git a/src/include/efivar/efivar-dp.h b/src/include/efivar/efivar-dp.h
16index 3a509b7..c140e8d 100644
17--- a/src/include/efivar/efivar-dp.h
18+++ b/src/include/efivar/efivar-dp.h
19@@ -783,9 +783,14 @@ extern int efidp_append_instance(const_efidp dp, const_efidp dpi, efidp *out);
20 * though older or other compilers might just ignore that attribute if they
21 * don't support it. Ugh.
22 */
23+#pragma GCC diagnostic push
24 #if defined(__GNUC__) && __GNUC__ >= 6
25 #pragma GCC diagnostic ignored "-Wnonnull-compare"
26 #endif
27+#if defined(__clang__)
28+#pragma GCC diagnostic ignored "-Wunknown-attributes"
29+#pragma GCC diagnostic ignored "-Wpointer-bool-conversion"
30+#endif
31
32 static inline int16_t
33 __attribute__((__artificial__))
diff --git a/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch b/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch
deleted file mode 100644
index 2a6eb065f3..0000000000
--- a/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From dd4291265b7b3d7d7ffa1d8adf32781ae25dbfeb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 15 Jul 2017 00:29:42 -0700
4Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros
5
6not available on musl
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10---
11 src/makeguids.c | 8 ++++----
12 1 file changed, 4 insertions(+), 4 deletions(-)
13
14diff --git a/src/makeguids.c b/src/makeguids.c
15index da2f5f7..daf821a 100644
16--- a/src/makeguids.c
17+++ b/src/makeguids.c
18@@ -155,13 +155,13 @@ main(int argc, char *argv[])
19 #if BYTE_ORDER == BIG_ENDIAN\n\
20 #define cpu_to_be32(n) (n)\n\
21 #define cpu_to_be16(n) (n)\n\
22-#define cpu_to_le32(n) (__bswap_constant_32(n))\n\
23-#define cpu_to_le16(n) (__bswap_constant_16(n))\n\
24+#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\
25+#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\
26 #else\n\
27 #define cpu_to_le32(n) (n)\n\
28 #define cpu_to_le16(n) (n)\n\
29-#define cpu_to_be32(n) (__bswap_constant_32(n))\n\
30-#define cpu_to_be16(n) (__bswap_constant_16(n))\n\
31+#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\
32+#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\
33 #endif\n\
34 """);
35
diff --git a/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch b/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch
deleted file mode 100644
index 83105fe0d1..0000000000
--- a/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From dea4a55714249b2734a36701120fd22c91c64ec2 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 7 May 2016 02:06:47 -0400
4Subject: [PATCH] Makefile: fix efivar.pc not found
5
6It fixes efivar.pc not found:
7...
8| install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/
9| install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/
10; install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/
11;
12| install: cannot stat 'efivar.pc': No such file or directory
13| install: cannot stat 'efiboot.pc': No such file or directory
14| make[1]: *** [install] Error 1
15| make[1]: Leaving directory `efivar/0.23-r0/git/src'
16| make: *** [install] Error 2
17| ERROR: oe_runmake failed
18...
19
20Upstream-Status: Pending
21
22Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
23
24---
25 src/Makefile | 4 +++-
26 1 file changed, 3 insertions(+), 1 deletion(-)
27
28diff --git a/src/Makefile b/src/Makefile
29index dcc7fc8..691aa8a 100644
30--- a/src/Makefile
31+++ b/src/Makefile
32@@ -94,7 +94,9 @@ install : all
33 ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x) ;\
34 )
35 $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR)
36- $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;)
37+ $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(TOPDIR)/src/$(x).in $(DESTDIR)$(PCDIR)/$(x) ;\
38+ sed -i -e "s:@@LIBDIR@@:$(libdir):g" -e "s:@@VERSION@@:$(VERSION):g" \
39+ $(DESTDIR)$(PCDIR)/$(x); )
40 $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar
41 $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(includedir)/efivar/$(notdir $(x));)
42 $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
diff --git a/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch b/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch
index f88af1fe17..043b07a655 100644
--- a/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch
+++ b/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch
@@ -1,6 +1,6 @@
1From c801dcb03d42eb533a9bead0b397d7ce4fc5a6fe Mon Sep 17 00:00:00 2001 1From c10368b397483a2fc7b493c099d8416d902f8cd8 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 10 Aug 2016 17:49:50 +0800 3Date: Tue, 31 Jul 2018 14:18:35 +0800
4Subject: [PATCH] allow multi definitions for native 4Subject: [PATCH] allow multi definitions for native
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
@@ -14,12 +14,13 @@ Add link option '-z muldefs' to fix it.
14 14
15Signed-off-by: Kai Kang <kai.kang@windriver.com> 15Signed-off-by: Kai Kang <kai.kang@windriver.com>
16 16
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17--- 18---
18 Make.rules | 1 + 19 Make.rules | 1 +
19 1 file changed, 1 insertion(+) 20 1 file changed, 1 insertion(+)
20 21
21diff --git a/Make.rules b/Make.rules 22diff --git a/Make.rules b/Make.rules
22index 88b9aa7..799332f 100644 23index 042585b..257ba45 100644
23--- a/Make.rules 24--- a/Make.rules
24+++ b/Make.rules 25+++ b/Make.rules
25@@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version 26@@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version
@@ -28,5 +29,8 @@ index 88b9aa7..799332f 100644
28 -Wl,--version-script=$(MAP) \ 29 -Wl,--version-script=$(MAP) \
29+ -Wl,-z,muldefs \ 30+ -Wl,-z,muldefs \
30 -o $@ $^ $(LDLIBS) 31 -o $@ $^ $(LDLIBS)
32 ln -vfs $@ $@.1
31 33
32 %.abixml : %.so 34--
352.7.4
36
diff --git a/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch b/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch
deleted file mode 100644
index 5864ac63e4..0000000000
--- a/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 8000b9afc858472912aace985004b44f8eb467e0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 18 Aug 2017 09:49:49 -0700
4Subject: [PATCH] support musl
5
6Upstream-Status: Pending
7---
8 src/linux.c | 4 ++++
9 1 file changed, 4 insertions(+)
10
11diff --git a/src/linux.c b/src/linux.c
12index 34ed479..1304f2b 100644
13--- a/src/linux.c
14+++ b/src/linux.c
15@@ -40,6 +40,10 @@
16 #include <efivar.h>
17 #include <efiboot.h>
18
19+#if !defined(__GLIBC__)
20+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s)
21+#endif
22+
23 #include "dp.h"
24 #include "linux.h"
25 #include "util.h"
diff --git a/meta-oe/recipes-bsp/efivar/efivar_0.31.bb b/meta-oe/recipes-bsp/efivar/efivar_0.36.bb
index 9d4cdc97be..dfb46c2941 100644
--- a/meta-oe/recipes-bsp/efivar/efivar_0.31.bb
+++ b/meta-oe/recipes-bsp/efivar/efivar_0.36.bb
@@ -12,15 +12,11 @@ inherit pkgconfig
12 12
13COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" 13COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
14 14
15SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" 15SRCREV = "ef3449223ecd1e7b1098c523d66b2f960fe839ea"
16SRC_URI = "git://github.com/rhinstaller/efivar.git \ 16SRC_URI = "git://github.com/rhinstaller/efivar.git \
17 file://allow-multi-definitions-for-native.patch \ 17 file://allow-multi-definitions-for-native.patch \
18 file://0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch \
19 file://musl-strndupa.patch \
20 file://0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch \
21 " 18 "
22SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ 19SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \
23 file://0003-efivar-fix-for-cross-compile.patch \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ 20 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \
25 " 21 "
26SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.patch \ 22SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.patch \
@@ -28,15 +24,12 @@ SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.pat
28 24
29S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
30 26
31# Setting CROSS_COMPILE breaks pkgconfig, so just set AR
32EXTRA_OEMAKE = "AR=${TARGET_PREFIX}gcc-ar"
33
34do_compile_prepend() { 27do_compile_prepend() {
35 sed -i -e s:-Werror::g ${S}/gcc.specs 28 sed -i -e s:-Werror::g ${S}/gcc.specs
36} 29}
37 30
38do_compile_class-native() { 31do_compile_class-native() {
39 oe_runmake -C src makeguids 32 oe_runmake -C src makeguids CC_FOR_BUILD=${BUILD_CC}
40} 33}
41 34
42do_install() { 35do_install() {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-28 07:56:15 +0000