diff options
| author | Adrian Bunk <bunk@stusta.de> | 2019-06-19 20:50:12 +0300 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-06-19 19:59:15 -0700 |
| commit | d8bbcf5689603194bb7aeb538ec4a696018cfcae (patch) | |
| tree | 76a812d00dfd2bef410365dccfa73ce6bd24a914 /meta-oe/recipes-bsp | |
| parent | 59277eadd8571c7dcd7d0d6b53e5b06694295ed2 (diff) | |
| download | meta-openembedded-d8bbcf5689603194bb7aeb538ec4a696018cfcae.tar.gz | |
efivar: Remove, was moved to oe-core
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-bsp')
4 files changed, 0 insertions, 146 deletions
diff --git a/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch b/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch deleted file mode 100644 index 251e50c902..0000000000 --- a/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From a9115d9e6f0f62d6bb735ce3698858d1f89f8d73 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Kai Kang <kai.kang@windriver.com> | ||
| 3 | Date: Fri, 25 Sep 2015 18:14:31 +0800 | ||
| 4 | Subject: [PATCH] efivar: fix for cross compile | ||
| 5 | |||
| 6 | It builds and calls elf file makeguids to generate a header file which | ||
| 7 | doesn't work for cross compile. Fix it. | ||
| 8 | |||
| 9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 13 | |||
| 14 | --- | ||
| 15 | src/Makefile | 4 ++-- | ||
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/src/Makefile b/src/Makefile | ||
| 19 | index 0c16597..dcc7fc8 100644 | ||
| 20 | --- a/src/Makefile | ||
| 21 | +++ b/src/Makefile | ||
| 22 | @@ -40,8 +40,8 @@ abicheck : $(patsubst %.so,%.abicheck,$(LIBTARGETS)) | ||
| 23 | ./guid-symbols.c : include/efivar/efivar-guids.h | ||
| 24 | ./guids.bin : include/efivar/efivar-guids.h | ||
| 25 | ./names.bin : include/efivar/efivar-guids.h | ||
| 26 | -include/efivar/efivar-guids.h : makeguids guids.txt | ||
| 27 | - ./makeguids guids.txt guids.bin names.bin \ | ||
| 28 | +include/efivar/efivar-guids.h : guids.txt | ||
| 29 | + makeguids guids.txt guids.bin names.bin \ | ||
| 30 | guid-symbols.c include/efivar/efivar-guids.h | ||
| 31 | |||
| 32 | makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT | ||
diff --git a/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch b/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch deleted file mode 100644 index 96d0c6b3b2..0000000000 --- a/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From b3d35e7dd27a755df5acbe050837885914dbb28b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Tue, 10 May 2016 11:34:50 -0400 | ||
| 4 | Subject: [PATCH] fix unknow option for gold linker | ||
| 5 | |||
| 6 | - Revert the following patch, since oe-core work with gcc 5 | ||
| 7 | ... | ||
| 8 | commit 3055a3797f16693dfdd855fa68bc57fd900dc408 | ||
| 9 | Author: Peter Jones <pjones@redhat.com> | ||
| 10 | Date: Mon Feb 15 14:15:40 2016 -0500 | ||
| 11 | |||
| 12 | Make gcc.specs work with gcc 6 / binutils 2.26 | ||
| 13 | |||
| 14 | Apparently binutils 2.26 gets real picky about "ld -PIC" vs "ld -fPIC". | ||
| 15 | |||
| 16 | Signed-off-by: Peter Jones <pjones@redhat.com> | ||
| 17 | ... | ||
| 18 | |||
| 19 | - Remove unknown option '--add-needed' | ||
| 20 | |||
| 21 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 22 | --- | ||
| 23 | gcc.specs | 2 +- | ||
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 25 | |||
| 26 | Index: git/gcc.specs | ||
| 27 | =================================================================== | ||
| 28 | --- git.orig/gcc.specs | ||
| 29 | +++ git/gcc.specs | ||
| 30 | @@ -14,4 +14,4 @@ | ||
| 31 | + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} | ||
| 32 | |||
| 33 | *link: | ||
| 34 | -+ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} | ||
| 35 | ++ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} | ||
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 deleted file mode 100644 index 043b07a655..0000000000 --- a/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From c10368b397483a2fc7b493c099d8416d902f8cd8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Tue, 31 Jul 2018 14:18:35 +0800 | ||
| 4 | Subject: [PATCH] allow multi definitions for native | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | It fails to create .so file when build efivar-native: | ||
| 9 | |||
| 10 | | lib.o:(*IND*+0x0): multiple definition of `efi_set_variable' | ||
| 11 | | lib.o:lib.c:(.text+0xa0): first defined here | ||
| 12 | |||
| 13 | Add link option '-z muldefs' to fix it. | ||
| 14 | |||
| 15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 16 | |||
| 17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 18 | --- | ||
| 19 | Make.rules | 1 + | ||
| 20 | 1 file changed, 1 insertion(+) | ||
| 21 | |||
| 22 | diff --git a/Make.rules b/Make.rules | ||
| 23 | index 042585b..257ba45 100644 | ||
| 24 | --- a/Make.rules | ||
| 25 | +++ b/Make.rules | ||
| 26 | @@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version | ||
| 27 | $(CCLD) $(ccldflags) $(CPPFLAGS) $(SOFLAGS) \ | ||
| 28 | -Wl,-soname,$@.1 \ | ||
| 29 | -Wl,--version-script=$(MAP) \ | ||
| 30 | + -Wl,-z,muldefs \ | ||
| 31 | -o $@ $^ $(LDLIBS) | ||
| 32 | ln -vfs $@ $@.1 | ||
| 33 | |||
| 34 | -- | ||
| 35 | 2.7.4 | ||
| 36 | |||
diff --git a/meta-oe/recipes-bsp/efivar/efivar_37.bb b/meta-oe/recipes-bsp/efivar/efivar_37.bb deleted file mode 100644 index 4b458dedd5..0000000000 --- a/meta-oe/recipes-bsp/efivar/efivar_37.bb +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | SUMMARY = "Tools to manipulate UEFI variables" | ||
| 2 | DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" | ||
| 3 | HOMEPAGE = "https://github.com/rhinstaller/efivar" | ||
| 4 | |||
| 5 | LICENSE = "LGPLv2.1" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" | ||
| 7 | |||
| 8 | DEPENDS = "popt" | ||
| 9 | DEPENDS_append_class-target = " efivar-native" | ||
| 10 | |||
| 11 | inherit pkgconfig | ||
| 12 | |||
| 13 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | ||
| 14 | |||
| 15 | SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" | ||
| 16 | SRC_URI = "git://github.com/rhinstaller/efivar.git \ | ||
| 17 | file://allow-multi-definitions-for-native.patch \ | ||
| 18 | " | ||
| 19 | SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ | ||
| 20 | ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ | ||
| 21 | " | ||
| 22 | |||
| 23 | S = "${WORKDIR}/git" | ||
| 24 | |||
| 25 | do_compile_prepend() { | ||
| 26 | sed -i -e s:-Werror::g ${S}/gcc.specs | ||
| 27 | } | ||
| 28 | |||
| 29 | do_compile_class-native() { | ||
| 30 | oe_runmake -C src makeguids CC_FOR_BUILD="${BUILD_CC}" | ||
| 31 | } | ||
| 32 | |||
| 33 | do_install() { | ||
| 34 | oe_runmake install DESTDIR=${D} | ||
| 35 | } | ||
| 36 | |||
| 37 | do_install_class-native() { | ||
| 38 | install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids | ||
| 39 | } | ||
| 40 | |||
| 41 | BBCLASSEXTEND = "native" | ||
| 42 | |||
| 43 | RRECOMMENDS_${PN}_class-target = "kernel-module-efivarfs" | ||
