From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id 61156731DF for ; Sat, 5 Mar 2016 12:30:45 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id 1so3087057wmg.2 for ; Sat, 05 Mar 2016 04:30:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=BOtlSndjMQzDnSb5+C31n0OKCg7jCLEzif/xqlKjh4s=; b=ToYkFZe00v79mues1OqnyKzVOasGuMZuK3ji3GwAZJwVyLvI1m6gQ5Q2Nm6pAmxOxh On1zxJWk0j6EqOoZk2xA1L2CL511DxrfUngmqw4XOlsYvV5OYfuNPNuGTNrTabIqTfTf 8A40hf+h/DzhxeufKCffwR2/0HtBF7ByQxMBwBQa8I3fOI8R/yf9VLzbhuxOejapcRR1 kaIQ9zYc3NAcW0QGA3xT8qjKijaE+dcJrH2OEne8xPW1zLOvCrfBZLkC90B17T/L6+7q 0fig9ZRySaj0pjD6TCJa1PUMsIAltdoPAV564kaq5PIS2Td6px1pgmKGch+oqv09Abgn frBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=BOtlSndjMQzDnSb5+C31n0OKCg7jCLEzif/xqlKjh4s=; b=dIQwRtFzYtqTzM6FEfSo01ua+3+Lp4KbNaf+wWUgeySfyghoOVcELaGbLVzGIYkQs+ 0sGHv01r8ZPeGEwXX2wOMfmLabUAZYXfOWjd6C0+TAz+m8IFcbv9cHH7Sheuzb5Y0yAX g5f1k6D/AHd0Zi5uLvvCvM0EvZ4JfR+jHUiwEm8C091jIhbIdCDuUJkO3trBZ69kmYa3 up+/+ptohErFlRvoaBPTzXIDXAtTwGMBUnB0SCf7v3qIEHbHQwC5cpD5zFETdllPjxD1 zUVRYO/FQ7WlI9mDZmrfFhdTbQOjd818u/kNq9rOd2ZqXFDPo6d4/iYj6EMTOEBs/3H/ y30w== X-Gm-Message-State: AD7BkJJMVOy3L2BVJLPABc5DKPTYNBC6KX24ft6P+E3asbtKVequz56eIAqyle9mG8nfhg== X-Received: by 10.28.12.80 with SMTP id 77mr3566552wmm.19.1457181045829; Sat, 05 Mar 2016 04:30:45 -0800 (PST) Received: from localhost (ip-86-49-34-37.net.upcbroadband.cz. [86.49.34.37]) by smtp.gmail.com with ESMTPSA id k125sm3640090wmb.14.2016.03.05.04.30.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Mar 2016 04:30:44 -0800 (PST) From: Martin Jansa X-Google-Original-From: Martin Jansa Date: Sat, 5 Mar 2016 13:33:04 +0100 To: Koen Kooi Message-ID: <20160305123304.GA2560@jama> References: <1457075695-17045-1-git-send-email-koen.kooi@linaro.org> <20160304133409.GB2557@jama> <20160304150914.GF2557@jama> MIME-Version: 1.0 In-Reply-To: <20160304150914.GF2557@jama> User-Agent: Mutt/1.5.24 (2015-08-30) Cc: OpenEmbedded Devel List Subject: Re: [meta-oe][PATCH v2 1/2] efivar: update to 0.23 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Mar 2016 12:30:46 -0000 X-Groupsio-MsgNum: 60354 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="x+6KMIRAuhnl3hBn" Content-Disposition: inline --x+6KMIRAuhnl3hBn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 04, 2016 at 04:09:14PM +0100, Martin Jansa wrote: > On Fri, Mar 04, 2016 at 03:16:22PM +0100, Koen Kooi wrote: > > On 4 March 2016 at 14:34, Martin Jansa wrote: > > > On Fri, Mar 04, 2016 at 08:14:54AM +0100, Koen Kooi wrote: > > >> Upstream removed the use of the nvme headers completely, so no more = conflicts. Also drop gcc options patch, ubuntu 12.04 is too old to support = in meta-oe/master. > > > > > > This fails to build static version, when no-static-libs.inc is used > > > (e.g. default in Poky). > > > > > > Can you either disable static in popt or change efivar to respect > > > --disable-static (if possible)? > >=20 > > I've patched out the static build in v3, that should fix this. >=20 > Thanks for quick updated, applied in master-next with small indentation > fix. Well, almost there one build failed with: | i586-oe-linux-gcc -m32 -march=3Di586 --sysroot=3D/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86 -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=3D/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe= -linux/efivar/0.23-r0/git=3D/usr/src/efivar -fdebug-prefix-map=3D/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe= -linux/efivar/0.23-r0/git=3D/usr/src/efivar -fdebug-prefix-map=3D/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86= _64-linux=3D -fdebug-prefix-map=3D/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qem= ux86=3D -I/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/efivar/0.23-= r0/git/src/include/efivar/ -specs=3D/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/efiva= r/0.23-r0/git/gcc.specs -L. -Wl,-O1 -Wl,--hash-style=3Dgnu -Wl,--as-needed -shared \ | -Wl,-soname,libefivar.so.0 \ | -o libefivar.so dp.o dp-acpi.o dp-hw.o dp-media.o dp-message.o efivarfs.o export.o guid.o guids.o guid-symbols.o lib.o vars.o -ldl | /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec= /i586-oe-linux/gcc/i586-oe-linux/5.3.0/ld: --default-symver: unknown option | /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec= /i586-oe-linux/gcc/i586-oe-linux/5.3.0/ld: use the --help option for usage information | collect2: error: ld returned 1 exit status | make[1]: *** [libefivar.so] Error 1 | make[1]: *** Waiting for unfinished jobs.... 2nd one failed with: | install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/ | install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ ; install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ ; | install: cannot stat 'efivar.pc': No such file or directory | install: cannot stat 'efiboot.pc': No such file or directory | make[1]: *** [install] Error 1 | make[1]: Leaving directory `efivar/0.23-r0/git/src' | make: *** [install] Error 2 | ERROR: oe_runmake failed > > > 5.3.0/ld: cannot find -lpopt > > > | collect2: error: ld returned 1 exit status > > > | make[1]: *** [efivar-static] Error 1 > > > | make[1]: *** Waiting for unfinished jobs.... > > > > > > > > >> > > >> Signed-off-by: Koen Kooi > > >> --- > > >> .../efivar/0001-efivar-fix-for-cross-compile.patch | 21 +++---- > > >> ...ptions-not-supported-by-lower-version-gcc.patch | 71 -----------= ----------- > > >> meta-oe/recipes-extended/efivar/efivar_0.21.bb | 39 ------------ > > >> meta-oe/recipes-extended/efivar/efivar_0.23.bb | 36 +++++++++++ > > >> 4 files changed, 45 insertions(+), 122 deletions(-) > > >> delete mode 100644 meta-oe/recipes-extended/efivar/efivar/efivar-dr= op-options-not-supported-by-lower-version-gcc.patch > > >> delete mode 100644 meta-oe/recipes-extended/efivar/efivar_0.21.bb > > >> create mode 100644 meta-oe/recipes-extended/efivar/efivar_0.23.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-efiva= r-fix-for-cross-compile.patch > > >> index 4bd7d95..b02edd9 100644 > > >> --- a/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cro= ss-compile.patch > > >> +++ b/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cro= ss-compile.patch > > >> @@ -12,20 +12,17 @@ Signed-off-by: Kai Kang > > >> 1 file changed, 2 insertions(+), 2 deletions(-) > > >> > > >> diff --git a/src/Makefile b/src/Makefile > > >> -index 6eac858..ef4eb1d 100644 > > >> +index 5fc7887..1829d22 100644 > > >> --- a/src/Makefile > > >> +++ b/src/Makefile > > >> -@@ -65,8 +65,8 @@ makeguids.o : makeguids.c > > >> - makeguids : makeguids.o fakeguid.o > > >> - $(CC) $(cflags) -o $@ $^ -ldl > > >> - > > >> +@@ -29,8 +29,8 @@ all : deps $(TARGETS) > > >> + ./guid-symbols.c : include/efivar/efivar-guids.h > > >> + ./guids.bin : include/efivar/efivar-guids.h > > >> + ./names.bin : include/efivar/efivar-guids.h > > >> -include/efivar/efivar-guids.h : makeguids guids.txt > > >> -- ./makeguids guids.txt guids.bin names.bin guid-symbols.S $@ > > >> +- ./makeguids guids.txt guids.bin names.bin \ > > >> +include/efivar/efivar-guids.h : guids.txt > > >> -+ makeguids guids.txt guids.bin names.bin guid-symbols.S $@ > > >> ++ makeguids guids.txt guids.bin names.bin \ > > >> + guid-symbols.c include/efivar/efivar-guids.h > > >> > > >> - guidlist.o : guids.S include/efivar/efivar-guids.h > > >> - $(CC) $(cflags) -c -o guidlist.o guids.S > > >> --- > > >> -2.6.0.rc2.10.gf4d9753 > > >> - > > >> + makeguids : CPPFLAGS+=3D-DEFIVAR_BUILD_ENVIRONMENT > > >> diff --git a/meta-oe/recipes-extended/efivar/efivar/efivar-drop-opti= ons-not-supported-by-lower-version-gcc.patch b/meta-oe/recipes-extended/efi= var/efivar/efivar-drop-options-not-supported-by-lower-version-gcc.patch > > >> deleted file mode 100644 > > >> index 7f04b19..0000000 > > >> --- a/meta-oe/recipes-extended/efivar/efivar/efivar-drop-options-not= -supported-by-lower-version-gcc.patch > > >> +++ /dev/null > > >> @@ -1,71 +0,0 @@ > > >> -gcc options '-Wmaybe-uninitialized' and '-std=3Dgnu11' are not reco= gnized 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 > > >> ---- > > >> -diff --git a/Make.defaults b/Make.defaults > > >> -index cc2baa9..118ae56 100644 > > >> ---- a/Make.defaults > > >> -+++ b/Make.defaults > > >> -@@ -10,10 +10,9 @@ CFLAGS ?=3D -O2 -g > > >> - > > >> - ARCH =3D $(shell uname -m) > > >> - clang_cflags =3D > > >> --gcc_cflags =3D -Wmaybe-uninitialized > > >> - cflags :=3D $(CFLAGS) \ > > >> - -Werror -Wall -Wsign-compare -Wstrict-aliasing \ > > >> -- -std=3Dgnu11 -fshort-wchar -fPIC \ > > >> -+ -fshort-wchar -fPIC \ > > >> - -fvisibility=3Dhidden \ > > >> - -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[] =3D " \f\n\r\t\v"; > > >> -- for (int i =3D 0; spaces[i] !=3D '\0'; i++) > > >> -+ int i; > > >> -+ for (i =3D 0; spaces[i] !=3D '\0'; i++) > > >> - if (c =3D=3D 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 =3D 0; i < len; i++) { > > >> -+ unsigned int i; > > >> -+ for(i =3D 0; i < len; i++) { > > >> - if (text[i] >=3D '0' && text[i] <=3D '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 =3D 0; i < line-1; i++) { > > >> -+ unsigned int i, j; > > >> -+ for (i =3D 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 =3D (uint8_t *) &outbuf[i].guid; > > >> -- for (unsigned int j =3D 0; j < sizeof (efi_guid_t); j+= +) > > >> -+ for (j =3D 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_0.21.bb b/meta-o= e/recipes-extended/efivar/efivar_0.21.bb > > >> deleted file mode 100644 > > >> index f7a4d55..0000000 > > >> --- a/meta-oe/recipes-extended/efivar/efivar_0.21.bb > > >> +++ /dev/null > > >> @@ -1,39 +0,0 @@ > > >> -SUMMARY =3D "Tools to manipulate UEFI variables" > > >> -DESCRIPTION =3D "efivar provides a simple command line interface to= the UEFI variable facility" > > >> -HOMEPAGE =3D "https://github.com/rhinstaller/efivar" > > >> - > > >> -LICENSE =3D "LGPLv2.1" > > >> -LIC_FILES_CHKSUM =3D "file://COPYING;md5=3D6626bb1e20189cfa95f2c508= ba286393" > > >> - > > >> -DEPENDS_class-target =3D "popt efivar-native" > > >> - > > >> -SRCREV =3D "aab6c2a64d90b6e5a63661fb5bd6be8d878b0784" > > >> -SRC_URI =3D "git://github.com/rhinstaller/efivar.git" > > >> -SRC_URI_append_class-target =3D " file://0001-efivar-fix-for-cross-= compile.patch" > > >> -SRC_URI_append_class-native =3D " file://efivar-drop-options-not-su= pported-by-lower-version-gcc.patch" > > >> - > > >> -S =3D "${WORKDIR}/git" > > >> - > > >> -do_install() { > > >> - oe_runmake install DESTDIR=3D${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 =3D "native" > > >> - > > >> -# See > > >> -# http://lists.openembedded.org/pipermail/openembedded-core/2016-Fe= bruary/116564.html > > >> -# http://lists.openembedded.org/pipermail/openembedded-core/2016-Fe= bruary/116571.html > > >> -# http://lists.openembedded.org/pipermail/openembedded-devel/2016-F= ebruary/105802.html > > >> -# http://lists.openembedded.org/pipermail/openembedded-devel/2016-F= ebruary/105786.html > > >> -# but it's still broken: > > >> -# http://lists.openembedded.org/pipermail/openembedded-devel/2016-F= ebruary/105825.html > > >> -# http://lists.openembedded.org/pipermail/openembedded-devel/2016-F= ebruary/105830.html > > >> -PNBLACKLIST[efivar] ?=3D "BROKEN: linux.c:27:30: fatal error: linux= /nvme_ioctl.h: No such file or directory" > > >> diff --git a/meta-oe/recipes-extended/efivar/efivar_0.23.bb b/meta-o= e/recipes-extended/efivar/efivar_0.23.bb > > >> new file mode 100644 > > >> index 0000000..faffb79 > > >> --- /dev/null > > >> +++ b/meta-oe/recipes-extended/efivar/efivar_0.23.bb > > >> @@ -0,0 +1,36 @@ > > >> +SUMMARY =3D "Tools to manipulate UEFI variables" > > >> +DESCRIPTION =3D "efivar provides a simple command line interface to= the UEFI variable facility" > > >> +HOMEPAGE =3D "https://github.com/rhinstaller/efivar" > > >> + > > >> +LICENSE =3D "LGPLv2.1" > > >> +LIC_FILES_CHKSUM =3D "file://COPYING;md5=3D6626bb1e20189cfa95f2c508= ba286393" > > >> + > > >> +DEPENDS_class-target =3D "popt efivar-native" > > >> + > > >> +SRCREV =3D "01abee43d6d6e755f56a4135ab5aa0bfad609ce2" > > >> +SRC_URI =3D "git://github.com/rhinstaller/efivar.git" > > >> +SRC_URI_append_class-target =3D " file://0001-efivar-fix-for-cross-= compile.patch" > > >> + > > >> +S =3D "${WORKDIR}/git" > > >> + > > >> +# Setting CROSS_COMPILE breaks pkgconfig, so just set AR > > >> +EXTRA_OEMAKE =3D "AR=3D${TARGET_PREFIX}gcc-ar" > > >> + > > >> +do_compile_prepend() { > > >> + sed -i -e s:-Werror::g ${S}/gcc.specs > > >> +} > > >> + > > >> +do_compile_class-native() { > > >> + oe_runmake -C src makeguids > > >> +} > > >> + > > >> +do_install() { > > >> + oe_runmake install DESTDIR=3D${D} > > >> +} > > >> + > > >> +do_install_class-native() { > > >> + install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids > > >> +} > > >> + > > >> +BBCLASSEXTEND =3D "native" > > >> + > > >> -- > > >> 2.4.3 > > >> > > >> -- > > >> _______________________________________________ > > >> 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 > >=20 > >=20 > >=20 > > --=20 > > Koen Kooi > >=20 > > Builds and Baselines | Release Manager > > Linaro.org | Open source software for ARM SoCs >=20 > --=20 > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --x+6KMIRAuhnl3hBn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlba0f4ACgkQN1Ujt2V2gBxtmQCgleym+IBP5WU8F3WwsyxS578w bckAn2qUrmldlwDnISV6VzX0UsKEHkRn =+g9h -----END PGP SIGNATURE----- --x+6KMIRAuhnl3hBn--