Upgrade efivar and efibootmgr
cover Upgrade efivar and efibootmgr
From: Kai Kang <[email protected]>
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 --------------------
meta-oe/recipes-extended/efivar/efivar_git.bb | 8 +++----
4 files changed, 15 insertions(+), 68 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.patchSignature · 1 line
1.9.1
PATCH 1/2 efivar: 0.7 -> 0.21
From: Kai Kang <[email protected]>
Upgrade efivar from 0.7 to 0.21.
* update HOMEPAGE
--- meta-oe/recipes-extended/efivar/efivar_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-oe/recipes-extended/efivar/efivar_git.bb +4 -4
@@ -1,14 +1,14 @@ 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" -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7" -PV = "0.7+git${SRCPV}" +SRCREV = "aab6c2a64d90b6e5a63661fb5bd6be8d878b0784" +PV = "0.21+git${SRCPV}" SRC_URI = "git://github.com/vathpela/efivar.git" S = "${WORKDIR}/git"
Signature · 1 line
1.9.1
Re: [PATCH 1/2] efivar: 0.7 -> 0.21
Quoted 5 lines · On Tue, Sep 08, 2015 at 05:31:47PM +0800, [email protected] wrote:
From: Kai Kang <[email protected]>
Upgrade efivar from 0.7 to 0.21.
* update HOMEPAGE
Fails to build in world http://errors.yoctoproject.org/Errors/Details/18426/
Quoted 37 lines
Signed-off-by Kai Kang <[email protected]>--- meta-oe/recipes-extended/efivar/efivar_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)meta-oe/recipes-extended/efivar/efivar_git.bb +4
-4@@ -1,14 +1,14 @@ 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" -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7" -PV = "0.7+git${SRCPV}" +SRCREV = "aab6c2a64d90b6e5a63661fb5bd6be8d878b0784" +PV = "0.21+git${SRCPV}" SRC_URI = "git://github.com/vathpela/efivar.git" S = "${WORKDIR}/git"Signature · 7 lines
1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 1/2] efivar: 0.7 -> 0.21
Quoted 7 lines · Martin Jansa
Quoted 5 lines · On Tue, Sep 08, 2015 at 05:31:47PM +0800, [email protected] wrote:
From: Kai Kang <[email protected]>
Upgrade efivar from 0.7 to 0.21.
* update HOMEPAGE
Fails to build in world http://errors.yoctoproject.org/Errors/Details/18426/
I'll check it. Thanks.
--Kai
Quoted 39 lines
Quoted 37 lines
Signed-off-by Kai Kang <[email protected]>--- meta-oe/recipes-extended/efivar/efivar_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)meta-oe/recipes-extended/efivar/efivar_git.bb +4
-4@@ -1,14 +1,14 @@ 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" -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7" -PV = "0.7+git${SRCPV}" +SRCREV = "aab6c2a64d90b6e5a63661fb5bd6be8d878b0784" +PV = "0.21+git${SRCPV}" SRC_URI = "git://github.com/vathpela/efivar.git" S = "${WORKDIR}/git"Signature · 7 lines
1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 2 lines
Regards, Neil | Kai Kang
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.patchmeta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb renamed from meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb +11 -10
@@ -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
@@ -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
@@ -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
1.9.1