diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-11-23 17:00:31 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-16 18:05:11 +0000 |
commit | a250452f5625ea0885f0983e61c1f64bcde55b98 (patch) | |
tree | 6b4b6362d8c331add4a279be60428e99998ee06f /meta/recipes-bsp | |
parent | 81021bc0aa0f64e67535f6a9551e921a64fe4395 (diff) | |
download | poky-a250452f5625ea0885f0983e61c1f64bcde55b98.tar.gz |
gummiboot: Remove old gummiboot recipe, related class and wks file
Since the gummiboot project is no longer being maintained
and we are using systemd-boot as a replacement instead,
we can now clean up all remaining gummiboot files.
[YOCTO #10332]
(From OE-Core rev: 65eb3f51b70baaf24de871301a7247d5baed00ed)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
3 files changed, 0 insertions, 158 deletions
diff --git a/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch b/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch deleted file mode 100644 index fa50bc4a6e..0000000000 --- a/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | From 55957faf1272c8f5f304909faeebf647a78e3701 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 9 Sep 2015 07:19:45 +0000 | ||
4 | Subject: [PATCH] console: Fix C syntax errors for function declaration | ||
5 | |||
6 | To address this, the semicolons after the function parameters should be | ||
7 | replaced by commas, and the last one should be omitted | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Upstream-Status: Pending | ||
12 | |||
13 | src/efi/console.c | 26 +++++++++++++------------- | ||
14 | 1 file changed, 13 insertions(+), 13 deletions(-) | ||
15 | |||
16 | diff --git a/src/efi/console.c b/src/efi/console.c | ||
17 | index 6206c80..66aa88f 100644 | ||
18 | --- a/src/efi/console.c | ||
19 | +++ b/src/efi/console.c | ||
20 | @@ -27,8 +27,8 @@ | ||
21 | struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; | ||
22 | |||
23 | typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)( | ||
24 | - struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; | ||
25 | - BOOLEAN ExtendedVerification; | ||
26 | + struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, | ||
27 | + BOOLEAN ExtendedVerification | ||
28 | ); | ||
29 | |||
30 | typedef UINT8 EFI_KEY_TOGGLE_STATE; | ||
31 | @@ -44,29 +44,29 @@ typedef struct { | ||
32 | } EFI_KEY_DATA; | ||
33 | |||
34 | typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)( | ||
35 | - struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; | ||
36 | - EFI_KEY_DATA *KeyData; | ||
37 | + struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, | ||
38 | + EFI_KEY_DATA *KeyData | ||
39 | ); | ||
40 | |||
41 | typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)( | ||
42 | - struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; | ||
43 | - EFI_KEY_TOGGLE_STATE *KeyToggleState; | ||
44 | + struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, | ||
45 | + EFI_KEY_TOGGLE_STATE *KeyToggleState | ||
46 | ); | ||
47 | |||
48 | typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)( | ||
49 | - EFI_KEY_DATA *KeyData; | ||
50 | + EFI_KEY_DATA *KeyData | ||
51 | ); | ||
52 | |||
53 | typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)( | ||
54 | - struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; | ||
55 | - EFI_KEY_DATA KeyData; | ||
56 | - EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction; | ||
57 | - VOID **NotifyHandle; | ||
58 | + struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, | ||
59 | + EFI_KEY_DATA KeyData, | ||
60 | + EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction, | ||
61 | + VOID **NotifyHandle | ||
62 | ); | ||
63 | |||
64 | typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)( | ||
65 | - struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; | ||
66 | - VOID *NotificationHandle; | ||
67 | + struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, | ||
68 | + VOID *NotificationHandle | ||
69 | ); | ||
70 | |||
71 | typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { | ||
72 | -- | ||
73 | 2.5.1 | ||
74 | |||
diff --git a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch b/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch deleted file mode 100644 index 49f55930df..0000000000 --- a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 0f7f9e3bb1d0e1b93f3ad8a1d5d7bdd3fbf27494 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 27 Mar 2014 07:20:33 +0000 | ||
4 | Subject: [PATCH] Makefile.am: use objcopy from the env | ||
5 | |||
6 | It uses the "objcopy" directly, which is not suitable for cross compile. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | --- | ||
12 | Makefile.am | 4 +++- | ||
13 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
14 | |||
15 | Index: git/Makefile.am | ||
16 | =================================================================== | ||
17 | --- git.orig/Makefile.am | ||
18 | +++ git/Makefile.am | ||
19 | @@ -19,6 +19,8 @@ | ||
20 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | ||
21 | AM_MAKEFLAGS = --no-print-directory | ||
22 | |||
23 | +OBJCOPY ?= objcopy | ||
24 | + | ||
25 | gummibootlibdir = $(prefix)/lib/gummiboot | ||
26 | |||
27 | AM_CPPFLAGS = -include config.h | ||
28 | @@ -148,7 +150,7 @@ $(gummiboot_solib): $(gummiboot_objects) | ||
29 | .DELETE_ON_ERROR: $(gummboot_solib) | ||
30 | |||
31 | $(gummiboot): $(gummiboot_solib) | ||
32 | - $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \ | ||
33 | + $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ | ||
34 | -j .dynsym -j .rel -j .rela -j .reloc \ | ||
35 | --target=efi-app-$(ARCH) $< $@ | ||
36 | |||
37 | @@ -183,7 +185,7 @@ $(stub_solib): $(stub_objects) | ||
38 | .DELETE_ON_ERROR: $(gummboot_solib) | ||
39 | |||
40 | $(stub): $(stub_solib) | ||
41 | - $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \ | ||
42 | + $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ | ||
43 | -j .dynsym -j .rel -j .rela -j .reloc \ | ||
44 | --target=efi-app-$(ARCH) $< $@ | ||
45 | |||
diff --git a/meta/recipes-bsp/gummiboot/gummiboot_git.bb b/meta/recipes-bsp/gummiboot/gummiboot_git.bb deleted file mode 100644 index c684b8348e..0000000000 --- a/meta/recipes-bsp/gummiboot/gummiboot_git.bb +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | SUMMARY = "Gummiboot is a simple UEFI boot manager which executes configured EFI images." | ||
2 | HOMEPAGE = "http://freedesktop.org/wiki/Software/gummiboot" | ||
3 | |||
4 | LICENSE = "LGPLv2.1" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" | ||
6 | |||
7 | DEPENDS = "gnu-efi util-linux" | ||
8 | |||
9 | inherit autotools pkgconfig manpages | ||
10 | inherit deploy | ||
11 | |||
12 | PV = "48+git${SRCPV}" | ||
13 | SRCREV = "2bcd919c681c952eb867ef1bdb458f1bc49c2d55" | ||
14 | SRC_URI = "git://anongit.freedesktop.org/gummiboot \ | ||
15 | file://fix-objcopy.patch \ | ||
16 | file://0001-console-Fix-C-syntax-errors-for-function-declaration.patch \ | ||
17 | " | ||
18 | |||
19 | PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" | ||
20 | |||
21 | # Note: Add COMPATIBLE_HOST here is only because it depends on gnu-efi | ||
22 | # which has set the COMPATIBLE_HOST, the gummiboot itself may work on | ||
23 | # more hosts. | ||
24 | COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" | ||
25 | |||
26 | S = "${WORKDIR}/git" | ||
27 | |||
28 | EXTRA_OECONF = "--with-efi-includedir=${STAGING_INCDIR} \ | ||
29 | --with-efi-ldsdir=${STAGING_LIBDIR} \ | ||
30 | --with-efi-libdir=${STAGING_LIBDIR}" | ||
31 | |||
32 | EXTRA_OEMAKE += "gummibootlibdir=${libdir}/gummiboot" | ||
33 | |||
34 | TUNE_CCARGS_remove = "-mfpmath=sse" | ||
35 | |||
36 | do_deploy () { | ||
37 | install ${B}/gummiboot*.efi ${DEPLOYDIR} | ||
38 | } | ||
39 | addtask deploy before do_build after do_compile | ||