summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-11-23 17:00:31 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:11 +0000
commita250452f5625ea0885f0983e61c1f64bcde55b98 (patch)
tree6b4b6362d8c331add4a279be60428e99998ee06f
parent81021bc0aa0f64e67535f6a9551e921a64fe4395 (diff)
downloadpoky-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
-rw-r--r--meta/classes/gummiboot.bbclass121
-rw-r--r--meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch74
-rw-r--r--meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch45
-rw-r--r--meta/recipes-bsp/gummiboot/gummiboot_git.bb39
-rw-r--r--scripts/lib/wic/canned-wks/mkgummidisk.wks11
5 files changed, 0 insertions, 290 deletions
diff --git a/meta/classes/gummiboot.bbclass b/meta/classes/gummiboot.bbclass
deleted file mode 100644
index 5aaf766ef4..0000000000
--- a/meta/classes/gummiboot.bbclass
+++ /dev/null
@@ -1,121 +0,0 @@
1# Copyright (C) 2014 Intel Corporation
2#
3# Released under the MIT license (see COPYING.MIT)
4
5# gummiboot.bbclass - equivalent of grub-efi.bbclass
6# Set EFI_PROVIDER = "gummiboot" to use gummiboot on your live images instead of grub-efi
7# (images built by image-live.bbclass or image-vm.bbclass)
8
9do_bootimg[depends] += "${MLPREFIX}gummiboot:do_deploy"
10do_bootdirectdisk[depends] += "${MLPREFIX}gummiboot:do_deploy"
11
12EFIDIR = "/EFI/BOOT"
13
14GUMMIBOOT_CFG ?= "${S}/loader.conf"
15GUMMIBOOT_ENTRIES ?= ""
16GUMMIBOOT_TIMEOUT ?= "10"
17
18# Need UUID utility code.
19inherit fs-uuid
20
21efi_populate() {
22 DEST=$1
23
24 EFI_IMAGE="gummibootia32.efi"
25 DEST_EFI_IMAGE="bootia32.efi"
26 if [ "${TARGET_ARCH}" = "x86_64" ]; then
27 EFI_IMAGE="gummibootx64.efi"
28 DEST_EFI_IMAGE="bootx64.efi"
29 fi
30
31 install -d ${DEST}${EFIDIR}
32 # gummiboot requires these paths for configuration files
33 # they are not customizable so no point in new vars
34 install -d ${DEST}/loader
35 install -d ${DEST}/loader/entries
36 install -m 0644 ${DEPLOY_DIR_IMAGE}/${EFI_IMAGE} ${DEST}${EFIDIR}/${DEST_EFI_IMAGE}
37 EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
38 printf 'fs0:%s\%s\n' "$EFIPATH" "$DEST_EFI_IMAGE" >${DEST}/startup.nsh
39 install -m 0644 ${GUMMIBOOT_CFG} ${DEST}/loader/loader.conf
40 for i in ${GUMMIBOOT_ENTRIES}; do
41 install -m 0644 ${i} ${DEST}/loader/entries
42 done
43}
44
45efi_iso_populate() {
46 iso_dir=$1
47 efi_populate $iso_dir
48 mkdir -p ${EFIIMGDIR}/${EFIDIR}
49 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
50 cp $iso_dir/vmlinuz ${EFIIMGDIR}
51 EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
52 echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh
53 if [ -f "$iso_dir/initrd" ] ; then
54 cp $iso_dir/initrd ${EFIIMGDIR}
55 fi
56}
57
58efi_hddimg_populate() {
59 efi_populate $1
60}
61
62python build_efi_cfg() {
63 s = d.getVar("S")
64 labels = d.getVar('LABELS')
65 if not labels:
66 bb.debug(1, "LABELS not defined, nothing to do")
67 return
68
69 if labels == []:
70 bb.debug(1, "No labels, nothing to do")
71 return
72
73 cfile = d.getVar('GUMMIBOOT_CFG')
74 try:
75 cfgfile = open(cfile, 'w')
76 except OSError:
77 bb.fatal('Unable to open %s' % cfile)
78
79 cfgfile.write('# Automatically created by OE\n')
80 cfgfile.write('default %s\n' % (labels.split()[0]))
81 timeout = d.getVar('GUMMIBOOT_TIMEOUT')
82 if timeout:
83 cfgfile.write('timeout %s\n' % timeout)
84 else:
85 cfgfile.write('timeout 10\n')
86 cfgfile.close()
87
88 for label in labels.split():
89 localdata = d.createCopy()
90
91 overrides = localdata.getVar('OVERRIDES')
92 if not overrides:
93 bb.fatal('OVERRIDES not defined')
94
95 entryfile = "%s/%s.conf" % (s, label)
96 d.appendVar("GUMMIBOOT_ENTRIES", " " + entryfile)
97 try:
98 entrycfg = open(entryfile, "w")
99 except OSError:
100 bb.fatal('Unable to open %s' % entryfile)
101 localdata.setVar('OVERRIDES', label + ':' + overrides)
102 bb.data.update_data(localdata)
103
104 entrycfg.write('title %s\n' % label)
105 entrycfg.write('linux /vmlinuz\n')
106
107 append = localdata.getVar('APPEND')
108 initrd = localdata.getVar('INITRD')
109
110 if initrd:
111 entrycfg.write('initrd /initrd\n')
112 lb = label
113 if label == "install":
114 lb = "install-efi"
115 entrycfg.write('options LABEL=%s ' % lb)
116 if append:
117 append = replace_rootfs_uuid(d, append)
118 entrycfg.write('%s' % append)
119 entrycfg.write('\n')
120 entrycfg.close()
121}
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 @@
1From 55957faf1272c8f5f304909faeebf647a78e3701 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Sep 2015 07:19:45 +0000
4Subject: [PATCH] console: Fix C syntax errors for function declaration
5
6To address this, the semicolons after the function parameters should be
7replaced by commas, and the last one should be omitted
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 src/efi/console.c | 26 +++++++++++++-------------
14 1 file changed, 13 insertions(+), 13 deletions(-)
15
16diff --git a/src/efi/console.c b/src/efi/console.c
17index 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--
732.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 @@
1From 0f7f9e3bb1d0e1b93f3ad8a1d5d7bdd3fbf27494 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 27 Mar 2014 07:20:33 +0000
4Subject: [PATCH] Makefile.am: use objcopy from the env
5
6It uses the "objcopy" directly, which is not suitable for cross compile.
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 Makefile.am | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15Index: 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 @@
1SUMMARY = "Gummiboot is a simple UEFI boot manager which executes configured EFI images."
2HOMEPAGE = "http://freedesktop.org/wiki/Software/gummiboot"
3
4LICENSE = "LGPLv2.1"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
6
7DEPENDS = "gnu-efi util-linux"
8
9inherit autotools pkgconfig manpages
10inherit deploy
11
12PV = "48+git${SRCPV}"
13SRCREV = "2bcd919c681c952eb867ef1bdb458f1bc49c2d55"
14SRC_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
19PACKAGECONFIG[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.
24COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
25
26S = "${WORKDIR}/git"
27
28EXTRA_OECONF = "--with-efi-includedir=${STAGING_INCDIR} \
29 --with-efi-ldsdir=${STAGING_LIBDIR} \
30 --with-efi-libdir=${STAGING_LIBDIR}"
31
32EXTRA_OEMAKE += "gummibootlibdir=${libdir}/gummiboot"
33
34TUNE_CCARGS_remove = "-mfpmath=sse"
35
36do_deploy () {
37 install ${B}/gummiboot*.efi ${DEPLOYDIR}
38}
39addtask deploy before do_build after do_compile
diff --git a/scripts/lib/wic/canned-wks/mkgummidisk.wks b/scripts/lib/wic/canned-wks/mkgummidisk.wks
deleted file mode 100644
index f3ae090998..0000000000
--- a/scripts/lib/wic/canned-wks/mkgummidisk.wks
+++ /dev/null
@@ -1,11 +0,0 @@
1# short-description: Create an EFI disk image
2# long-description: Creates a partitioned EFI disk image that the user
3# can directly dd to boot media.
4
5part /boot --source bootimg-efi --sourceparams="loader=gummiboot" --ondisk sda --label msdos --active --align 1024
6
7part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024
8
9part swap --ondisk sda --size 44 --label swap1 --fstype=swap
10
11bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 21:18:32 +0000