Skip to contentSkip to conversation

gnu-efi: new package

PATCH Superseded Christophe Vu-Brugier 2 participants 5 messages Feb 1, 2014

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 gnu-efi: new package

From: Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2
- Apply patches from Yocto to fix silent make failures

---
 package/Config.in                                  |  1 +
 package/gnu-efi/Config.in                          | 21 +++++++++
 .../gnu-efi/gnu-efi-01-use-override-cflags.patch   | 53 ++++++++++++++++++++++
 .../gnu-efi-02-parallel-make-archives.patch        | 48 ++++++++++++++++++++
 package/gnu-efi/gnu-efi-03-parallel-make.patch     | 22 +++++++++
 package/gnu-efi/gnu-efi.mk                         | 44 ++++++++++++++++++
 6 files changed, 189 insertions(+)
 create mode 100644 package/gnu-efi/Config.in
 create mode 100644 package/gnu-efi/gnu-efi-01-use-override-cflags.patch
 create mode 100644 package/gnu-efi/gnu-efi-02-parallel-make-archives.patch
 create mode 100644 package/gnu-efi/gnu-efi-03-parallel-make.patch
 create mode 100644 package/gnu-efi/gnu-efi.mk
package/Config.in +1 -0
index 631d8b2..618bfa1 100644
@@ -569,6 +569,7 @@ endmenu
 menu "Hardware handling"
 source "package/ccid/Config.in"
 source "package/dtc/Config.in"
+source "package/gnu-efi/Config.in"
 source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
 source "package/libatasmart/Config.in"
package/gnu-efi/Config.in new file +21 -0
new file mode 100644
index 0000000..a239d4b
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_GNU_EFI
+	bool "gnu-efi"
+	help
+	  Develop EFI applications for IA-64 (IPF), IA-32 (x86), and
+	  x86_64 platforms using the GNU toolchain and the EFI
+	  development environment.
+
+	  http://gnu-efi.sourceforge.net/
+
+if BR2_PACKAGE_GNU_EFI
+
+# Packages using gnu-efi will select whether they want ia32 or
+# x86-64. If two different packages make different choices, the build
+# will error out.
+config BR2_PACKAGE_GNU_EFI_IA32
+	bool
+
+config BR2_PACKAGE_GNU_EFI_X64
+	bool
+
+endif # BR2_PACKAGE_GNU_EFI
package/gnu-efi/gnu-efi-01-use-override-cflags.patch new file +53 -0

53 lines not on this page · raw message

package/gnu-efi/gnu-efi-02-parallel-make-archives.patch new file +48 -0

48 lines not on this page · raw message

package/gnu-efi/gnu-efi-03-parallel-make.patch new file +22 -0
new file mode 100644
index 0000000..27c94e8
@@ -0,0 +1,22 @@
+Fix parallel make failure
+
+Upstream-Status: Submitted [Maintainer directly]
+
+Add a missing dependency which resulted in a race leading to failure
+on larger values of -j.
+
+Signed-off-by: Darren Hart <[email protected]>
+
+Index: gnu-efi-3.0/Makefile
+===================================================================
+--- gnu-efi-3.0.orig/Makefile
++++ gnu-efi-3.0/Makefile
+@@ -42,6 +42,8 @@ include $(SRCDIR)/Make.defaults
+ 
+ SUBDIRS = lib gnuefi inc apps
+ 
++gnuefi: lib
++
+ all:	check_gcc $(SUBDIRS)
+ 
+ $(SUBDIRS):
package/gnu-efi/gnu-efi.mk new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
1.9.rc1
#1 lore raw

PATCH v2 2/2 gummiboot: new package

From: Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- bump version: 38 -> 43
- remove options not supported by ./configure: --disable-shared --enable-static
- add --disable-manpages to configure
- fix typo: s/GUMMIBOOT_IMG_ARCH/GUMMIBOOT_IMGARCH/

---
 boot/Config.in                |  1 +
 boot/gummiboot/Config.in      | 46 +++++++++++++++++++++++++++++++++++++++++++
 boot/gummiboot/buildroot.conf |  4 ++++
 boot/gummiboot/gummiboot.mk   | 44 +++++++++++++++++++++++++++++++++++++++++
 boot/gummiboot/loader.conf    |  2 ++
 5 files changed, 97 insertions(+)
 create mode 100644 boot/gummiboot/Config.in
 create mode 100644 boot/gummiboot/buildroot.conf
 create mode 100644 boot/gummiboot/gummiboot.mk
 create mode 100644 boot/gummiboot/loader.conf
boot/Config.in +1 -0
index d23c761..3094be1 100644
@@ -6,6 +6,7 @@ source "boot/at91dataflashboot/Config.in"
 source "boot/barebox/Config.in"
 source "boot/boot-wrapper-aarch64/Config.in"
 source "boot/grub/Config.in"
+source "boot/gummiboot/Config.in"
 source "boot/lpc32xxcdl/Config.in"
 source "boot/mxs-bootlets/Config.in"
 source "boot/syslinux/Config.in"
boot/gummiboot/Config.in new file +46 -0

46 lines not on this page · raw message

boot/gummiboot/buildroot.conf new file +4 -0
new file mode 100644
index 0000000..8a6f02e
@@ -0,0 +1,4 @@
+title	Buildroot
+version	1
+linux	/bzImage
+options	console=ttyS0 root=/dev/sda2
boot/gummiboot/gummiboot.mk new file +44 -0

44 lines not on this page · raw message

boot/gummiboot/loader.conf new file +2 -0
new file mode 100644
index 0000000..93b77b8
@@ -0,0 +1,2 @@
+timeout 3
+default buildroot
Signature · 1 line
1.9.rc1
#2 lore raw

PATCH v2 2/2 gummiboot: new package

Christophe, Thomas, All,

On 2014-02-01 13:31 +0100, Christophe Vu-Brugier spake thusly:

Quoted 4 lines

From: Thomas Petazzoni <[email protected]>

[--SNIP--]

boot/gummiboot/Config.in line 5

Quoted 11 lines
boot/gummiboot/Config.in new file +5 -0
new file mode 100644
index 0000000..ad04cec
@@ -0,0 +1,46 @@
+config BR2_TARGET_GUMMIBOOT
+	bool "gummiboot"
+	select BR2_PACKAGE_GNU_EFI
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID

Probablt this should also depends on BR2_i386 || BR2_x86_64, I guess...

Quoted 12 lines
boot/gummiboot/Config.in new file +12 -0
+	help
+	  gummiboot is a simple UEFI boot manager which executes
+	  configured EFI images. The default entry is selected by a
+	  configured pattern (glob) or an on-screen menu.
+
+	  gummiboot operates on the EFI System Partition (ESP)
+	  only. Configuration file fragments, kernels, initrds, other
+	  EFI images need to reside on the ESP. Linux kernels need to
+	  be built with CONFIG_EFI_STUB to be able to be directly
+	  executed as an EFI image.
+
+	  See the Grub2 help text for details on preparing an EFI

boot/gummiboot/Config.in line 27

Quoted 10 lines
boot/gummiboot/Config.in new file +10 -0
+	  capable disk image using Gummiboot: the instructions are
+	  exactly the same, except that the Gummiboot configuration
+	  files will be located in /loader/ inside the EFI partition.
+
+	  http://freedesktop.org/wiki/Software/gummiboot/
+
+if BR2_TARGET_GUMMIBOOT
+
+choice
+	prompt "Target"

... otherwise this choice would have no entry in case a non-x86 architecture is slected:

Quoted 8 lines
boot/gummiboot/Config.in new file +8 -0
+config BR2_TARGET_GUMMIBOOT_I386
+	bool "i386"
+	select BR2_PACKAGE_GNU_EFI_IA32
+	# We unfortunately can't easily build gummiboot 32 bits when
+	# the selected target architecture is x86-64
+	depends on BR2_i386
+
+comment "32 bits gummiboot is only available for i386"

boot/gummiboot/Config.in line 46

Quoted 10 lines
boot/gummiboot/Config.in new file +10 -0
+	depends on BR2_x86_64
+
+config BR2_TARGET_GUMMIBOOT_X86_64
+	bool "x86-64"
+	select BR2_PACKAGE_GNU_EFI_X64
+	depends on BR2_x86_64
+
+endchoice
+
+endif # BR2_TARGET_GUMMIBOOT

[--SNIP--]

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH v2 2/2 gummiboot: new package

Dear Yann Morin,

Quoted 8 lines · Yann E. MORIN

boot/gummiboot/Config.in line 5

Quoted 5 lines
boot/gummiboot/Config.in new file +5 -0
+config BR2_TARGET_GUMMIBOOT
+	bool "gummiboot"
+	select BR2_PACKAGE_GNU_EFI
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID

Probably this should also depends on BR2_i386 || BR2_x86_64, I guess...

Yes, thanks for noticing this. I assume gnu-efi should depends on BR2_i386 || BR2_x86_64 as well. Right?

Best regards,

Signature · 1 line
Christophe Vu-Brugier
#4 lore raw

PATCH v2 2/2 gummiboot: new package

Christophe, All,

On 2014-02-01 17:06 +0100, Christophe Vu-Brugier spake thusly:

Quoted 12 lines

Dear Yann Morin,

Quoted 8 lines · Yann E. MORIN

boot/gummiboot/Config.in line 5

Quoted 5 lines
boot/gummiboot/Config.in new file +5 -0
+config BR2_TARGET_GUMMIBOOT
+	bool "gummiboot"
+	select BR2_PACKAGE_GNU_EFI
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID

Probably this should also depends on BR2_i386 || BR2_x86_64, I guess...

Quoted 2 lines

Yes, thanks for noticing this. I assume gnu-efi should depends on BR2_i386 || BR2_x86_64 as well. Right?

Yes, I guess so. ;-)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'