* [meta-oe][PATCH 0/2] Upgrade efivar and efibootmgr
@ 2015-09-08 9:31 kai.kang
2015-09-08 9:31 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
2015-09-08 9:31 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
0 siblings, 2 replies; 17+ messages in thread
From: kai.kang @ 2015-09-08 9:31 UTC (permalink / raw)
To: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
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.patch
--
1.9.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] efivar: 0.7 -> 0.21
2015-09-08 9:31 [meta-oe][PATCH 0/2] Upgrade efivar and efibootmgr kai.kang
@ 2015-09-08 9:31 ` kai.kang
2015-09-23 14:08 ` Martin Jansa
2015-09-08 9:31 ` [PATCH 2/2] efibootmgr: 0.6.0 -> 0.12 kai.kang
1 sibling, 1 reply; 17+ 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 efivar from 0.7 to 0.21.
* update HOMEPAGE
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta-oe/recipes-extended/efivar/efivar_git.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_git.bb
index 18446a0..bf2e6d2 100644
--- a/meta-oe/recipes-extended/efivar/efivar_git.bb
+++ b/meta-oe/recipes-extended/efivar/efivar_git.bb
@@ -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"
--
1.9.1
^ permalink raw reply related [flat|nested] 17+ 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 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
@ 2015-09-08 9:31 ` kai.kang
1 sibling, 0 replies; 17+ 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] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-09-08 9:31 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
@ 2015-09-23 14:08 ` Martin Jansa
2015-09-24 1:58 ` Kang Kai
0 siblings, 1 reply; 17+ messages in thread
From: Martin Jansa @ 2015-09-23 14:08 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1730 bytes --]
On Tue, Sep 08, 2015 at 05:31:47PM +0800, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> Upgrade efivar from 0.7 to 0.21.
>
> * update HOMEPAGE
Fails to build in world http://errors.yoctoproject.org/Errors/Details/18426/
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> meta-oe/recipes-extended/efivar/efivar_git.bb | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_git.bb
> index 18446a0..bf2e6d2 100644
> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
> +++ b/meta-oe/recipes-extended/efivar/efivar_git.bb
> @@ -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"
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-09-23 14:08 ` Martin Jansa
@ 2015-09-24 1:58 ` Kang Kai
0 siblings, 0 replies; 17+ messages in thread
From: Kang Kai @ 2015-09-24 1:58 UTC (permalink / raw)
To: openembedded-devel
On 2015年09月23日 22:08, Martin Jansa wrote:
> On Tue, Sep 08, 2015 at 05:31:47PM +0800, kai.kang@windriver.com wrote:
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> 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
>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>> meta-oe/recipes-extended/efivar/efivar_git.bb | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_git.bb
>> index 18446a0..bf2e6d2 100644
>> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
>> +++ b/meta-oe/recipes-extended/efivar/efivar_git.bb
>> @@ -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"
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
--
Regards,
Neil | Kai Kang
^ permalink raw reply [flat|nested] 17+ 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
0 siblings, 0 replies; 17+ 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] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-10 3:31 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
@ 2015-10-12 6:20 ` Kang Kai
0 siblings, 0 replies; 17+ messages in thread
From: Kang Kai @ 2015-10-12 6:20 UTC (permalink / raw)
To: openembedded-devel, martin.jansa
On 2015年10月10日 11:31, kai.kang@windriver.com wrote:
> 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..c1b649f 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 ${B}/src/makeguids ${D}${bindir}/makeguids
I am suggested to add option '-m xxx' here. So please ignore this thread
and I'll fix it and send a new version.
--Kai
> +}
> +
> +BBCLASSEXTEND = "native"
--
Regards,
Neil | Kai Kang
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-10 3:31 [PATCH 0/2] V3: Upgrade efivar and efibootmgr kai.kang
@ 2015-10-10 3:31 ` kai.kang
2015-10-12 6:20 ` Kang Kai
0 siblings, 1 reply; 17+ 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 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..c1b649f 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 ${B}/src/makeguids ${D}${bindir}/makeguids
+}
+
+BBCLASSEXTEND = "native"
--
2.6.0.rc2.10.gf4d9753
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-09 15:26 ` Martin Jansa
@ 2015-10-09 15:53 ` Khem Raj
0 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2015-10-09 15:53 UTC (permalink / raw)
To: openembeded-devel
On Fri, Oct 9, 2015 at 8:26 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> I could use one for your internal projects, but this efi recipe is first
> one in world which cannot be built with 4.6 (At least first I know about).
>
> In some recipes it was relatively easy to disable (e.g. efl, elementary
> need --disable-cxx-bindings if you build native version with gcc which
> doesn't support -std=gnu++11).
Soon there will be more as we upgrade autoconf/automake to whatever next
version is going to be, there its going to default to C11, so you
still have time
to move away but its imminent.
>
> On Fri, Oct 9, 2015 at 5:18 PM, Khem Raj <raj.khem@gmail.com> wrote:
>
>> On Fri, Oct 9, 2015 at 1:50 AM, Martin Jansa <martin.jansa@gmail.com>
>> wrote:
>> > There is no gcc-native recipe.
>>
>> right, I meant is need one
>>
>> >
>> > On Fri, Oct 9, 2015 at 9:20 AM, Khem Raj <raj.khem@gmail.com> wrote:
>> >
>> >>
>> >> > On Oct 8, 2015, at 2:59 AM, Martin Jansa <martin.jansa@gmail.com>
>> wrote:
>> >> >
>> >> > On Tue, Sep 29, 2015 at 03:04:49PM +0800, kai.kang@windriver.com
>> wrote:
>> >> >> From: Kai Kang <kai.kang@windriver.com>
>> >> >>
>> >> >> 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
>> >> >
>> >> > -native version is failing on hosts with older gcc (like Ubuntu 12.04
>> >> > with 4.6*).
>> >> >
>> >> > http://errors.yoctoproject.org/Errors/Details/20231/
>> >>
>> >> may be use gcc-native ?
>> >>
>> >> >
>> >> >>
>> >> >> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> >> >> ---
>> >> >> .../efivar/0001-efivar-fix-for-cross-compile.patch | 31
>> >> ++++++++++++++++++++++
>> >> >> meta-oe/recipes-extended/efivar/efivar_0.21.bb | 28
>> >> +++++++++++++++++++
>> >> >> meta-oe/recipes-extended/efivar/efivar_git.bb | 18
>> -------------
>> >> >> 3 files changed, 59 insertions(+), 18 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_0.21.bb
>> >> >> delete mode 100644 meta-oe/recipes-extended/efivar/efivar_git.bb
>> >> >>
>> >> >> 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_0.21.bb
>> >> b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
>> >> >> new file mode 100644
>> >> >> index 0000000..2e3b643
>> >> >> --- /dev/null
>> >> >> +++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
>> >> >> @@ -0,0 +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/rhinstaller/efivar"
>> >> >> +
>> >> >> +LICENSE = "LGPLv2.1"
>> >> >> +LIC_FILES_CHKSUM =
>> >> "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
>> >> >> +
>> >> >> +DEPENDS_class-target = "popt efivar-native"
>> >> >> +
>> >> >> +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"
>> >> >> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb
>> >> b/meta-oe/recipes-extended/efivar/efivar_git.bb
>> >> >> deleted file mode 100644
>> >> >> index 18446a0..0000000
>> >> >> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
>> >> >> +++ /dev/null
>> >> >> @@ -1,18 +0,0 @@
>> >> >> -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"
>> >> >> -
>> >> >> -LICENSE = "LGPLv2.1"
>> >> >> -LIC_FILES_CHKSUM =
>> >> "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
>> >> >> -
>> >> >> -DEPENDS = "popt"
>> >> >> -
>> >> >> -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
>> >> >> -PV = "0.7+git${SRCPV}"
>> >> >> -SRC_URI = "git://github.com/vathpela/efivar.git"
>> >> >> -
>> >> >> -S = "${WORKDIR}/git"
>> >> >> -
>> >> >> -do_install() {
>> >> >> - oe_runmake install DESTDIR=${D}
>> >> >> -}
>> >> >> --
>> >> >> 2.6.0.rc2.10.gf4d9753
>> >> >>
>> >> >
>> >> > --
>> >> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>> >> > --
>> >> > _______________________________________________
>> >> > Openembedded-devel mailing list
>> >> > Openembedded-devel@lists.openembedded.org
>> >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >>
>> >>
>> >> --
>> >> _______________________________________________
>> >> Openembedded-devel mailing list
>> >> Openembedded-devel@lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >>
>> >>
>> > --
>> > _______________________________________________
>> > Openembedded-devel mailing list
>> > Openembedded-devel@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-09 15:18 ` Khem Raj
@ 2015-10-09 15:26 ` Martin Jansa
2015-10-09 15:53 ` Khem Raj
0 siblings, 1 reply; 17+ messages in thread
From: Martin Jansa @ 2015-10-09 15:26 UTC (permalink / raw)
To: openembedded-devel
I could use one for your internal projects, but this efi recipe is first
one in world which cannot be built with 4.6 (At least first I know about).
In some recipes it was relatively easy to disable (e.g. efl, elementary
need --disable-cxx-bindings if you build native version with gcc which
doesn't support -std=gnu++11).
On Fri, Oct 9, 2015 at 5:18 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Fri, Oct 9, 2015 at 1:50 AM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> > There is no gcc-native recipe.
>
> right, I meant is need one
>
> >
> > On Fri, Oct 9, 2015 at 9:20 AM, Khem Raj <raj.khem@gmail.com> wrote:
> >
> >>
> >> > On Oct 8, 2015, at 2:59 AM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >> >
> >> > On Tue, Sep 29, 2015 at 03:04:49PM +0800, kai.kang@windriver.com
> wrote:
> >> >> From: Kai Kang <kai.kang@windriver.com>
> >> >>
> >> >> 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
> >> >
> >> > -native version is failing on hosts with older gcc (like Ubuntu 12.04
> >> > with 4.6*).
> >> >
> >> > http://errors.yoctoproject.org/Errors/Details/20231/
> >>
> >> may be use gcc-native ?
> >>
> >> >
> >> >>
> >> >> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> >> >> ---
> >> >> .../efivar/0001-efivar-fix-for-cross-compile.patch | 31
> >> ++++++++++++++++++++++
> >> >> meta-oe/recipes-extended/efivar/efivar_0.21.bb | 28
> >> +++++++++++++++++++
> >> >> meta-oe/recipes-extended/efivar/efivar_git.bb | 18
> -------------
> >> >> 3 files changed, 59 insertions(+), 18 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_0.21.bb
> >> >> delete mode 100644 meta-oe/recipes-extended/efivar/efivar_git.bb
> >> >>
> >> >> 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_0.21.bb
> >> b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
> >> >> new file mode 100644
> >> >> index 0000000..2e3b643
> >> >> --- /dev/null
> >> >> +++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
> >> >> @@ -0,0 +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/rhinstaller/efivar"
> >> >> +
> >> >> +LICENSE = "LGPLv2.1"
> >> >> +LIC_FILES_CHKSUM =
> >> "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
> >> >> +
> >> >> +DEPENDS_class-target = "popt efivar-native"
> >> >> +
> >> >> +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"
> >> >> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb
> >> b/meta-oe/recipes-extended/efivar/efivar_git.bb
> >> >> deleted file mode 100644
> >> >> index 18446a0..0000000
> >> >> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
> >> >> +++ /dev/null
> >> >> @@ -1,18 +0,0 @@
> >> >> -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"
> >> >> -
> >> >> -LICENSE = "LGPLv2.1"
> >> >> -LIC_FILES_CHKSUM =
> >> "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
> >> >> -
> >> >> -DEPENDS = "popt"
> >> >> -
> >> >> -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
> >> >> -PV = "0.7+git${SRCPV}"
> >> >> -SRC_URI = "git://github.com/vathpela/efivar.git"
> >> >> -
> >> >> -S = "${WORKDIR}/git"
> >> >> -
> >> >> -do_install() {
> >> >> - oe_runmake install DESTDIR=${D}
> >> >> -}
> >> >> --
> >> >> 2.6.0.rc2.10.gf4d9753
> >> >>
> >> >
> >> > --
> >> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >> > --
> >> > _______________________________________________
> >> > Openembedded-devel mailing list
> >> > Openembedded-devel@lists.openembedded.org
> >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >>
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >>
> >>
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-09 8:50 ` Martin Jansa
2015-10-09 9:24 ` Kang Kai
@ 2015-10-09 15:18 ` Khem Raj
2015-10-09 15:26 ` Martin Jansa
1 sibling, 1 reply; 17+ messages in thread
From: Khem Raj @ 2015-10-09 15:18 UTC (permalink / raw)
To: openembeded-devel
On Fri, Oct 9, 2015 at 1:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> There is no gcc-native recipe.
right, I meant is need one
>
> On Fri, Oct 9, 2015 at 9:20 AM, Khem Raj <raj.khem@gmail.com> wrote:
>
>>
>> > On Oct 8, 2015, at 2:59 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> >
>> > On Tue, Sep 29, 2015 at 03:04:49PM +0800, kai.kang@windriver.com wrote:
>> >> From: Kai Kang <kai.kang@windriver.com>
>> >>
>> >> 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
>> >
>> > -native version is failing on hosts with older gcc (like Ubuntu 12.04
>> > with 4.6*).
>> >
>> > http://errors.yoctoproject.org/Errors/Details/20231/
>>
>> may be use gcc-native ?
>>
>> >
>> >>
>> >> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> >> ---
>> >> .../efivar/0001-efivar-fix-for-cross-compile.patch | 31
>> ++++++++++++++++++++++
>> >> meta-oe/recipes-extended/efivar/efivar_0.21.bb | 28
>> +++++++++++++++++++
>> >> meta-oe/recipes-extended/efivar/efivar_git.bb | 18 -------------
>> >> 3 files changed, 59 insertions(+), 18 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_0.21.bb
>> >> delete mode 100644 meta-oe/recipes-extended/efivar/efivar_git.bb
>> >>
>> >> 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_0.21.bb
>> b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
>> >> new file mode 100644
>> >> index 0000000..2e3b643
>> >> --- /dev/null
>> >> +++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
>> >> @@ -0,0 +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/rhinstaller/efivar"
>> >> +
>> >> +LICENSE = "LGPLv2.1"
>> >> +LIC_FILES_CHKSUM =
>> "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
>> >> +
>> >> +DEPENDS_class-target = "popt efivar-native"
>> >> +
>> >> +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"
>> >> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb
>> b/meta-oe/recipes-extended/efivar/efivar_git.bb
>> >> deleted file mode 100644
>> >> index 18446a0..0000000
>> >> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
>> >> +++ /dev/null
>> >> @@ -1,18 +0,0 @@
>> >> -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"
>> >> -
>> >> -LICENSE = "LGPLv2.1"
>> >> -LIC_FILES_CHKSUM =
>> "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
>> >> -
>> >> -DEPENDS = "popt"
>> >> -
>> >> -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
>> >> -PV = "0.7+git${SRCPV}"
>> >> -SRC_URI = "git://github.com/vathpela/efivar.git"
>> >> -
>> >> -S = "${WORKDIR}/git"
>> >> -
>> >> -do_install() {
>> >> - oe_runmake install DESTDIR=${D}
>> >> -}
>> >> --
>> >> 2.6.0.rc2.10.gf4d9753
>> >>
>> >
>> > --
>> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>> > --
>> > _______________________________________________
>> > Openembedded-devel mailing list
>> > Openembedded-devel@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-09 8:50 ` Martin Jansa
@ 2015-10-09 9:24 ` Kang Kai
2015-10-09 15:18 ` Khem Raj
1 sibling, 0 replies; 17+ messages in thread
From: Kang Kai @ 2015-10-09 9:24 UTC (permalink / raw)
To: openembedded-devel
On 2015年10月09日 16:50, Martin Jansa wrote:
> There is no gcc-native recipe.
There are 2 options that the old gcc can NOT recognize:
'-Wmaybe-uninitialized' and '-std=gnu11'
I think we can drop them and use default value of option '-std=' only
for native package.
It needs some tiny fixes for C99 mode:
| guid.h:34:2: error: 'for' loop initial declarations are only allowed
in C99 mode
I'll send the V3 pull request if no objection.
Thanks,
Kai
>
> On Fri, Oct 9, 2015 at 9:20 AM, Khem Raj <raj.khem@gmail.com> wrote:
>
>>> On Oct 8, 2015, at 2:59 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>>>
>>> On Tue, Sep 29, 2015 at 03:04:49PM +0800, kai.kang@windriver.com wrote:
>>>> From: Kai Kang <kai.kang@windriver.com>
>>>>
>>>> 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
>>> -native version is failing on hosts with older gcc (like Ubuntu 12.04
>>> with 4.6*).
>>>
>>> http://errors.yoctoproject.org/Errors/Details/20231/
>> may be use gcc-native ?
>>
>>>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>>>> ---
>>>> .../efivar/0001-efivar-fix-for-cross-compile.patch | 31
>> ++++++++++++++++++++++
>>>> meta-oe/recipes-extended/efivar/efivar_0.21.bb | 28
>> +++++++++++++++++++
>>>> meta-oe/recipes-extended/efivar/efivar_git.bb | 18 -------------
>>>> 3 files changed, 59 insertions(+), 18 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_0.21.bb
>>>> delete mode 100644 meta-oe/recipes-extended/efivar/efivar_git.bb
>>>>
>>>> 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_0.21.bb
>> b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
>>>> new file mode 100644
>>>> index 0000000..2e3b643
>>>> --- /dev/null
>>>> +++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
>>>> @@ -0,0 +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/rhinstaller/efivar"
>>>> +
>>>> +LICENSE = "LGPLv2.1"
>>>> +LIC_FILES_CHKSUM =
>> "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
>>>> +
>>>> +DEPENDS_class-target = "popt efivar-native"
>>>> +
>>>> +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"
>>>> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb
>> b/meta-oe/recipes-extended/efivar/efivar_git.bb
>>>> deleted file mode 100644
>>>> index 18446a0..0000000
>>>> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
>>>> +++ /dev/null
>>>> @@ -1,18 +0,0 @@
>>>> -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"
>>>> -
>>>> -LICENSE = "LGPLv2.1"
>>>> -LIC_FILES_CHKSUM =
>> "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
>>>> -
>>>> -DEPENDS = "popt"
>>>> -
>>>> -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
>>>> -PV = "0.7+git${SRCPV}"
>>>> -SRC_URI = "git://github.com/vathpela/efivar.git"
>>>> -
>>>> -S = "${WORKDIR}/git"
>>>> -
>>>> -do_install() {
>>>> - oe_runmake install DESTDIR=${D}
>>>> -}
>>>> --
>>>> 2.6.0.rc2.10.gf4d9753
>>>>
>>> --
>>> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>>
--
Regards,
Neil | Kai Kang
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-09 7:20 ` Khem Raj
@ 2015-10-09 8:50 ` Martin Jansa
2015-10-09 9:24 ` Kang Kai
2015-10-09 15:18 ` Khem Raj
0 siblings, 2 replies; 17+ messages in thread
From: Martin Jansa @ 2015-10-09 8:50 UTC (permalink / raw)
To: openembedded-devel
There is no gcc-native recipe.
On Fri, Oct 9, 2015 at 9:20 AM, Khem Raj <raj.khem@gmail.com> wrote:
>
> > On Oct 8, 2015, at 2:59 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >
> > On Tue, Sep 29, 2015 at 03:04:49PM +0800, kai.kang@windriver.com wrote:
> >> From: Kai Kang <kai.kang@windriver.com>
> >>
> >> 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
> >
> > -native version is failing on hosts with older gcc (like Ubuntu 12.04
> > with 4.6*).
> >
> > http://errors.yoctoproject.org/Errors/Details/20231/
>
> may be use gcc-native ?
>
> >
> >>
> >> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> >> ---
> >> .../efivar/0001-efivar-fix-for-cross-compile.patch | 31
> ++++++++++++++++++++++
> >> meta-oe/recipes-extended/efivar/efivar_0.21.bb | 28
> +++++++++++++++++++
> >> meta-oe/recipes-extended/efivar/efivar_git.bb | 18 -------------
> >> 3 files changed, 59 insertions(+), 18 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_0.21.bb
> >> delete mode 100644 meta-oe/recipes-extended/efivar/efivar_git.bb
> >>
> >> 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_0.21.bb
> b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
> >> new file mode 100644
> >> index 0000000..2e3b643
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
> >> @@ -0,0 +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/rhinstaller/efivar"
> >> +
> >> +LICENSE = "LGPLv2.1"
> >> +LIC_FILES_CHKSUM =
> "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
> >> +
> >> +DEPENDS_class-target = "popt efivar-native"
> >> +
> >> +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"
> >> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb
> b/meta-oe/recipes-extended/efivar/efivar_git.bb
> >> deleted file mode 100644
> >> index 18446a0..0000000
> >> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
> >> +++ /dev/null
> >> @@ -1,18 +0,0 @@
> >> -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"
> >> -
> >> -LICENSE = "LGPLv2.1"
> >> -LIC_FILES_CHKSUM =
> "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
> >> -
> >> -DEPENDS = "popt"
> >> -
> >> -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
> >> -PV = "0.7+git${SRCPV}"
> >> -SRC_URI = "git://github.com/vathpela/efivar.git"
> >> -
> >> -S = "${WORKDIR}/git"
> >> -
> >> -do_install() {
> >> - oe_runmake install DESTDIR=${D}
> >> -}
> >> --
> >> 2.6.0.rc2.10.gf4d9753
> >>
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-10-08 9:59 ` Martin Jansa
@ 2015-10-09 7:20 ` Khem Raj
2015-10-09 8:50 ` Martin Jansa
0 siblings, 1 reply; 17+ messages in thread
From: Khem Raj @ 2015-10-09 7:20 UTC (permalink / raw)
To: Martin Jansa
[-- Attachment #1: Type: text/plain, Size: 5052 bytes --]
> On Oct 8, 2015, at 2:59 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> On Tue, Sep 29, 2015 at 03:04:49PM +0800, kai.kang@windriver.com wrote:
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> 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
>
> -native version is failing on hosts with older gcc (like Ubuntu 12.04
> with 4.6*).
>
> http://errors.yoctoproject.org/Errors/Details/20231/
may be use gcc-native ?
>
>>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>> .../efivar/0001-efivar-fix-for-cross-compile.patch | 31 ++++++++++++++++++++++
>> meta-oe/recipes-extended/efivar/efivar_0.21.bb | 28 +++++++++++++++++++
>> meta-oe/recipes-extended/efivar/efivar_git.bb | 18 -------------
>> 3 files changed, 59 insertions(+), 18 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_0.21.bb
>> delete mode 100644 meta-oe/recipes-extended/efivar/efivar_git.bb
>>
>> 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_0.21.bb b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
>> new file mode 100644
>> index 0000000..2e3b643
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
>> @@ -0,0 +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/rhinstaller/efivar"
>> +
>> +LICENSE = "LGPLv2.1"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
>> +
>> +DEPENDS_class-target = "popt efivar-native"
>> +
>> +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"
>> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_git.bb
>> deleted file mode 100644
>> index 18446a0..0000000
>> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
>> +++ /dev/null
>> @@ -1,18 +0,0 @@
>> -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"
>> -
>> -LICENSE = "LGPLv2.1"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
>> -
>> -DEPENDS = "popt"
>> -
>> -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
>> -PV = "0.7+git${SRCPV}"
>> -SRC_URI = "git://github.com/vathpela/efivar.git"
>> -
>> -S = "${WORKDIR}/git"
>> -
>> -do_install() {
>> - oe_runmake install DESTDIR=${D}
>> -}
>> --
>> 2.6.0.rc2.10.gf4d9753
>>
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] efivar: 0.7 -> 0.21
2015-09-29 7:04 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
@ 2015-10-08 9:59 ` Martin Jansa
2015-10-09 7:20 ` Khem Raj
0 siblings, 1 reply; 17+ messages in thread
From: Martin Jansa @ 2015-10-08 9:59 UTC (permalink / raw)
To: kai.kang; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4610 bytes --]
On Tue, Sep 29, 2015 at 03:04:49PM +0800, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> 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
-native version is failing on hosts with older gcc (like Ubuntu 12.04
with 4.6*).
http://errors.yoctoproject.org/Errors/Details/20231/
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> .../efivar/0001-efivar-fix-for-cross-compile.patch | 31 ++++++++++++++++++++++
> meta-oe/recipes-extended/efivar/efivar_0.21.bb | 28 +++++++++++++++++++
> meta-oe/recipes-extended/efivar/efivar_git.bb | 18 -------------
> 3 files changed, 59 insertions(+), 18 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_0.21.bb
> delete mode 100644 meta-oe/recipes-extended/efivar/efivar_git.bb
>
> 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_0.21.bb b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
> new file mode 100644
> index 0000000..2e3b643
> --- /dev/null
> +++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
> @@ -0,0 +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/rhinstaller/efivar"
> +
> +LICENSE = "LGPLv2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
> +
> +DEPENDS_class-target = "popt efivar-native"
> +
> +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"
> diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_git.bb
> deleted file mode 100644
> index 18446a0..0000000
> --- a/meta-oe/recipes-extended/efivar/efivar_git.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -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"
> -
> -LICENSE = "LGPLv2.1"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
> -
> -DEPENDS = "popt"
> -
> -SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
> -PV = "0.7+git${SRCPV}"
> -SRC_URI = "git://github.com/vathpela/efivar.git"
> -
> -S = "${WORKDIR}/git"
> -
> -do_install() {
> - oe_runmake install DESTDIR=${D}
> -}
> --
> 2.6.0.rc2.10.gf4d9753
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] efivar: 0.7 -> 0.21
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; 17+ 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 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
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../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%)
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_git.bb b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
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
--- a/meta-oe/recipes-extended/efivar/efivar_git.bb
+++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
@@ -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"
--
2.6.0.rc2.10.gf4d9753
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 1/2] efivar: 0.7 -> 0.21
2015-09-29 7:04 [meta-oe][PATCH 0/2] V2: Upgrade efivar and efibootmgr kai.kang
@ 2015-09-29 7:04 ` kai.kang
2015-10-08 9:59 ` Martin Jansa
0 siblings, 1 reply; 17+ 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 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
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
.../efivar/0001-efivar-fix-for-cross-compile.patch | 31 ++++++++++++++++++++++
meta-oe/recipes-extended/efivar/efivar_0.21.bb | 28 +++++++++++++++++++
meta-oe/recipes-extended/efivar/efivar_git.bb | 18 -------------
3 files changed, 59 insertions(+), 18 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_0.21.bb
delete mode 100644 meta-oe/recipes-extended/efivar/efivar_git.bb
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_0.21.bb b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
new file mode 100644
index 0000000..2e3b643
--- /dev/null
+++ b/meta-oe/recipes-extended/efivar/efivar_0.21.bb
@@ -0,0 +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/rhinstaller/efivar"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
+
+DEPENDS_class-target = "popt efivar-native"
+
+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"
diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_git.bb
deleted file mode 100644
index 18446a0..0000000
--- a/meta-oe/recipes-extended/efivar/efivar_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-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"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-DEPENDS = "popt"
-
-SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
-PV = "0.7+git${SRCPV}"
-SRC_URI = "git://github.com/vathpela/efivar.git"
-
-S = "${WORKDIR}/git"
-
-do_install() {
- oe_runmake install DESTDIR=${D}
-}
--
2.6.0.rc2.10.gf4d9753
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-10-12 6:34 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-08 9:31 [meta-oe][PATCH 0/2] Upgrade efivar and efibootmgr kai.kang
2015-09-08 9:31 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
2015-09-23 14:08 ` Martin Jansa
2015-09-24 1:58 ` Kang Kai
2015-09-08 9:31 ` [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 1/2] efivar: 0.7 -> 0.21 kai.kang
2015-10-08 9:59 ` Martin Jansa
2015-10-09 7:20 ` Khem Raj
2015-10-09 8:50 ` Martin Jansa
2015-10-09 9:24 ` Kang Kai
2015-10-09 15:18 ` Khem Raj
2015-10-09 15:26 ` Martin Jansa
2015-10-09 15:53 ` Khem Raj
2015-09-30 6:21 [meta-oe][PATCH 0/2] V3: Upgrade efivar and efibootmgr kai.kang
2015-09-30 6:21 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
2015-10-10 3:31 [PATCH 0/2] V3: Upgrade efivar and efibootmgr kai.kang
2015-10-10 3:31 ` [PATCH 1/2] efivar: 0.7 -> 0.21 kai.kang
2015-10-12 6:20 ` Kang Kai
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
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.