Skip to contentSkip to conversation

V3: Upgrade efivar and efibootmgr

PATCH New [email protected] 1 participant 3 messages Sep 30, 2015

lore
Share & tools
lore
#0 lore raw

cover V3: Upgrade efivar and efibootmgr

From: Kai Kang <[email protected]>

V3:
* add description for efivar that license checksum changes
* create with git option '-M'

V2 only affects efivar commit:
* update git repo - the previous repo uri is a clone of the official repo
* add efivar-native package to provide command makeguids for efivar to avoid cross compile issue

Kai Kang (2):
efivar: 0.7 -> 0.21
efibootmgr: 0.6.0 -> 0.12

 .../{efibootmgr_0.6.0.bb => efibootmgr_0.12.bb}    | 21 ++++++++-------
 .../efibootmgr/files/docbook-fixes.patch           | 28 -------------------
 .../files/w-keep-existing-mbr-signature.patch      | 26 ------------------
 .../efivar/0001-efivar-fix-for-cross-compile.patch | 31 ++++++++++++++++++++++
 .../efivar/{efivar_git.bb => efivar_0.21.bb}       | 22 ++++++++++-----
 5 files changed, 58 insertions(+), 70 deletions(-)
 rename meta-oe/recipes-extended/efibootmgr/{efibootmgr_0.6.0.bb => efibootmgr_0.12.bb} (39%)
 delete mode 100644 meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
 delete mode 100644 meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
 create mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch
 rename meta-oe/recipes-extended/efivar/{efivar_git.bb => efivar_0.21.bb} (31%)
Signature · 1 line
2.6.0.rc2.10.gf4d9753
#1 lore raw

PATCH 1/2 efivar: 0.7 -> 0.21

From: Kai Kang <[email protected]>

Upgrade efivar from 0.7 to 0.21.

* update HOMEPAGE and git repo.
* add -native recipe to provide command makeguids
and add patch for target package to use this native makeguids command
* update license file checksum. It made FSF addresses in COPYING be URLs.
Ref: https://github.com/rhinstaller/efivar/commit/ca88012

---
 .../efivar/0001-efivar-fix-for-cross-compile.patch | 31 ++++++++++++++++++++++
 .../efivar/{efivar_git.bb => efivar_0.21.bb}       | 22 ++++++++++-----
 2 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch
 rename meta-oe/recipes-extended/efivar/{efivar_git.bb => efivar_0.21.bb} (31%)
meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch new file +31 -0
new file mode 100644
index 0000000..4bd7d95
@@ -0,0 +1,31 @@
+From 7036e8b0dca61432970789e5397b6fb02b362c2b Mon Sep 17 00:00:00 2001
+From: Kai Kang <[email protected]>
+Date: Fri, 25 Sep 2015 18:14:31 +0800
+Subject: [PATCH] efivar: fix for cross compile
+
+It builds and calls elf file makeguids to generate a header file which
+doesn't work for cross compile. Fix it.
+
+Signed-off-by: Kai Kang <[email protected]>
+---
+ src/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 6eac858..ef4eb1d 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -65,8 +65,8 @@ makeguids.o : makeguids.c
+ makeguids : makeguids.o fakeguid.o
+ 	$(CC) $(cflags) -o $@ $^ -ldl
+ 
+-include/efivar/efivar-guids.h : makeguids guids.txt
+-	./makeguids guids.txt guids.bin names.bin guid-symbols.S $@
++include/efivar/efivar-guids.h : guids.txt
++	makeguids guids.txt guids.bin names.bin guid-symbols.S $@
+ 
+ guidlist.o : guids.S include/efivar/efivar-guids.h
+ 	$(CC) $(cflags) -c -o guidlist.o guids.S
+-- 
+2.6.0.rc2.10.gf4d9753
+
meta-oe/recipes-extended/efivar/efivar_0.21.bb renamed from meta-oe/recipes-extended/efivar/efivar_git.bb +16 -6
similarity index 31%
rename from meta-oe/recipes-extended/efivar/efivar_git.bb
rename to meta-oe/recipes-extended/efivar/efivar_0.21.bb
index 18446a0..2e3b643 100644
@@ -1,18 +1,28 @@
 SUMMARY = "Tools to manipulate UEFI variables"
 DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility"
-HOMEPAGE = "https://github.com/vathpela/efivar"
+HOMEPAGE = "https://github.com/rhinstaller/efivar"
 
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
 
-DEPENDS = "popt"
+DEPENDS_class-target = "popt efivar-native"
 
-SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
-PV = "0.7+git${SRCPV}"
-SRC_URI = "git://github.com/vathpela/efivar.git"
+SRCREV = "aab6c2a64d90b6e5a63661fb5bd6be8d878b0784"
+SRC_URI = "git://github.com/rhinstaller/efivar.git"
+SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch"
 
 S = "${WORKDIR}/git"
 
 do_install() {
     oe_runmake install DESTDIR=${D}
 }
+
+do_compile_class-native() {
+    oe_runmake -C src makeguids
+}
+
+do_install_class-native() {
+    install -D ${B}/src/makeguids ${D}${bindir}/makeguids
+}
+
+BBCLASSEXTEND = "native"
Signature · 1 line
2.6.0.rc2.10.gf4d9753
#2 lore raw

PATCH 2/2 efibootmgr: 0.6.0 -> 0.12

In reply to [email protected]

From: Kai Kang <[email protected]>

Upgrade efibootmgr from 0.6.0 to 0.12.

* update HOMEPAGE
* drop useless patches
* add dependency efivar
* update CFLAGS to fix print wrong version issue

---
 .../{efibootmgr_0.6.0.bb => efibootmgr_0.12.bb}    | 21 ++++++++--------
 .../efibootmgr/files/docbook-fixes.patch           | 28 ----------------------
 .../files/w-keep-existing-mbr-signature.patch      | 26 --------------------
 3 files changed, 11 insertions(+), 64 deletions(-)
 rename meta-oe/recipes-extended/efibootmgr/{efibootmgr_0.6.0.bb => efibootmgr_0.12.bb} (39%)
 delete mode 100644 meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
 delete mode 100644 meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb renamed from meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb +11 -10
similarity index 39%
rename from meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb
rename to meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
index 501ff2a..03aaf13 100644
@@ -1,26 +1,27 @@
 DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager."
 SUMMARY = "EFI Boot Manager"
-HOMEPAGE = "http://linux.dell.com/efibootmgr/"
+HOMEPAGE = "https://github.com/rhinstaller/efibootmgr"
 SECTION = "base"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
-DEPENDS = "pciutils zlib"
+DEPENDS = "pciutils zlib efivar"
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
-SRC_URI = "http://linux.dell.com/efibootmgr/permalink/efibootmgr-${PV}.tar.gz \
-    file://ldflags.patch \
-    file://docbook-fixes.patch \
-    file://w-keep-existing-mbr-signature.patch \
-"
+SRC_URI = "https://github.com/rhinstaller/efibootmgr/releases/download/${BP}/${BP}.tar.bz2 \
+           file://ldflags.patch \
+          "
 
-SRC_URI[md5sum] = "9e9a31d79e579644de83a14139b66d10"
-SRC_URI[sha256sum] = "5167488b92950e60028d1025942ce6bda04638c6fb5e110abb8c8f687844d155"
+SRC_URI[md5sum] = "6647f5cd807bc8484135ba74fcbcc39a"
+SRC_URI[sha256sum] = "a66f5850677e86255d93cb1cead04c3c48a823a2b864c579321f2a07f00256e6"
 
-EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/src/lib -I${S}/src/include -fgnu89-inline'"
+EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/src/include `pkg-config --cflags efivar` \
+                 -DEFIBOOTMGR_VERSION=\"$(RELEASE_MAJOR).$(RELEASE_MINOR)\" '"
 
 do_install () {
     install -D -p -m0755 src/efibootmgr/efibootmgr ${D}/${sbindir}/efibootmgr
 }
+
+inherit pkgconfig
meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch deleted +0 -28
deleted file mode 100644
index f2dc83b..0000000
@@ -1,28 +0,0 @@
-Upstream-Status: Pending
-
-Import this patch from meta-linaro.
-
-Signed-off-by: Kai Kang <[email protected]>
-
-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>
meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch deleted +0 -26
deleted file mode 100644
index 58bd135..0000000
@@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
-Import this patch from meta-linaro.
-
-Signed-off-by: Kai Kang <[email protected]>
----
-Description: Fix -w option to leave an existing unique MBR signature intact
- This makes the implementation match the documentation.
-Author: Colin Watson <[email protected]>
-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
Signature · 1 line
2.6.0.rc2.10.gf4d9753