diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-bsp/gummiboot')
3 files changed, 156 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch b/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch new file mode 100644 index 000000000..fa50bc4a6 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch @@ -0,0 +1,74 @@ +From 55957faf1272c8f5f304909faeebf647a78e3701 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 9 Sep 2015 07:19:45 +0000 +Subject: [PATCH] console: Fix C syntax errors for function declaration + +To address this, the semicolons after the function parameters should be +replaced by commas, and the last one should be omitted + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/efi/console.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/efi/console.c b/src/efi/console.c +index 6206c80..66aa88f 100644 +--- a/src/efi/console.c ++++ b/src/efi/console.c +@@ -27,8 +27,8 @@ + struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; + + typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- BOOLEAN ExtendedVerification; ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ BOOLEAN ExtendedVerification + ); + + typedef UINT8 EFI_KEY_TOGGLE_STATE; +@@ -44,29 +44,29 @@ typedef struct { + } EFI_KEY_DATA; + + typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_DATA *KeyData; ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ EFI_KEY_DATA *KeyData + ); + + typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_TOGGLE_STATE *KeyToggleState; ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ EFI_KEY_TOGGLE_STATE *KeyToggleState + ); + + typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)( +- EFI_KEY_DATA *KeyData; ++ EFI_KEY_DATA *KeyData + ); + + typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_DATA KeyData; +- EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction; +- VOID **NotifyHandle; ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ EFI_KEY_DATA KeyData, ++ EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction, ++ VOID **NotifyHandle + ); + + typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- VOID *NotificationHandle; ++ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, ++ VOID *NotificationHandle + ); + + typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { +-- +2.5.1 + diff --git a/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch b/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch new file mode 100644 index 000000000..49f55930d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch @@ -0,0 +1,45 @@ +From 0f7f9e3bb1d0e1b93f3ad8a1d5d7bdd3fbf27494 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 27 Mar 2014 07:20:33 +0000 +Subject: [PATCH] Makefile.am: use objcopy from the env + +It uses the "objcopy" directly, which is not suitable for cross compile. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -19,6 +19,8 @@ + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + AM_MAKEFLAGS = --no-print-directory + ++OBJCOPY ?= objcopy ++ + gummibootlibdir = $(prefix)/lib/gummiboot + + AM_CPPFLAGS = -include config.h +@@ -148,7 +150,7 @@ $(gummiboot_solib): $(gummiboot_objects) + .DELETE_ON_ERROR: $(gummboot_solib) + + $(gummiboot): $(gummiboot_solib) +- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \ ++ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ + -j .dynsym -j .rel -j .rela -j .reloc \ + --target=efi-app-$(ARCH) $< $@ + +@@ -183,7 +185,7 @@ $(stub_solib): $(stub_objects) + .DELETE_ON_ERROR: $(gummboot_solib) + + $(stub): $(stub_solib) +- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \ ++ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ + -j .dynsym -j .rel -j .rela -j .reloc \ + --target=efi-app-$(ARCH) $< $@ + diff --git a/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot_git.bb b/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot_git.bb new file mode 100644 index 000000000..376ab542d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-bsp/gummiboot/gummiboot_git.bb @@ -0,0 +1,37 @@ +SUMMARY = "Gummiboot is a simple UEFI boot manager which executes configured EFI images." +HOMEPAGE = "http://freedesktop.org/wiki/Software/gummiboot" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "gnu-efi util-linux" + +inherit autotools pkgconfig +inherit deploy + +PV = "48+git${SRCPV}" +SRCREV = "2bcd919c681c952eb867ef1bdb458f1bc49c2d55" +SRC_URI = "git://anongit.freedesktop.org/gummiboot \ + file://fix-objcopy.patch \ + file://0001-console-Fix-C-syntax-errors-for-function-declaration.patch \ + " + +# Note: Add COMPATIBLE_HOST here is only because it depends on gnu-efi +# which has set the COMPATIBLE_HOST, the gummiboot itself may work on +# more hosts. +COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" + +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--disable-manpages --with-efi-includedir=${STAGING_INCDIR} \ + --with-efi-ldsdir=${STAGING_LIBDIR} \ + --with-efi-libdir=${STAGING_LIBDIR}" + +EXTRA_OEMAKE += "gummibootlibdir=${libdir}/gummiboot" + +TUNE_CCARGS_remove = "-mfpmath=sse" + +do_deploy () { + install ${B}/gummiboot*.efi ${DEPLOYDIR} +} +addtask deploy before do_build after do_compile |
