mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
efivar: 0.31 -> 0.36
- Drop obsolete patches 0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch musl-strndupa.patch 0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch 0003-efivar-fix-for-cross-compile.patch Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
Khem Raj
parent
c45b619df0
commit
9beba98f5e
@ -1,33 +0,0 @@
|
||||
From d65c325dd8681edf2ee3332eeb0a547229c7ffb5 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
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__))
|
||||
@ -1,35 +0,0 @@
|
||||
From dd4291265b7b3d7d7ffa1d8adf32781ae25dbfeb Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
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\
|
||||
""");
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From dea4a55714249b2734a36701120fd22c91c64ec2 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
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 <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
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)
|
||||
@ -1,6 +1,6 @@
|
||||
From c801dcb03d42eb533a9bead0b397d7ce4fc5a6fe Mon Sep 17 00:00:00 2001
|
||||
From: Kai Kang <kai.kang@windriver.com>
|
||||
Date: Wed, 10 Aug 2016 17:49:50 +0800
|
||||
From c10368b397483a2fc7b493c099d8416d902f8cd8 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
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 <kai.kang@windriver.com>
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 8000b9afc858472912aace985004b44f8eb467e0 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <efivar.h>
|
||||
#include <efiboot.h>
|
||||
|
||||
+#if !defined(__GLIBC__)
|
||||
+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s)
|
||||
+#endif
|
||||
+
|
||||
#include "dp.h"
|
||||
#include "linux.h"
|
||||
#include "util.h"
|
||||
@ -12,15 +12,11 @@ inherit pkgconfig
|
||||
|
||||
COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
|
||||
|
||||
SRCREV = "11324799c68193116e1dd5f94b416591bd324f90"
|
||||
SRCREV = "ef3449223ecd1e7b1098c523d66b2f960fe839ea"
|
||||
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 \
|
||||
@ -28,15 +24,12 @@ SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.pat
|
||||
|
||||
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
|
||||
oe_runmake -C src makeguids CC_FOR_BUILD=${BUILD_CC}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
Loading…
x
Reference in New Issue
Block a user