* [meta-oe][PATCH 0/2] V4: Upgrade efivar and efibootmgr
@ 2015-10-12 6:26 kai.kang
2015-10-12 6:26 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
2015-10-12 6:26 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
0 siblings, 2 replies; 7+ messages in thread
From: kai.kang @ 2015-10-12 6:26 UTC (permalink / raw)
To: martin.jansa; +Cc: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
V4:
* add option '-m 0755' of command 'install' in efivar bb file
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 ++++++++++
...ptions-not-supported-by-lower-version-gcc.patch | 71 ++++++++++++++++++++++
.../efivar/{efivar_git.bb => efivar_0.21.bb} | 23 +++++--
6 files changed, 130 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
create mode 100644 meta-oe/recipes-extended/efivar/efivar/efivar-drop-options-not-supported-by-lower-version-gcc.patch
rename meta-oe/recipes-extended/efivar/{efivar_git.bb => efivar_0.21.bb} (27%)
--
2.6.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-12 6:26 [meta-oe][PATCH 0/2] V4: Upgrade efivar and efibootmgr kai.kang
@ 2015-10-12 6:26 ` kai.kang
2015-10-12 6:26 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
1 sibling, 0 replies; 7+ messages in thread
From: kai.kang @ 2015-10-12 6:26 UTC (permalink / raw)
To: martin.jansa; +Cc: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
Upgrade efivar from 0.7 to 0.21.
* update HOMEPAGE and git repo.
* update license file checksum. It made FSF addresses in COPYING be URLs.
Ref: https://github.com/rhinstaller/efivar/commit/ca88012
* add -native recipe to provide command makeguids
and add patch for target package to use this native makeguids command
* add patch to build efivar-native with lower version gcc which doesn't
support options '-Wmaybe-uninitialized' and '-std=gnu11'
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../efivar/0001-efivar-fix-for-cross-compile.patch | 31 ++++++++++
...ptions-not-supported-by-lower-version-gcc.patch | 71 ++++++++++++++++++++++
.../efivar/{efivar_git.bb => efivar_0.21.bb} | 23 +++++--
3 files changed, 119 insertions(+), 6 deletions(-)
create mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch
create mode 100644 meta-oe/recipes-extended/efivar/efivar/efivar-drop-options-not-supported-by-lower-version-gcc.patch
rename meta-oe/recipes-extended/efivar/{efivar_git.bb => efivar_0.21.bb} (27%)
diff --git a/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch b/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch
new file mode 100644
index 0000000..4bd7d95
--- /dev/null
+++ b/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch
@@ -0,0 +1,31 @@
+From 7036e8b0dca61432970789e5397b6fb02b362c2b Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+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 <kai.kang@windriver.com>
+---
+ 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
+
diff --git a/meta-oe/recipes-extended/efivar/efivar/efivar-drop-options-not-supported-by-lower-version-gcc.patch b/meta-oe/recipes-extended/efivar/efivar/efivar-drop-options-not-supported-by-lower-version-gcc.patch
new file mode 100644
index 0000000..7f04b19
--- /dev/null
+++ b/meta-oe/recipes-extended/efivar/efivar/efivar-drop-options-not-supported-by-lower-version-gcc.patch
@@ -0,0 +1,71 @@
+gcc options '-Wmaybe-uninitialized' and '-std=gnu11' are not recognized by gcc
+whose version is lower than 4.6, such as on Ubuntu 12.04. Drop them for backward
+compatible.
+
+Upstream-Status: Pending
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+diff --git a/Make.defaults b/Make.defaults
+index cc2baa9..118ae56 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -10,10 +10,9 @@ CFLAGS ?= -O2 -g
+
+ ARCH = $(shell uname -m)
+ clang_cflags =
+-gcc_cflags = -Wmaybe-uninitialized
+ cflags := $(CFLAGS) \
+ -Werror -Wall -Wsign-compare -Wstrict-aliasing \
+- -std=gnu11 -fshort-wchar -fPIC \
++ -fshort-wchar -fPIC \
+ -fvisibility=hidden \
+ -D_GNU_SOURCE -I${TOPDIR}/src/include/efivar/ \
+ $(if $(filter $(CC),clang),$(clang_cflags),) \
+diff --git a/src/guid.h b/src/guid.h
+index 9542ee1..0817991 100644
+--- a/src/guid.h
++++ b/src/guid.h
+@@ -31,7 +31,8 @@ static inline int
+ real_isspace(char c)
+ {
+ char spaces[] = " \f\n\r\t\v";
+- for (int i = 0; spaces[i] != '\0'; i++)
++ int i;
++ for (i = 0; spaces[i] != '\0'; i++)
+ if (c == spaces[i])
+ return 1;
+ return 0;
+@@ -59,7 +60,8 @@ check_sanity(const char *text, size_t len)
+ static inline int
+ check_segment_sanity(const char *text, size_t len)
+ {
+- for(unsigned int i = 0; i < len; i++) {
++ unsigned int i;
++ for(i = 0; i < len; i++) {
+ if (text[i] >= '0' && text[i] <= '9')
+ continue;
+ /* "| 0x20" is tolower() without having to worry about
+diff --git a/src/makeguids.c b/src/makeguids.c
+index e9acf15..7e16cb2 100644
+--- a/src/makeguids.c
++++ b/src/makeguids.c
+@@ -150,7 +150,8 @@ main(int argc, char *argv[])
+
+ fprintf(header, "#ifndef EFIVAR_GUIDS_H\n#define EFIVAR_GUIDS_H 1\n\n");
+
+- for (unsigned int i = 0; i < line-1; i++) {
++ unsigned int i, j;
++ for (i = 0; i < line-1; i++) {
+ if (!strcmp(outbuf[i].symbol, "efi_guid_zero"))
+ fprintf(symout, "\t.globl %s\n"
+ "\t.data\n"
+@@ -176,7 +177,7 @@ main(int argc, char *argv[])
+ fprintf(symout, "efi_guid_empty:\n");
+
+ uint8_t *guid_data = (uint8_t *) &outbuf[i].guid;
+- for (unsigned int j = 0; j < sizeof (efi_guid_t); j++)
++ for (j = 0; j < sizeof (efi_guid_t); j++)
+ fprintf(symout,"\t.byte 0x%02x\n", guid_data[j]);
+
+ fprintf(symout, "%s_end:\n", outbuf[i].symbol);
diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
similarity index 27%
rename from meta-oe/recipes-extended/efivar/efivar_git.bb
rename to meta-oe/recipes-extended/efivar/efivar_0.21.bb
index 18446a0..b5ef90a 100644
--- a/meta-oe/recipes-extended/efivar/efivar_git.bb
+++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
@@ -1,18 +1,29 @@
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"
+SRC_URI_append_class-native = " file://efivar-drop-options-not-supported-by-lower-version-gcc.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 -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids
+}
+
+BBCLASSEXTEND = "native"
--
2.6.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12
2015-10-12 6:26 [meta-oe][PATCH 0/2] V4: Upgrade efivar and efibootmgr kai.kang
2015-10-12 6:26 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
@ 2015-10-12 6:26 ` kai.kang
1 sibling, 0 replies; 7+ messages in thread
From: kai.kang @ 2015-10-12 6:26 UTC (permalink / raw)
To: martin.jansa; +Cc: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
Upgrade efibootmgr from 0.6.0 to 0.12.
* update HOMEPAGE
* drop obsolete patches that source files have been removed
* add dependency efivar
* update CFLAGS to fix print wrong version issue
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../{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
diff --git a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
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
--- a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb
+++ b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
@@ -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
diff --git a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch b/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
deleted file mode 100644
index f2dc83b..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/w-keep-existing-mbr-signature.patch b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
deleted file mode 100644
index 58bd135..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
--
2.6.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12
2015-10-10 3:31 [PATCH 0/2] V3: Upgrade efivar and efibootmgr kai.kang
@ 2015-10-10 3:31 ` kai.kang
0 siblings, 0 replies; 7+ messages in thread
From: kai.kang @ 2015-10-10 3:31 UTC (permalink / raw)
To: martin.jansa; +Cc: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
Upgrade efibootmgr from 0.6.0 to 0.12.
* update HOMEPAGE
* drop obsolete patches that source files have been removed
* add dependency efivar
* update CFLAGS to fix print wrong version issue
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../{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
diff --git a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
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
--- a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb
+++ b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
@@ -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
diff --git a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch b/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
deleted file mode 100644
index f2dc83b..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/w-keep-existing-mbr-signature.patch b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
deleted file mode 100644
index 58bd135..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
--
2.6.0.rc2.10.gf4d9753
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12
2015-09-30 6:21 [meta-oe][PATCH 0/2] V3: Upgrade efivar and efibootmgr kai.kang
@ 2015-09-30 6:21 ` kai.kang
0 siblings, 0 replies; 7+ messages in thread
From: kai.kang @ 2015-09-30 6:21 UTC (permalink / raw)
To: martin.jansa; +Cc: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
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
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../{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
diff --git a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
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
--- a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb
+++ b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
@@ -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
diff --git a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch b/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
deleted file mode 100644
index f2dc83b..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/w-keep-existing-mbr-signature.patch b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
deleted file mode 100644
index 58bd135..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
--
2.6.0.rc2.10.gf4d9753
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12
2015-09-29 7:04 [meta-oe][PATCH 0/2] V2: Upgrade efivar and efibootmgr kai.kang
@ 2015-09-29 7:04 ` kai.kang
0 siblings, 0 replies; 7+ messages in thread
From: kai.kang @ 2015-09-29 7:04 UTC (permalink / raw)
To: martin.jansa; +Cc: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
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
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../recipes-extended/efibootmgr/efibootmgr_0.12.bb | 27 +++++++++++++++++++++
.../efibootmgr/efibootmgr_0.6.0.bb | 26 --------------------
.../efibootmgr/files/docbook-fixes.patch | 28 ----------------------
.../files/w-keep-existing-mbr-signature.patch | 26 --------------------
4 files changed, 27 insertions(+), 80 deletions(-)
create mode 100644 meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
delete mode 100644 meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb
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
diff --git a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
new file mode 100644
index 0000000..03aaf13
--- /dev/null
+++ b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager."
+SUMMARY = "EFI Boot Manager"
+HOMEPAGE = "https://github.com/rhinstaller/efibootmgr"
+SECTION = "base"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+DEPENDS = "pciutils zlib efivar"
+
+COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
+
+SRC_URI = "https://github.com/rhinstaller/efibootmgr/releases/download/${BP}/${BP}.tar.bz2 \
+ file://ldflags.patch \
+ "
+
+SRC_URI[md5sum] = "6647f5cd807bc8484135ba74fcbcc39a"
+SRC_URI[sha256sum] = "a66f5850677e86255d93cb1cead04c3c48a823a2b864c579321f2a07f00256e6"
+
+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
diff --git a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb
deleted file mode 100644
index 501ff2a..0000000
--- a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager."
-SUMMARY = "EFI Boot Manager"
-HOMEPAGE = "http://linux.dell.com/efibootmgr/"
-SECTION = "base"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-
-DEPENDS = "pciutils zlib"
-
-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[md5sum] = "9e9a31d79e579644de83a14139b66d10"
-SRC_URI[sha256sum] = "5167488b92950e60028d1025942ce6bda04638c6fb5e110abb8c8f687844d155"
-
-EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/src/lib -I${S}/src/include -fgnu89-inline'"
-
-do_install () {
- install -D -p -m0755 src/efibootmgr/efibootmgr ${D}/${sbindir}/efibootmgr
-}
diff --git a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch b/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
deleted file mode 100644
index f2dc83b..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/w-keep-existing-mbr-signature.patch b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
deleted file mode 100644
index 58bd135..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
--
2.6.0.rc2.10.gf4d9753
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12
2015-09-08 9:31 [meta-oe][PATCH 0/2] Upgrade efivar and efibootmgr kai.kang
@ 2015-09-08 9:31 ` kai.kang
0 siblings, 0 replies; 7+ messages in thread
From: kai.kang @ 2015-09-08 9:31 UTC (permalink / raw)
To: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
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
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../{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
diff --git a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
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
--- a/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.6.0.bb
+++ b/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb
@@ -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
diff --git a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch b/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
deleted file mode 100644
index f2dc83b..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/docbook-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/w-keep-existing-mbr-signature.patch b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
deleted file mode 100644
index 58bd135..0000000
--- a/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-10-12 6:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-12 6:26 [meta-oe][PATCH 0/2] V4: Upgrade efivar and efibootmgr kai.kang
2015-10-12 6:26 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
2015-10-12 6:26 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
-- strict thread matches above, loose matches on Subject: below --
2015-10-10 3:31 [PATCH 0/2] V3: Upgrade efivar and efibootmgr kai.kang
2015-10-10 3:31 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
2015-09-30 6:21 [meta-oe][PATCH 0/2] V3: Upgrade efivar and efibootmgr kai.kang
2015-09-30 6:21 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
2015-09-29 7:04 [meta-oe][PATCH 0/2] V2: Upgrade efivar and efibootmgr kai.kang
2015-09-29 7:04 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
2015-09-08 9:31 [meta-oe][PATCH 0/2] Upgrade efivar and efibootmgr kai.kang
2015-09-08 9:31 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.