diff options
author | 2015-07-23 16:00:53 +0800 | |
---|---|---|
committer | 2015-07-30 21:07:36 +0200 | |
commit | 35ae01ce6c126140439f271ee944efe69a184132 (patch) | |
tree | abc2005b80a935b1966f13339677ee9c95645012 /meta-oe/recipes-extended/efibootmgr/files | |
parent | 6f91b61c0755c954d7bdce680f1c9926238c1c66 (diff) | |
download | meta-openembedded-contrib-35ae01ce6c126140439f271ee944efe69a184132.tar.gz |
efibootmgr: add recipe
Add efibootmgr recipe from layer meta-linaro and upgrade from 0.5.4 to
0.6.0. efibootmgr is a linux user-space application to modify the EFI Boot
Manager which is useful for us to manage boot on EFI boards.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/efibootmgr/files')
3 files changed, 71 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch b/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch new file mode 100644 index 0000000000..f2dc83bbe1 --- /dev/null +++ b/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +Import this patch from meta-linaro. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +diff --git a/src/man/man8/efibootmgr.8.docbook b/src/man/man8/efibootmgr.8.docbook +index aef4444..eb8f266 100644 +--- a/src/man/man8/efibootmgr.8.docbook ++++ b/src/man/man8/efibootmgr.8.docbook +@@ -302,7 +302,7 @@ + <title>Displaying the current settings (must be root).</title> + + <para> +- <computeroutput> ++ <programlisting> + [root@localhost ~]# efibootmgr + BootCurrent: 0004 + BootNext: 0003 +@@ -313,7 +313,7 @@ + Boot0002* Hard Drive(Device:80)/HD(Part1,Sig00112233) + Boot0003* PXE Boot: MAC(00D0B7C15D91) + Boot0004* Linux +- </computeroutput> ++ </programlisting> + </para> + <para>This shows:</para> + <itemizedlist> diff --git a/meta-oe/recipes-extended/efibootmgr/files/ldflags.patch b/meta-oe/recipes-extended/efibootmgr/files/ldflags.patch new file mode 100644 index 0000000000..0d5594a311 --- /dev/null +++ b/meta-oe/recipes-extended/efibootmgr/files/ldflags.patch @@ -0,0 +1,17 @@ +Upstream-Status: Pending + +Import this patch from meta-linaro. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- efibootmgr-0.5.4.orig/Makefile ++++ efibootmgr-0.5.4/Makefile +@@ -11,6 +11,8 @@ + CFLAGS = $(EXTRA_CFLAGS) -DEFIBOOTMGR_VERSION=\"$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL)\" \ + -Wall -g -D_FILE_OFFSET_BITS=64 + ++ LDFLAGS += -lz ++ + MODULES := src + + BINDIR := /usr/sbin diff --git a/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch new file mode 100644 index 0000000000..58bd135564 --- /dev/null +++ b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +Import this patch from meta-linaro. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +Description: Fix -w option to leave an existing unique MBR signature intact + This makes the implementation match the documentation. +Author: Colin Watson <cjwatson@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1065261 +Forwarded: no +Last-Update: 2013-02-01 + +Index: b/src/lib/disk.c +=================================================================== +--- a/src/lib/disk.c ++++ b/src/lib/disk.c +@@ -352,7 +352,7 @@ + printf("******************************************************\n\n"); + + } +- else if (opts.write_signature) { ++ else if (!mbr->unique_mbr_signature && opts.write_signature) { + + /* MBR Signatures must be unique for the + EFI Boot Manager |