[OE-core] [PATCH 1/4] screen: Upgrade 4.4.0 -> 4.5.0
Removed the following Backported patches: 1. 0001-fix-for-multijob-build.patch 2. 0002-comm.h-now-depends-on-term.h.patch Signed-off-by: Maxin B. John--- .../screen/0001-fix-for-multijob-build.patch | 58 -- .../screen/0002-comm.h-now-depends-on-term.h.patch | 33 .../screen/{screen_4.4.0.bb => screen_4.5.0.bb}| 6 +-- 3 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch rename meta/recipes-extended/screen/{screen_4.4.0.bb => screen_4.5.0.bb} (88%) diff --git a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted file mode 100644 index fbdb0eb..000 --- a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Tue, 26 Jul 2016 14:23:59 +0800 -Subject: [PATCH] fix for multijob build - -make sure that comm.sh script generates comm.h header before doing -anything else - -Signed-off-by: Amadeusz Sawiski - -Upstream-Status: Backport - -Backport patch to fix parallel build failure and update context to make patch -coulde be applied. - -http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd - -Signed-off-by: Kai Kang -Signed-off-by: Jackie Huang - Makefile.in | 8 - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index aca7da3..3607711 100644 a/Makefile.in -+++ b/Makefile.in -@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a - comm.h layer.h term.h image.h display.h window.h mark.h extern.h - tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ - layer.h term.h image.h display.h window.h extern.h --term.o: layout.h viewport.h canvas.h term.c term.h -+term.o: layout.h viewport.h canvas.h term.c term.h comm.h - window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \ - comm.h layer.h term.h image.h display.h window.h extern.h logfile.h - utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \ -@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a - comm.h layer.h term.h image.h display.h window.h extern.h \ - braille.h - comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h --kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h -+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h - acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ - layer.h term.h image.h display.h window.h extern.h - braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \ -@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a - viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ - comm.h layer.h term.h image.h display.h window.h extern.h \ - braille.h --list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h --list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h -+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h -+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h - list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h - --- -1.9.1 - diff --git a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch b/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch deleted file mode 100644 index b5d71cc..000 --- a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Backport - -Backport from: - -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c - -Signed-off-by: Kai Kang -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 -From: Mike Gerwitz -Date: Tue, 24 Dec 2013 22:16:31 -0500 -Subject: [PATCH] comm.h now depends on term.h - - src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index e791e79..d4f7c0b 100644 a/Makefile.in -+++ b/Makefile.in -@@ -113,7 +113,7 @@ term.h: term.c term.sh - - kmapdef.c: term.h - --comm.h: comm.c comm.sh config.h -+comm.h: comm.c comm.sh config.h term.h - AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh
[OE-core] [PATCH 2/4] libtasn1: Upgrade 4.9 -> 4.10
Removed the following Backported patches: 1. 0001-configure-don-t-add-Werror-to-build-flags.patch 2. 0002-ASN.y-corrected-compiler-warning.patch 3. 0003-parser_aux-corrected-potential-null-pointer-derefere.patch 4. 0004-tools-eliminated-compiler-warnings.patch Signed-off-by: Maxin B. John--- ...configure-don-t-add-Werror-to-build-flags.patch | 28 - .../0002-ASN.y-corrected-compiler-warning.patch| 28 - ...corrected-potential-null-pointer-derefere.patch | 73 -- .../0004-tools-eliminated-compiler-warnings.patch | 56 - .../gnutls/{libtasn1_4.9.bb => libtasn1_4.10.bb} | 8 +-- 5 files changed, 2 insertions(+), 191 deletions(-) delete mode 100644 meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch delete mode 100644 meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch delete mode 100644 meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch delete mode 100644 meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch rename meta/recipes-support/gnutls/{libtasn1_4.9.bb => libtasn1_4.10.bb} (59%) diff --git a/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch b/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch deleted file mode 100644 index ae64394..000 --- a/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 908e9fa4c1172f09e0e45420a403dc25ed0a466c Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Tue, 26 Jul 2016 08:45:33 +0200 -Subject: [PATCH 1/4] configure: don't add -Werror to build flags - -Upstream-Status: Backport -Signed-off-by: Khem Raj - - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7a14e04..066f5fe 100644 a/configure.ac -+++ b/configure.ac -@@ -70,8 +70,6 @@ AC_ARG_ENABLE([gcc-warnings], - ) - - if test "$gl_gcc_warnings" = yes; then -- gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) -- - nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings - nw="$nw -Wc++-compat" # We don't care strongly about C++ compilers - nw="$nw -Wtraditional"# Warns on #elif which we use often --- -1.9.1 - diff --git a/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch b/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch deleted file mode 100644 index dd36422..000 --- a/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3542c01618fcde83b29640ea2c60bfd2629ae0b7 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Tue, 26 Jul 2016 08:47:49 +0200 -Subject: [PATCH 2/4] ASN.y: corrected compiler warning - -Upstream-Status: Backport -Signed-off-by: Khem Raj - - lib/ASN1.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ASN1.y b/lib/ASN1.y -index 731415d..6db638f 100644 a/lib/ASN1.y -+++ b/lib/ASN1.y -@@ -621,7 +621,7 @@ _asn1_create_errorDescription (int error, char *error_desc) - case ASN1_NAME_TOO_LONG: - snprintf (error_desc, ASN1_MAX_ERROR_DESCRIPTION_SIZE, - "%s:%u: name too long (more than %u characters)", file_name, --line_number, ASN1_MAX_NAME_SIZE); -+line_number, (unsigned)ASN1_MAX_NAME_SIZE); - break; - case ASN1_IDENTIFIER_NOT_FOUND: - snprintf (error_desc, ASN1_MAX_ERROR_DESCRIPTION_SIZE, --- -1.9.1 - diff --git a/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch b/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch deleted file mode 100644 index 2420143..000 --- a/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c8903aa27dc9de1d9efeed9d1f7894f1019548f7 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Tue, 26 Jul 2016 08:49:15 +0200 -Subject: [PATCH 3/4] parser_aux: corrected potential null pointer dereferences - -Upstream-Status: Backport -Signed-off-by: Khem Raj - - lib/parser_aux.c | 12 ++-- - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/parser_aux.c b/lib/parser_aux.c -index 2285b20..12ee16f 100644 a/lib/parser_aux.c -+++ b/lib/parser_aux.c -@@ -637,7 +637,7 @@ _asn1_change_integer_value (asn1_node node) - p = NULL; - break; - } --if (p->right) -+if (p && p->right) - {
[OE-core] [PATCH 3/4] libpng: Upgrade 1.6.26 -> 1.6.28
This upgrade fixes the vulnerability: CVE-2016-10087 License file changes are due to updates in Package Version and Copyright date. ie: 'libpng version 1.6.28, January 5, 2017' Signed-off-by: Maxin B. John--- .../libpng/{libpng_1.6.26.bb => libpng_1.6.28.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-multimedia/libpng/{libpng_1.6.26.bb => libpng_1.6.28.bb} (67%) diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.26.bb b/meta/recipes-multimedia/libpng/libpng_1.6.28.bb similarity index 67% rename from meta/recipes-multimedia/libpng/libpng_1.6.26.bb rename to meta/recipes-multimedia/libpng/libpng_1.6.28.bb index 8c1cb8c..9cb2967 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.26.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.28.bb @@ -2,14 +2,14 @@ SUMMARY = "PNG image format decoding library" HOMEPAGE = "http://www.libpng.org/; SECTION = "libs" LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ce8d0bd8303802e5492f064ef0e7 \ - file://png.h;endline=149;md5=8cca27e71fd88e1fe1adad7d9e841b5f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=67d8837410863f9821bbd606536f0329 \ + file://png.h;endline=144;md5=abfa0497feb393b5842d3d82c1009520" DEPENDS = "zlib" SRC_URI = "${GENTOO_MIRROR}/libpng-${PV}.tar.xz \ " -SRC_URI[md5sum] = "faed9bb495d2e12dd0c9ec561ca60cd8" -SRC_URI[sha256sum] = "266743a326986c3dbcee9d89b640595f6b16a293fd02b37d8c91348d317b73f9" +SRC_URI[md5sum] = "425354f86c392318d31aedca71019372" +SRC_URI[sha256sum] = "d8d3ec9de6b5db740fefac702c37ffcf96ae46cb17c18c1544635a3852f78f7a" BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] libpng12: Upgrade 1.2.56 -> 1.2.57
This upgrade fixes the vulnerability: CVE-2016-10087 License file changes are due to updates in Version and Copyright date. ie: 'libpng versions 1.0.7, July 1, 2000, through 1.2.57, December 29, 2016, are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson' Signed-off-by: Maxin B. John--- .../libpng/{libpng12_1.2.56.bb => libpng12_1.2.57.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-lsb4/libpng/{libpng12_1.2.56.bb => libpng12_1.2.57.bb} (73%) diff --git a/meta/recipes-lsb4/libpng/libpng12_1.2.56.bb b/meta/recipes-lsb4/libpng/libpng12_1.2.57.bb similarity index 73% rename from meta/recipes-lsb4/libpng/libpng12_1.2.56.bb rename to meta/recipes-lsb4/libpng/libpng12_1.2.57.bb index 10c350a..0d5a2c4 100644 --- a/meta/recipes-lsb4/libpng/libpng12_1.2.56.bb +++ b/meta/recipes-lsb4/libpng/libpng12_1.2.57.bb @@ -2,8 +2,8 @@ SUMMARY = "PNG image format decoding library" HOMEPAGE = "http://www.libpng.org/; SECTION = "libs" LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7f289af309d98b46321d0f9892def16 \ - file://png.h;beginline=19;endline=109;md5=10c940148fe379a535b310c1c54e609c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=597b8a91994a3e27ae6aa79bf02677d9 \ + file://png.h;beginline=19;endline=109;md5=166406397718925b660f0033f7558ef7" DEPENDS = "zlib" PN = "libpng12" @@ -11,8 +11,8 @@ S = "${WORKDIR}/libpng-${PV}" SRC_URI = "${GENTOO_MIRROR}/libpng-${PV}.tar.xz" -SRC_URI[md5sum] = "868562bd1c58b76ed8703f135a2e439a" -SRC_URI[sha256sum] = "24ce54581468b937734a6ecc86f7e121bc46a90d76a0d948dca08f32ee000dbe" +SRC_URI[md5sum] = "307052e5e8af97b82b17b64fb1b3677a" +SRC_URI[sha256sum] = "0f4620e11fa283fedafb474427c8e96bf149511a1804bdc47350963ae5cf54d8" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libpng/files/libpng12/; UPSTREAM_CHECK_REGEX = "/libpng12/(?P(\d+[\.\-_]*)+)/" -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 1/1] libgcc-common.inc: Fix symbol link to mutilib directories
Hi, On Mon, 2017-01-23 at 11:48 +0800, Yuanjie Huang wrote: > From: Yuanjie Huang> > The multilib symbol links are created for gcc to locate libgcc files. > Its source path contains TARGET_SYS of multilib libgcc. However, a > multilib's TARGET_SYS is not generated correctly all the time now. > For example, > > MACHINE = "qemumips64" > DEFAULTTUNE = "mips64-n32" > MULTILIBS = "multilib:lib64" > DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" > > In N32 libgcc, the symbol link for N64 is created as: > > 64 -> ../../../lib64/mips64-wrsmllib64-linux-gnun32/5.2.0/ > > while it should be: > > 64 -> ../../../lib64/mips64-wrsmllib64-linux/5.2.0/ > > This issue sometimes won't break compiler, since gcc also searches > paths > calculated with OS multilib directories beside multilib directories . > > This patch resolve the problem by reading TARGET_SYS from a localdata > environment with proper multilib overrides. > > Signed-off-by: Yuanjie Huang > --- > meta/recipes-devtools/gcc/libgcc-common.inc | 15 +++ > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc > b/meta/recipes-devtools/gcc/libgcc-common.inc > index a8a3f0d..69eeb26 100644 > --- a/meta/recipes-devtools/gcc/libgcc-common.inc > +++ b/meta/recipes-devtools/gcc/libgcc-common.inc > @@ -106,20 +106,19 @@ fakeroot python do_multilib_install() { > bb.warn("Tune %s doesn't have a baselib set. > Skipping..." % tune) > continue > > -tune_arch = tune_parameters['arch'] > tune_bitness = tune_baselib.replace('lib', '') > if not tune_bitness: > tune_bitness = '32' # /lib => 32bit lib > > -tune_abiextension = tune_parameters['abiextension'] > -if tune_abiextension: > -libcextension = '-gnu' + tune_abiextension > -else: > -libcextension = '' > +localdata = bb.data.createCopy(d) > +overrides = localdata.getVar("OVERRIDES", False) + > ":virtclass-multilib-" + ml > +localdata.setVar("OVERRIDES", overrides) > +localdata.setVar("MLPREFIX", ml + "-") > +bb.data.update_data(localdata) > +ml_target_sys = localdata.getVar('TARGET_SYS', True) or '' > Please take advantage of: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=a49ee524a933b433ea9c2e2be1bbf24909fcde77 Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH V3] libgcc-common.inc: Fix symbol link to mutilib directories
The multilib symbol links are created for gcc to locate libgcc files. Its source path contains TARGET_SYS of multilib libgcc. However, a multilib's TARGET_SYS is not generated correctly all the time now. For example, MACHINE = "qemumips64" DEFAULTTUNE = "mips64-n32" MULTILIBS = "multilib:lib64" DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" In N32 libgcc, the symbol link for N64 is created as: 64 -> ../../../lib64/mips64-wrsmllib64-linux-gnun32/5.2.0/ while it should be: 64 -> ../../../lib64/mips64-wrsmllib64-linux/5.2.0/ This issue sometimes won't break compiler, since gcc also searches paths calculated with OS multilib directories beside multilib directories . This patch resolve the problem by reading TARGET_SYS from a localdata environment with proper multilib overrides. Signed-off-by: Yuanjie Huang--- meta/recipes-devtools/gcc/libgcc-common.inc | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index 7a3b410..7198664 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -106,20 +106,15 @@ fakeroot python do_multilib_install() { bb.warn("Tune %s doesn't have a baselib set. Skipping..." % tune) continue -tune_arch = tune_parameters['arch'] tune_bitness = tune_baselib.replace('lib', '') if not tune_bitness: tune_bitness = '32' # /lib => 32bit lib -tune_abiextension = tune_parameters['abiextension'] -if tune_abiextension: -libcextension = '-gnu' + tune_abiextension -else: -libcextension = '' +localdata = get_multilib_datastore(ml, d) +ml_target_sys = localdata.getVar('TARGET_SYS') or '' src = '../../../' + tune_baselib + '/' + \ -tune_arch + d.getVar('TARGET_VENDOR') + 'ml' + ml + \ -'-' + d.getVar('TARGET_OS') + libcextension + '/' + binv + '/' +ml_target_sys + '/' + binv + '/' dest = d.getVar('D') + d.getVar('libdir') + '/' + \ d.getVar('TARGET_SYS') + '/' + binv + '/' + tune_bitness -- 2.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gstreamer1.0-plugins-base: disable ivorbis
Even old hardware these days doesn't really need fixed-integer Vorbis decoding by default, so disable Tremor out of the box. Signed-off-by: Ross Burton--- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc index a04f155..1c56200 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc @@ -19,7 +19,7 @@ PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ -gio-unix-2.0 ivorbis ogg pango theora vorbis \ +gio-unix-2.0 ogg pango theora vorbis \ " X11DEPENDS = "virtual/libx11 libsm libxrender libxv" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: Guard against interrupted compiles
On Mon, 2017-01-23 at 12:26 +, Richard Purdie wrote: > diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes- > core/busybox/busybox.inc > index 1f4a48c..f247e8d 100644 > --- a/meta/recipes-core/busybox/busybox.inc > +++ b/meta/recipes-core/busybox/busybox.inc > @@ -141,6 +141,10 @@ do_compile() { > unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS > if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep > "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then > # split the .config into two parts, and make two busybox > binaries > + if [ -e .config.org ]; then > + # Need to guard again an interrupted > do_compile - restore any backup > + cp .config.orig .config > + fi I have fixed the typo... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] tremor: Use mirror tarball instead of svn url
This is the only remaining svn url in OE-Core and building subversion-native for things like the url checker is wearing and slows down builds. Since this rarely changes, use the mirror tarball instead. Signed-off-by: Richard Purdie--- meta/recipes-multimedia/tremor/tremor_20150107.bb | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/tremor/tremor_20150107.bb b/meta/recipes-multimedia/tremor/tremor_20150107.bb index 937894a..96834bd9 100644 --- a/meta/recipes-multimedia/tremor/tremor_20150107.bb +++ b/meta/recipes-multimedia/tremor/tremor_20150107.bb @@ -13,10 +13,15 @@ RECIPE_UPSTREAM_VERSION = "20150107" RECIPE_UPSTREAM_DATE = "Jan 07, 2015" CHECK_DATE = "Aug 12, 2015" -SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=19427;protocol=http \ +# Only subversion url left in OE-Core, use a mirror tarball instead since +# this rarely changes. +# svn://svn.xiph.org/trunk;module=Tremor;rev=19427;protocol=http +SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/Tremor_svn.xiph.org_.trunk_19427_.tar.gz \ file://obsolete_automake_macros.patch;striplevel=0 \ file://tremor-arm-thumb2.patch \ " +SRC_URI[md5sum] = "b308f9598176c0b5059c0124ab122afe" +SRC_URI[sha256sum] = "2196802e1635f9ac44740fe4da12e6c1ad3942862427a67268de2b65b1d4" S = "${WORKDIR}/Tremor" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] How to use WIC to generate raw flash images
On Fri, Jan 20, 2017 at 10:37:15AM -0800, Rick Altherr wrote: > For OpenBMC (based on Yocto), the target is an SoC that has an external > boot flash connected via SPI. Right now, we have a class ( > https://github.com/openbmc/openbmc/blob/master/meta-phosphor/classes/image-overlay.bbclass) > used by our top-level image recipe ( > https://github.com/openbmc/openbmc/blob/master/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb) > that manually constructs a flash image from the kernel, rootfs, etc. This is indeed very interesting work. We definitely need support of flash images in oe-core. > I'd like to move to an upstream-supported approach and I think that is WIC. > What I don't understand is: > - How do I build a raw flash image where it is divided into partitions but > has no partition table? Wic doesn't support this type of images, but it shouldn't be hard to add option to skip partitioning to .wks syntax and wic code. > - How do I set padding to be 0xFF instead of 0x00? The same thing here. Currently wic images are sparse files created by os.ftruncate, but it's not a big deal to fill them with 0xFF > - How do I include u-boot in the image? This can be done by using/extending rawcopy plugin or writing similar one. > Do I need to add a new imager plugin to support writing raw images with > non-zero padding and no partition table? For U-Boot, do I add a new > bootimg plugin? This sounds reasonable. Can you create a bug for this in bugzilla to discuss design and implementation details? -- Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: Guard against interrupted compiles
If busybox is interrupted during do_compile, it can corrupt .config with the suid version, or worse. Typically this leads to files disappearing, particularly /etc/init.d/* which leads to an empty busybox-hwclock. That then results in errors at do_rootfs time due to the missing package. The fix is to use any 'orig' present to restore stat at the start of compile. Signed-off-by: Richard Purdie--- meta/recipes-core/busybox/busybox.inc | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 1f4a48c..f247e8d 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -141,6 +141,10 @@ do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then # split the .config into two parts, and make two busybox binaries + if [ -e .config.org ]; then + # Need to guard again an interrupted do_compile - restore any backup + cp .config.orig .config + fi cp .config .config.orig oe_runmake busybox.cfg.suid oe_runmake busybox.cfg.nosuid -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH V3] libgcc-common.inc: Fix symbol link to mutilib directories
On Mon, 2017-01-23 at 00:29 -0800, Yuanjie Huang wrote: > The multilib symbol links are created for gcc to locate libgcc files. > Its source path contains TARGET_SYS of multilib libgcc. However, a > multilib's TARGET_SYS is not generated correctly all the time now. > For example, > > MACHINE = "qemumips64" > DEFAULTTUNE = "mips64-n32" > MULTILIBS = "multilib:lib64" > DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" > > In N32 libgcc, the symbol link for N64 is created as: > > 64 -> ../../../lib64/mips64-wrsmllib64-linux-gnun32/5.2.0/ > > while it should be: > > 64 -> ../../../lib64/mips64-wrsmllib64-linux/5.2.0/ > > This issue sometimes won't break compiler, since gcc also searches > paths > calculated with OS multilib directories beside multilib directories . > > This patch resolve the problem by reading TARGET_SYS from a localdata > environment with proper multilib overrides. > > Signed-off-by: Yuanjie Huang> --- > meta/recipes-devtools/gcc/libgcc-common.inc | 11 +++ > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc > b/meta/recipes-devtools/gcc/libgcc-common.inc > index 7a3b410..7198664 100644 > --- a/meta/recipes-devtools/gcc/libgcc-common.inc > +++ b/meta/recipes-devtools/gcc/libgcc-common.inc > @@ -106,20 +106,15 @@ fakeroot python do_multilib_install() { > bb.warn("Tune %s doesn't have a baselib set. > Skipping..." % tune) > continue > > -tune_arch = tune_parameters['arch'] > tune_bitness = tune_baselib.replace('lib', '') > if not tune_bitness: > tune_bitness = '32' # /lib => 32bit lib > > -tune_abiextension = tune_parameters['abiextension'] > -if tune_abiextension: > -libcextension = '-gnu' + tune_abiextension > -else: > -libcextension = '' > +localdata = get_multilib_datastore(ml, d) > +ml_target_sys = localdata.getVar('TARGET_SYS') or '' > > src = '../../../' + tune_baselib + '/' + \ > -tune_arch + d.getVar('TARGET_VENDOR') + 'ml' + ml + \ > -'-' + d.getVar('TARGET_OS') + libcextension + '/' + > binv + '/' > +ml_target_sys + '/' + binv + '/' > > dest = d.getVar('D') + d.getVar('libdir') + '/' + \ > d.getVar('TARGET_SYS') + '/' + binv + '/' + tune_bitness This looks better, thanks. Looking at the function a bit more, I suspect we should probably do something like: tune_bitness = (localdata.getVar('baselib') or '').replace('lib', '') and then drop the get_tune_parameters call entirely. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3] alsa-lib: update 1.1.2 -> 1.1.3
On 23 January 2017 at 13:29, Andreas Müllerwrote: > +# no python -> smixer is not build > +ALLOW_EMPTY_${PN} = "1" > Not sure this is the right fix. What package does the Python support go into? The smixer files should be in that package, and the real dependency on PN-dev is to libasound, not PN. Can we fiddle the PN-dev RDEPENDS to ensure that it depends on libasound instead of PN? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] enable swtpm-native
swtpm (from meta-security) can be compiled for the host and then be used to provide a virtual TPM device in qemu. However, it depends on the native flavor of some recipes in OE-core. Patrick Ohly (2): expect: support native compilation socat: support native compilation meta/recipes-connectivity/socat/socat_1.7.3.1.bb | 5 - meta/recipes-devtools/expect/expect_5.45.bb | 9 - 2 files changed, 12 insertions(+), 2 deletions(-) base-commit: 5ecdab6c2589a83bbbc522074052ff4438782102 -- git-series 0.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] expect: support native compilation
This is needed for building the swtpm TPM simulator (recipe in meta-security). "nativesdk" is added just in case that someone also wants this in an SDK. Signed-off-by: Patrick Ohly--- meta/recipes-devtools/expect/expect_5.45.bb | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb index b4dfe15..ab22a61 100644 --- a/meta/recipes-devtools/expect/expect_5.45.bb +++ b/meta/recipes-devtools/expect/expect_5.45.bb @@ -43,11 +43,16 @@ do_install_append() { sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl } +# Apparently the public Tcl headers are only in /usr/include/tcl8.6 +# when building for the target. +TCL_INCLUDE_PATH = "" +TCL_INCLUDE_PATH_class-target = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6" + EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \ - --with-tclinclude=${STAGING_INCDIR}/tcl8.6 \ --enable-shared \ --enable-threads \ --disable-rpath \ + ${TCL_INCLUDE_PATH} \ " EXTRA_OEMAKE_install = " 'SCRIPTS=' " @@ -62,3 +67,5 @@ FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ FILES_${PN} += "${libdir}/libexpect${PV}.so \ ${libdir}/expect${PV}/* \ " + +BBCLASSEXTEND = "native nativesdk" -- git-series 0.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] qemu: Upgrade to 2.7.1
On Mon, 2017-01-23 at 15:29 +0100, Patrick Ohly wrote: > On Mon, 2017-01-23 at 16:01 +0200, Alexander Kanavin wrote: > > > > On 01/20/2017 09:44 PM, Patrick Ohly wrote: > > > > > > > > In contrast to Alexander, I would also keep > > > http://wiki.qemu-project.org/download/${BP}.tar.bz2 in > > > qemu_2.7.1.bb > > > with SRC_URI =+ because then there can be a qemu_git.bb with a > > > different > > > URL than the one above. > > I would discourage creation of such separate _git recipes, unless > > there > > is a clear benefit to the whole of oe-core. They are almost always > > untested and neglected, and eventually removed because they're > > outdated > > and broken and no one cares. > I wasn't suggesting to add one, just using the possibility that one > might want to add one as the rationale for keeping the download URL > for > the tarball out of the .inc file. > > It's all rather subjective and hinges on the likelihood of adding a > _git.bb (don't include it in the .inc) vs. adding more than one > versioned .bb (then including the common download in the .inc reduces > duplication). There is actually an alternative proposal somewhere in bugzilla which would be to leave enough markup that we can easily enable a git version. That markup mostly being the git:// url in a variable. Ross was looking at that. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] qemu: Upgrade to 2.7.1
On 01/20/2017 09:44 PM, Patrick Ohly wrote: In contrast to Alexander, I would also keep http://wiki.qemu-project.org/download/${BP}.tar.bz2 in qemu_2.7.1.bb with SRC_URI =+ because then there can be a qemu_git.bb with a different URL than the one above. I would discourage creation of such separate _git recipes, unless there is a clear benefit to the whole of oe-core. They are almost always untested and neglected, and eventually removed because they're outdated and broken and no one cares. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] qemu: Upgrade to 2.7.1
On Mon, 2017-01-23 at 16:01 +0200, Alexander Kanavin wrote: > On 01/20/2017 09:44 PM, Patrick Ohly wrote: > > > In contrast to Alexander, I would also keep > > http://wiki.qemu-project.org/download/${BP}.tar.bz2 in qemu_2.7.1.bb > > with SRC_URI =+ because then there can be a qemu_git.bb with a different > > URL than the one above. > > I would discourage creation of such separate _git recipes, unless there > is a clear benefit to the whole of oe-core. They are almost always > untested and neglected, and eventually removed because they're outdated > and broken and no one cares. I wasn't suggesting to add one, just using the possibility that one might want to add one as the rationale for keeping the download URL for the tarball out of the .inc file. It's all rather subjective and hinges on the likelihood of adding a _git.bb (don't include it in the .inc) vs. adding more than one versioned .bb (then including the common download in the .inc reduces duplication). -- Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] alsa-lib: update 1.1.2 -> 1.1.3
* add PACKAGECONFIF for python: smixer is build with python only * allow empty alsa-lib package for python disabled * fix EXTRA_OECONF: soft-float was never enabled * alsa-fpu.inc: replace tabs by spaces Signed-off-by: Andreas Müller--- meta/recipes-multimedia/alsa/alsa-fpu.inc | 6 ++-- .../alsa-lib/0001-ucm-parser-needs-limits.h.patch | 33 .../0002-use-pkg-config-to-find-python.patch | 36 ++ .../alsa/{alsa-lib_1.1.2.bb => alsa-lib_1.1.3.bb} | 12 +--- 4 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0002-use-pkg-config-to-find-python.patch rename meta/recipes-multimedia/alsa/{alsa-lib_1.1.2.bb => alsa-lib_1.1.3.bb} (75%) diff --git a/meta/recipes-multimedia/alsa/alsa-fpu.inc b/meta/recipes-multimedia/alsa/alsa-fpu.inc index 1ca31e7..943fae6 100644 --- a/meta/recipes-multimedia/alsa/alsa-fpu.inc +++ b/meta/recipes-multimedia/alsa/alsa-fpu.inc @@ -1,6 +1,6 @@ def get_alsa_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "--with-softfloat" - return "" +if d.getVar('TARGET_FPU') in [ 'soft' ]: +return "--with-softfloat" +return "" diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch new file mode 100644 index 000..9d464f4 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch @@ -0,0 +1,33 @@ +From 9ed4075f05a4242f32331f7f2c365767970f5003 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Wed, 21 Dec 2016 19:46:34 -0300 +Subject: [PATCH] ucm: parser needs limits.h + +It's using PATH_MAX which is defined there, otherwise the build fails on +musl libc. + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Takashi Iwai + +Upstream-Status: Backport [1] + +[1] http://git.alsa-project.org/?p=alsa-lib.git;a=commit;h=9ed4075f05a4242f32331f7f2c365767970f5003 +--- + src/ucm/parser.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ucm/parser.c b/src/ucm/parser.c +index c98373a..f520abc 100644 +--- a/src/ucm/parser.c b/src/ucm/parser.c +@@ -32,6 +32,7 @@ + + #include "ucm_local.h" + #include ++#include + + /** The name of the environment variable containing the UCM directory */ + #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" +-- +2.7.4 + diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0002-use-pkg-config-to-find-python.patch b/meta/recipes-multimedia/alsa/alsa-lib/0002-use-pkg-config-to-find-python.patch new file mode 100644 index 000..b7748c3 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/0002-use-pkg-config-to-find-python.patch @@ -0,0 +1,36 @@ +From ab5010c7098e7d580189553ac30c6b5d85950fe3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 23 Jan 2017 14:13:23 +0100 +Subject: [PATCH] use pkg-config to find python +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 83f0ac3..264188d 100644 +--- a/configure.ac b/configure.ac +@@ -388,11 +388,11 @@ if test "$build_python" = "yes"; then + AC_ARG_WITH(pythonlibs, + AS_HELP_STRING([--with-pythonlibs=ldflags], + [specify python libraries (-lpthread -lm -ldl -lpython2.4)]), +-pythonlibs="$withval", pythonlibs=`python-config --libs`) ++pythonlibs="$withval", pythonlibs=`pkg-config --libs python`) + AC_ARG_WITH(pythonincludes, + AS_HELP_STRING([--with-pythonincludes=Cflags], + [specify python C header files (-I/usr/include/python)]), +-pythonincludes="$withval", pythonincludes=`python-config --includes`) ++pythonincludes="$withval", pythonincludes=`pkg-config --cflags python`) + if test -z "$pythonlibs"; then + echo "Unable to determine python libraries! Probably python-config is not" + echo "available on this system. Please, use --with-pythonlibs and" +-- +2.7.4 + diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb similarity index 75% rename from meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb rename to meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb index e313da7..3e0b7e0 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb @@ -11,21 +11,25 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
[OE-core] [PATCH] openssl: Fix symlink creation
Symlinking the openssl configuration file at install time results in errors when overriding it using an external package which also provides openssl-conf. This should be done as a postinstall task for such packages. Signed-off-by: David Vincent--- meta/recipes-connectivity/openssl/openssl.inc | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 5cca019e1d..696b564cdd 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -201,7 +201,6 @@ do_install () { ${D}${sysconfdir}/ssl/ ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private - ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf } do_install_ptest () { @@ -245,4 +244,16 @@ do_install_append_class-native() { OPENSSL_ENGINES=${libdir}/ssl/engines } +pkg_postinst_openssl-conf () { +#!/bin/sh +if [ -e $D${libdir}/ssl/openssl.cnf ]; then + rm -f $D${libdir}/ssl/openssl.cnf +fi + +# If openssl-conf is installed before openssl, we must ensure that the symlink +# destination exists +mkdir -p $D${libdir}/ssl/ +ln -s ${sysconfdir}/ssl/openssl.cnf $D${libdir}/ssl/openssl.cnf +} + BBCLASSEXTEND = "native nativesdk" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/55] OEQA Framework Refactor & Improvements
On Sat, 2017-01-21 at 12:28 +, Richard Purdie wrote: > On Fri, 2017-01-20 at 11:09 -0600, Aníbal Limón wrote: > > > > This patchset is related to OEQA Framework for details read the RFC > > send to the > > Openembedded architecture ML. > > > > http://lists.openembedded.org/pipermail/openembedded-architecture/2 > > 01 > > 6-December/000351.html > > > > Also adds the migration of the runtime testing leaving only > > selftest > > remains > > to migrate. > > > > The testing was made using GDC Autobuilder building in different > > archs and running selftest. > Thanks, I'm testing this on the autobuilder, it seems mostly good but > so far we've seen this issue: > > https://autobuilder.yocto.io/builders/nightly-qa-skeleton/builds/145/ > st > eps/Running%20Sanity%20Tests/logs/stdio > > Please send any further patches on top of this series. To update, the fix was trivial and the only issue uncovered by testing so I've merged a fix into the appropriate commit as I merged the series. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: Guard against interrupted compiles
On Mon, 2017-01-23 at 15:37 +0100, Mario Domenech Goulart wrote: > On Mon, 23 Jan 2017 13:05:48 + Richard Purdieuxfoundation.org> wrote: > > On Mon, 2017-01-23 at 13:56 +0100, Mario Domenech Goulart wrote: > > > On Mon, 23 Jan 2017 12:35:52 + Richard Purdie > > > wrote: > > > Wouldn't it be better to have something like > > > > > > cp .config.orig .config || true > > > > > > instead, to prevent race conditions? > > Prevent which race condition? I'd hope at this point we're the only > > thing touching the .config file? > Yeah, I hope so. > > I mean, the "if exists(file){ do_something_with(file) }" idiom is > intrinsically subject to race conditions (time of check to time of > use). > If we can [easily] avoid them, why not? I think it makes the code harder to read/understand and we don't need to do that... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: Guard against interrupted compiles
On Mon, 2017-01-23 at 13:56 +0100, Mario Domenech Goulart wrote: > Hi, > > On Mon, 23 Jan 2017 12:35:52 + Richard Purdieuxfoundation.org> wrote: > > > > > On Mon, 2017-01-23 at 12:26 +, Richard Purdie wrote: > > > > > > diff --git a/meta/recipes-core/busybox/busybox.inc > > > b/meta/recipes- > > > core/busybox/busybox.inc > > > index 1f4a48c..f247e8d 100644 > > > --- a/meta/recipes-core/busybox/busybox.inc > > > +++ b/meta/recipes-core/busybox/busybox.inc > > > @@ -141,6 +141,10 @@ do_compile() { > > > unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS > > > if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep > > > "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then > > > # split the .config into two parts, and make two busybox > > > binaries > > > + if [ -e .config.org ]; then > > > + # Need to guard again an interrupted > > > do_compile - restore any backup > > > + cp .config.orig .config > > > + fi > > I have fixed the typo... > Wouldn't it be better to have something like > > cp .config.orig .config || true > > instead, to prevent race conditions? Prevent which race condition? I'd hope at this point we're the only thing touching the .config file? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: Guard against interrupted compiles
Hi, On Mon, 23 Jan 2017 12:35:52 + Richard Purdiewrote: > On Mon, 2017-01-23 at 12:26 +, Richard Purdie wrote: >> diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes- >> core/busybox/busybox.inc >> index 1f4a48c..f247e8d 100644 >> --- a/meta/recipes-core/busybox/busybox.inc >> +++ b/meta/recipes-core/busybox/busybox.inc >> @@ -141,6 +141,10 @@ do_compile() { >> unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS >> if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep >> "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then >> # split the .config into two parts, and make two busybox >> binaries >> +if [ -e .config.org ]; then >> +# Need to guard again an interrupted >> do_compile - restore any backup >> +cp .config.orig .config >> +fi > > I have fixed the typo... Wouldn't it be better to have something like cp .config.orig .config || true instead, to prevent race conditions? All the best. Mario -- http://parenteses.org/mario -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] useradd-staticids: Fix groupadd
When a group name is duplicated between USERADD_PARAM and GROUPADD_PARAM, this class tries to add it twice which results in failure of the groupadd command. Signed-off-by: David Vincent--- meta/classes/useradd-staticids.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index f7f6057ac3..a309b8873d 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -165,7 +165,9 @@ def update_useradd_static_config(d): if newgroup and is_pkg: groupadd = d.getVar("GROUPADD_PARAM_%s" % pkg) if groupadd: -d.setVar("GROUPADD_PARAM_%s" % pkg, "%s; %s" % (groupadd, newgroup)) +# Only add the group if not already specified +if not uaargs.groupname in groupadd: +d.setVar("GROUPADD_PARAM_%s" % pkg, "%s; %s" % (groupadd, newgroup)) else: d.setVar("GROUPADD_PARAM_%s" % pkg, newgroup) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] socat: support native compilation
This is needed for building the swtpm TPM simulator (recipe in meta-security). Native compilation disables tcp-wrappers by default to simplify the build. "nativesdk" is added just in case that someone also wants this in an SDK. Signed-off-by: Patrick Ohly--- meta/recipes-connectivity/socat/socat_1.7.3.1.bb | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.1.bb b/meta/recipes-connectivity/socat/socat_1.7.3.1.bb index 4da6d39..a579f1e 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.3.1.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.3.1.bb @@ -29,10 +29,13 @@ EXTRA_OECONF += "ac_cv_have_z_modifier=yes \ ac_cv_header_bsd_libutil_h=no \ " -PACKAGECONFIG ??= "tcp-wrappers" +PACKAGECONFIG_class-target ??= "tcp-wrappers" +PACKAGECONFIG ??= "" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" do_install_prepend () { mkdir -p ${D}${bindir} install -d ${D}${bindir} ${D}${mandir}/man1 } + +BBCLASSEXTEND = "native nativesdk" -- git-series 0.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: Guard against interrupted compiles
On Mon, 23 Jan 2017 13:05:48 + Richard Purdiewrote: > On Mon, 2017-01-23 at 13:56 +0100, Mario Domenech Goulart wrote: >> >> On Mon, 23 Jan 2017 12:35:52 + Richard Purdie >> wrote: >> >> > On Mon, 2017-01-23 at 12:26 +, Richard Purdie wrote: >> > > >> > > diff --git a/meta/recipes-core/busybox/busybox.inc >> > > b/meta/recipes- >> > > core/busybox/busybox.inc >> > > index 1f4a48c..f247e8d 100644 >> > > --- a/meta/recipes-core/busybox/busybox.inc >> > > +++ b/meta/recipes-core/busybox/busybox.inc >> > > @@ -141,6 +141,10 @@ do_compile() { >> > > unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS >> > > if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep >> > > "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then >> > > # split the .config into two parts, and make two busybox >> > > binaries >> > > +if [ -e .config.org ]; then >> > > +# Need to guard again an interrupted >> > > do_compile - restore any backup >> > > +cp .config.orig .config >> > > +fi >> > I have fixed the typo... >> Wouldn't it be better to have something like >> >> cp .config.orig .config || true >> >> instead, to prevent race conditions? > > Prevent which race condition? I'd hope at this point we're the only > thing touching the .config file? Yeah, I hope so. I mean, the "if exists(file){ do_something_with(file) }" idiom is intrinsically subject to race conditions (time of check to time of use). If we can [easily] avoid them, why not? All the best. Mario -- http://parenteses.org/mario -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] runqemu: more verbose error message about missing qemuboot.conf
When invoking "runqemu" with a mistyped image or architecture name, the resulting error message is about the missing qemuboot.conf, without any indication about the root cause: $ runqemu core-image-mimimal ext4 intel-corei7-64 runqemu - INFO - Assuming MACHINE = intel-corei7-64 runqemu - INFO - Running MACHINE=intel-corei7-64 bitbake -e... runqemu - INFO - MACHINE: intel-corei7-64 runqemu - INFO - DEPLOY_DIR_IMAGE: /fast/build/refkit/intel-corei7-64/tmp-glibc/deploy/images/intel-corei7-64 Traceback (most recent call last): File "/work/openembedded-core/scripts/runqemu", line 1095, in ret = main() File "/work/openembedded-core/scripts/runqemu", line 1082, in main config.read_qemuboot() File "/work/openembedded-core/scripts/runqemu", line 643, in read_qemuboot raise Exception("Failed to find .qemuboot.conf!") Exception: Failed to find .qemuboot.conf! Including the name of the actual file the scripts expects to find plus adding some hints what to check for might help. The error now is: $ runqemu core-image-mimimal ext4 intel-corei7-64 ... Exception: Failed to find .qemuboot.conf = .../tmp-glibc/deploy/images/intel-corei7-64/core-image-mimimal-intel-corei7-64.qemuboot.conf (wrong image name or BSP does not support running under qemu?). The comment about the BSP is included because that would be the real reason why the file might be missing. Signed-off-by: Patrick Ohly--- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index 10947bb3edc..eaf38384a5b 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -640,7 +640,7 @@ class BaseConfig(object): return if not os.path.exists(self.qemuboot): -raise Exception("Failed to find .qemuboot.conf!") +raise Exception("Failed to find .qemuboot.conf = %s (wrong image name or BSP does not support running under qemu?)." % self.qemuboot) logger.info('CONFFILE: %s' % self.qemuboot) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for openssh: Make sshd-config a package
David, This is what I get from the command line oe-core$ git pw mbox 4904 | git apply --check error: documentation/ref-manual/ref-variables.xml: No such file or directory Meaning that you have a patch on your series that is targeted for the documentation folder, which is not part of the oe-core project. The latter need to be sent to: documentation: Git repository: http://git.yoctoproject.org/cgit/cgit.cgi/yocto-docs/ Mailing list: yo...@yoctoproject.org On 01/23/2017 09:45 AM, David Vincent wrote: On lundi 23 janvier 2017 15:23:36 CET Patchwork wrote: == Series Details == Series: openssh: Make sshd-config a package Revision: 1 URL : https://patchwork.openembedded.org/series/4904/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 842ad404b3) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe This result seems to be an error since I rebased my patches on top of current HEAD before submitting it. I just checked again to see if some other patches were left behind but my branch is currently up-to-date. David -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ed: use yoctoproject mirror for SRC_URI
On 01/23/2017 06:20 PM, Ross Burton wrote: We shoud upgrade to the latest release but as new releases are only compressed using lzip that means adding lzip-native to oe-core, so this is a suitable short-term fix. -SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz" +SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz; Add UPSTREAM_CHECK_URI please (or file a bug), as I'll surely forget about the update if the RRS is going to report 'Up-to-date' for this. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for openssh: Make sshd-config a package
On lundi 23 janvier 2017 15:23:36 CET Patchwork wrote: > == Series Details == > > Series: openssh: Make sshd-config a package > Revision: 1 > URL : https://patchwork.openembedded.org/series/4904/ > State : failure > > == Summary == > > > Thank you for submitting this patch series to OpenEmbedded Core. This is > an automated response. Several tests have been executed on the proposed > series by patchtest resulting in the following failures: > > > > * Issue Series does not apply on top of target branch > [test_series_merge_on_head] Suggested fixRebase your series on top of > targeted branch > Targeted branch master (currently at 842ad404b3) > > > > If you believe any of these test results are incorrect, please reply to the > mailing list (openembedded-core@lists.openembedded.org) raising your > concerns. Otherwise we would appreciate you correcting the issues and > submitting a new version of the patchset if applicable. Please ensure you > add/increment the version number when sending the new version (i.e. [PATCH] > -> [PATCH v2] -> [PATCH v3] -> ...). > > --- > Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest > Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe This result seems to be an error since I rebased my patches on top of current HEAD before submitting it. I just checked again to see if some other patches were left behind but my branch is currently up-to-date. David -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sstatesig: don't squash dependencies of useradd packages
On Mon, 2017-01-23 at 16:55 +0200, Maxin B. John wrote: > Ping. This never merged as I was never 100% convinced this was the correct way to solve this problem. I'd be interested to understand if the sstatesig tests in oe-selftest worked after this. I'm hoping this issue has also now been resolved in a different way though the switch to recipe specific sysroots. Would you be able test if recipe specific sysroots have addressed this issue? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] connman: Add workaround to build with musl & 4.9 headers
Kernel headers break when musl defines IFF_LOWER_UP. While waiting for more proper fix in musl, add a workaround to connman. Signed-off-by: Jussi Kukkonen--- This was tested on top of ross/mut. ...x-compile-on-musl-with-kernel-4.9-headers.patch | 64 ++ meta/recipes-connectivity/connman/connman_1.33.bb | 3 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch diff --git a/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch b/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch new file mode 100644 index 000..bf3b86d --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch @@ -0,0 +1,64 @@ +From c8bfad4ee9d2c505c00ccbb8b2139543b5ad6fcb Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Mon, 23 Jan 2017 17:41:39 +0200 +Subject: [PATCH] Fix compile on musl with kernel 4.9 headers + +Kernel headers break when musl defines IFF_LOWER_UP. While +waiting for more proper fix in musl, add a hack to connman. + +Upstream-Status: Inappropriate [Workaround] +Signed-off-by: Jussi Kukkonen +--- + src/6to4.c | 4 + src/firewall.c | 4 + src/iptables.c | 4 + 3 files changed, 12 insertions(+) + +diff --git a/src/6to4.c b/src/6to4.c +index 71a2882..1938afb 100644 +--- a/src/6to4.c b/src/6to4.c +@@ -24,6 +24,10 @@ + #include + #endif + ++/* hack to make sure kernel headers understand that libc (musl) ++ does define IFF_LOWER_UP et al. */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #include + #include + #include +diff --git a/src/firewall.c b/src/firewall.c +index c440df6..c83def9 100644 +--- a/src/firewall.c b/src/firewall.c +@@ -23,6 +23,10 @@ + #include + #endif + ++/* hack to make sure kernel headers understand that libc (musl) ++ does define IFF_LOWER_UP et al. */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #include + + #include +diff --git a/src/iptables.c b/src/iptables.c +index 82e3ac4..46ad9e2 100644 +--- a/src/iptables.c b/src/iptables.c +@@ -23,6 +23,10 @@ + #include + #endif + ++/* hack to make sure kernel headers understand that libc (musl) ++ does define IFF_LOWER_UP et al. */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #include + #include + #include +-- +2.1.4 + diff --git a/meta/recipes-connectivity/connman/connman_1.33.bb b/meta/recipes-connectivity/connman/connman_1.33.bb index 56a0a0f..4129b05 100644 --- a/meta/recipes-connectivity/connman/connman_1.33.bb +++ b/meta/recipes-connectivity/connman/connman_1.33.bb @@ -7,7 +7,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://includes.patch \ file://0003-stats-Fix-bad-file-descriptor-initialisation.patch \ " -SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch" +SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch \ + file://0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch" SRC_URI[md5sum] = "c51903fd3e7a6a371d12ac5d72a1fa01" SRC_URI[sha256sum] = "bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ed: use yoctoproject mirror for SRC_URI
On 23 January 2017 at 16:38, Alexander Kanavin < alexander.kana...@linux.intel.com> wrote: > Add UPSTREAM_CHECK_URI please (or file a bug), as I'll surely forget about > the update if the RRS is going to report 'Up-to-date' for this. > Yes, was literally just filing a bug for this now. (#10955) Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ed: use yoctoproject mirror for SRC_URI
Upstream has removed a number of releases from the canonical download site, including the 1.9 release we were using. We shoud upgrade to the latest release but as new releases are only compressed using lzip that means adding lzip-native to oe-core, so this is a suitable short-term fix. Signed-off-by: Ross Burton--- meta/recipes-extended/ed/ed_1.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/ed/ed_1.9.bb b/meta/recipes-extended/ed/ed_1.9.bb index f2ec42a..83c31fc 100644 --- a/meta/recipes-extended/ed/ed_1.9.bb +++ b/meta/recipes-extended/ed/ed_1.9.bb @@ -11,7 +11,7 @@ SECTION = "base" # LSB states that ed should be in /bin/ bindir = "${base_bindir}" -SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz" +SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz; SRC_URI[md5sum] = "565b6d1d5a9a8816b9b304fc4ed9405d" SRC_URI[sha256sum] = "d5b372cfadf073001823772272fceac2cfa87552c5cd5a8efc1c8aae61f45a88" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for openssh: Make sshd-config a package
On lundi 23 janvier 2017 10:08:04 CET Leonardo Sandoval wrote: > David, This is what I get from the command line > > oe-core$ git pw mbox 4904 | git apply --check > error: documentation/ref-manual/ref-variables.xml: No such file or directory > > Meaning that you have a patch on your series that is targeted for the > documentation folder, which is not part of the oe-core project. The > latter need to be sent to: > > documentation: > Git repository: http://git.yoctoproject.org/cgit/cgit.cgi/yocto-docs/ > Mailing list: yo...@yoctoproject.org > OK, my bad, I patched directly against my poky clone. I didn't know that documentation was handled elsewhere. So, I will resubmit it removing the latest patch. But since these patches are related, is there a specific procedure to follow ? I didn't found anything in the contribution guidelines on the wiki... Sorry for the inconvenience, David -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] do_populate_sysroot: Function failed: relocatable_binaries_preprocess
After updating this morning (everything on master, re-using the existing build dir that was built OK within the last 48h) I saw this: ERROR: pseudo-native-1.8.1-r0 do_populate_sysroot: pseudo-native: chrpath command failed with exit code 7: b'/home/paul/poky/build/tmp/work/x86_64-linux/pseudo-native/1.8.1-r0/sysroot-destdir/home/paul/poky/build/tmp/work/x86_64-linux/pseudo-native/1.8.1-r0/recipe-sysroot-native/usr/bin/pseudodb: RPATH=/home/paul/poky/build/tmp/sysroots/x86_64-linux/usr/lib:/home/paul/poky/build/tmp/sysroots/x86_64-linux/lib\n'b"new rpath '$ORIGIN/../../../../../../../sysroots/x86_64-linux/usr/lib:$ORIGIN/../../../../../../../sysroots/x86_64-linux/lib' too large; maximum length 107\n" ERROR: pseudo-native-1.8.1-r0 do_populate_sysroot: Function failed: relocatable_binaries_preprocess ERROR: Logfile of failure stored in: /home/paul/poky/build/tmp/work/x86_64-linux/pseudo-native/1.8.1-r0/temp/log.do_populate_sysroot.11 I did a cleansstate on that and then it was fine but then openssl died in the same way: ERROR: openssl-native-1.0.2j-r0 do_populate_sysroot: openssl-native: chrpath command failed with exit code 7: b'/home/paul/poky/build/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/sysroot-destdir/home/paul/poky/build/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/recipe-sysroot-native/usr/lib/libssl.so.1.0.0: RPATH=/home/paul/poky/build/tmp/sysroots/x86_64-linux/usr/lib:/home/paul/poky/build/tmp/sysroots/x86_64-linux/lib\n'b"new rpath '$ORIGIN/../../../../../../../sysroots/x86_64-linux/usr/lib:$ORIGIN/../../../../../../../sysroots/x86_64-linux/lib' too large; maximum length 107\n" ERROR: openssl-native-1.0.2j-r0 do_populate_sysroot: Function failed: relocatable_binaries_preprocess ERROR: Logfile of failure stored in: /home/paul/poky/build/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/temp/log.do_populate_sysroot.7182 ERROR: Task (virtual:native:/home/paul/poky/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb:do_populate_sysroot) failed with exit code '1' I mentioned it to Mark and he suggested I should mention it here. P. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] do_populate_sysroot: Function failed: relocatable_binaries_preprocess
On 1/23/17 10:44 AM, Paul Gortmaker wrote: > After updating this morning (everything on master, re-using the existing > build dir that was built OK within the last 48h) I saw this: > > ERROR: pseudo-native-1.8.1-r0 do_populate_sysroot: pseudo-native: chrpath > command failed with exit code 7: > b'/home/paul/poky/build/tmp/work/x86_64-linux/pseudo-native/1.8.1-r0/sysroot-destdir/home/paul/poky/build/tmp/work/x86_64-linux/pseudo-native/1.8.1-r0/recipe-sysroot-native/usr/bin/pseudodb: > RPATH=/home/paul/poky/build/tmp/sysroots/x86_64-linux/usr/lib:/home/paul/poky/build/tmp/sysroots/x86_64-linux/lib\n'b"new > rpath > '$ORIGIN/../../../../../../../sysroots/x86_64-linux/usr/lib:$ORIGIN/../../../../../../../sysroots/x86_64-linux/lib' > too large; maximum length 107\n" > ERROR: pseudo-native-1.8.1-r0 do_populate_sysroot: Function failed: > relocatable_binaries_preprocess > ERROR: Logfile of failure stored in: > /home/paul/poky/build/tmp/work/x86_64-linux/pseudo-native/1.8.1-r0/temp/log.do_populate_sysroot.11 Looking at it, the error from chrpath is easy to explain. The original RPATH value is shorted then the new RPATH value that was calculated. i.e.: /home/paul/poky/build/tmp/sysroots/x86_64-linux/usr/lib vs $ORIGIN/../../../../../../../sysroots/x86_64-linux/usr/lib So the system errors because it would overflow the buffer inside of the ELF object. What is strange is this issue is new. It means something has changed in the origin processing of native packages over the weekend. I'm wondering if this has something to do with the new recipe specific sysroot. It should hopefully be easy to _workaround_ this issue, by having the build directory in a deeper path (something with more characters in it.) But this is a big enough program we're going to have to figure out how to solve it. --Mark > I did a cleansstate on that and then it was fine but then openssl died > in the same way: > > ERROR: openssl-native-1.0.2j-r0 do_populate_sysroot: openssl-native: chrpath > command failed with exit code 7: > b'/home/paul/poky/build/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/sysroot-destdir/home/paul/poky/build/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/recipe-sysroot-native/usr/lib/libssl.so.1.0.0: > > RPATH=/home/paul/poky/build/tmp/sysroots/x86_64-linux/usr/lib:/home/paul/poky/build/tmp/sysroots/x86_64-linux/lib\n'b"new > rpath > '$ORIGIN/../../../../../../../sysroots/x86_64-linux/usr/lib:$ORIGIN/../../../../../../../sysroots/x86_64-linux/lib' > too large; maximum length 107\n" > ERROR: openssl-native-1.0.2j-r0 do_populate_sysroot: Function failed: > relocatable_binaries_preprocess > ERROR: Logfile of failure stored in: > /home/paul/poky/build/tmp/work/x86_64-linux/openssl-native/1.0.2j-r0/temp/log.do_populate_sysroot.7182 > ERROR: Task > (virtual:native:/home/paul/poky/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb:do_populate_sysroot) > failed with exit code '1' > > I mentioned it to Mark and he suggested I should mention it here. > > P. > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] rootfs-postcommands: Modify ssh-related commands
OpenSSH configuration is now a symlink which points to the desired configuration, so the functions that modified it must be updated to modify the target and not override it. Signed-off-by: David Vincent--- meta/classes/rootfs-postcommands.bbclass | 28 +++- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index c8f18c6702..2d862b0b2e 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -86,20 +86,8 @@ read_only_rootfs_hook () { # Tweak the mount option and fs_passno for rootfs in fstab sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab - # If we're using openssh and the /etc/ssh directory has no pre-generated keys, - # we should configure openssh to use the configuration file /etc/ssh/sshd_config_readonly - # and the keys under /var/run/ssh. - if [ -d ${IMAGE_ROOTFS}/etc/ssh ]; then - if [ -e ${IMAGE_ROOTFS}/etc/ssh/ssh_host_rsa_key ]; then - echo "SYSCONFDIR=/etc/ssh" >> ${IMAGE_ROOTFS}/etc/default/ssh - echo "SSHD_OPTS=" >> ${IMAGE_ROOTFS}/etc/default/ssh - else - echo "SYSCONFDIR=/var/run/ssh" >> ${IMAGE_ROOTFS}/etc/default/ssh - echo "SSHD_OPTS='-f /etc/ssh/sshd_config_readonly'" >> ${IMAGE_ROOTFS}/etc/default/ssh - fi - fi - - # Also tweak the key location for dropbear in the same way. + # If we're using dropbear and the /etc/dropbear directory has no pre-generated keys, + # we should configure dropbear to use the keys under /var/lib/dropbear. if [ -d ${IMAGE_ROOTFS}/etc/dropbear ]; then if [ -e ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key ]; then echo "DROPBEAR_RSAKEY_DIR=/etc/dropbear" >> ${IMAGE_ROOTFS}/etc/default/dropbear @@ -138,12 +126,10 @@ zap_empty_root_password () { # allow dropbear/openssh to accept root logins and logins from accounts with an empty password string # ssh_allow_empty_password () { - for config in sshd_config sshd_config_readonly; do - if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config ]; then - sed -i 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config - sed -i 's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config - fi - done + if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then + sed -i --follow-symlinks 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config + sed -i --follow-symlinks 's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config + fi if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then if grep -q DROPBEAR_EXTRA_ARGS ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear 2>/dev/null ; then @@ -162,7 +148,7 @@ ssh_allow_empty_password () { ssh_disable_dns_lookup () { if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then - sed -i -e 's:#UseDNS yes:UseDNS no:' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config + sed -i --follow-symlinks -e 's:#UseDNS yes:UseDNS no:' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config fi } -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] openssh: Make sshd-config a package
This series of patch introduces a new way of modifying OpenSSH sshd configuration. Instead of modifying the files and launching the server with custom options, a package which RPROVIDES sshd-config must be installed. The package to use is selected using a new variable called SSHD_CONFIG which is used exclusively when selecting ssh-server-openssh in IMAGE_FEATURES. David Vincent (4): openssh: Package server configuration core-image: Set default sshd configuration rootfs-postcommands: Modify ssh-related commands ref-manual: Add SSHD_CONFIG documentation/ref-manual/ref-variables.xml | 21 ++ meta/classes/core-image.bbclass| 3 +- meta/classes/rootfs-postcommands.bbclass | 28 - meta/recipes-connectivity/openssh/openssh_7.3p1.bb | 47 ++ 4 files changed, 70 insertions(+), 29 deletions(-) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] openssh: Package server configuration
Split sshd configuration for read-write/read-only rootfs in two distinct packages. Also, add a package dependency between openssh-sshd package and a provider of sshd-config. Signed-off-by: David Vincent--- meta/recipes-connectivity/openssh/openssh_7.3p1.bb | 47 ++ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh_7.3p1.bb b/meta/recipes-connectivity/openssh/openssh_7.3p1.bb index 94eb0ed208..c02bb7d450 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.3p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.3p1.bb @@ -92,13 +92,17 @@ do_compile_ptest() { } do_install_append () { + # Create default config files + install -m 0644 ${D}${sysconfdir}/ssh/sshd_config ${D}${sysconfdir}/ssh/sshd_config_default + rm -f ${D}${sysconfdir}/ssh/sshd_config + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd - sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config + sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config_default fi if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then - sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config + sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config_default fi install -d ${D}${sysconfdir}/init.d @@ -111,7 +115,7 @@ do_install_append () { # Create config files for read-only rootfs install -d ${D}${sysconfdir}/ssh - install -m 644 ${D}${sysconfdir}/ssh/sshd_config ${D}${sysconfdir}/ssh/sshd_config_readonly + install -m 644 ${D}${sysconfdir}/ssh/sshd_config_default ${D}${sysconfdir}/ssh/sshd_config_readonly sed -i '/HostKey/d' ${D}${sysconfdir}/ssh/sshd_config_readonly echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly @@ -135,30 +139,59 @@ do_install_ptest () { ALLOW_EMPTY_${PN} = "1" -PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" +PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd-config ${PN}-sshd-config-readonly ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" FILES_${PN}-scp = "${bindir}/scp.${BPN}" FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" +FILES_${PN}-sshd-config = "${sysconfdir}/ssh/sshd_config_default" +FILES_${PN}-sshd-config-readonly = "${sysconfdir}/ssh/sshd_config_readonly" FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" -FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" +FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" FILES_${PN}-sftp = "${bindir}/sftp" FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" FILES_${PN}-keygen = "${bindir}/ssh-keygen" RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" -RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" +RDEPENDS_${PN}-sshd += "${PN}-keygen sshd-config ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" RPROVIDES_${PN}-ssh = "ssh" +RPROVIDES_${PN}-sshd-config = "sshd-config" +RPROVIDES_${PN}-sshd-config-readonly = "sshd-config" RPROVIDES_${PN}-sshd = "sshd" RCONFLICTS_${PN} = "dropbear" +RCONFLICTS_${PN}-sshd-config = "${PN}-sshd-config-readonly" +RCONFLICTS_${PN}-sshd-config-readonly = "${PN}-sshd-config" RCONFLICTS_${PN}-sshd = "dropbear" RCONFLICTS_${PN}-keygen = "ssh-keygen" -CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" +CONFFILES_${PN}-sshd-config = "${sysconfdir}/ssh/sshd_config_default" +CONFFILES_${PN}-sshd-config-readonly = "${sysconfdir}/ssh/sshd_config_readonly" CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" +pkg_postinst_${PN}-sshd-config () { +#!/bin/sh +if [ -e $D${sysconfdir}/ssh/sshd_config ]; then +rm $D${sysconfdir}/ssh/sshd_config +fi + +# Make sure destination directory exists, before creating the symlink +mkdir -p $D${sysconfdir}/ssh +ln -s sshd_config_default $D${sysconfdir}/ssh/sshd_config +} + +pkg_postinst_${PN}-sshd-config-readonly () { +#!/bin/sh +if [ -e $D${sysconfdir}/ssh/sshd_config ]; then +rm $D${sysconfdir}/ssh/sshd_config +fi + +# Make sure destination directory exists, before
Re: [OE-core] [PATCH] sstatesig: don't squash dependencies of useradd packages
Ping. On Mon, Dec 12, 2016 at 03:48:04PM +0200, Maxin B. John wrote: > Without this change, sstate dependency filter squashes dependencies > of packages which inherits useradd class. That causes failures while > rebuilding it for another MACHINE. > > Fixes [YOCTO #8078] > > Signed-off-by: Maxin B. John> --- > meta/lib/oe/sstatesig.py | 7 +++ > 1 file changed, 7 insertions(+) > > diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py > index 8224e3a..88b2290 100644 > --- a/meta/lib/oe/sstatesig.py > +++ b/meta/lib/oe/sstatesig.py > @@ -17,6 +17,9 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, > depname, dataCache): > def isAllArch(fn): > inherits = " ".join(dataCache.inherits[fn]) > return "/allarch.bbclass" in inherits > +def isUserAdd(fn): > +inherits = " ".join(dataCache.inherits[fn]) > +return "/useradd.bbclass" in inherits > def isImage(fn): > return "/image.bbclass" in " ".join(dataCache.inherits[fn]) > > @@ -39,6 +42,10 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, > depname, dataCache): > > # Only target packages beyond here > > +# Don't squash the dependencies of packages inheritting useradd class > +if isUserAdd(fn): > +return True > + > # allarch packagegroups are assumed to have well behaved names which > don't change between architecures/tunes > if isPackageGroup(fn) and isAllArch(fn) and not isNative(depname): > return False > -- > 2.4.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for openssh: Make sshd-config a package
== Series Details == Series: openssh: Make sshd-config a package Revision: 1 URL : https://patchwork.openembedded.org/series/4904/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 842ad404b3) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] ref-manual: Add SSHD_CONFIG
Add description for the SSHD_CONFIG variable which is used to select the package to use as provider for sshd-config. Signed-off-by: David Vincent--- documentation/ref-manual/ref-variables.xml | 21 + 1 file changed, 21 insertions(+) diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 6e15e65f54..803f0da980 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -12511,6 +12511,27 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" +SSHD_CONFIG + +SSHD_CONFIG[doc] = "The package used to provide OpenSSH sshd configuration. + + + +When selecting "ssh-server-openssh" in +IMAGE_FEATURES, +specifies which package should be used as provider for +sshd-config. + + + +This defaults to openssh-sshd-config. +If "read-only-rootfs" is also specified in +IMAGE_FEATURES, +it defaults to openssh-sshd-config-readonly + + + + SSTATE_DIR SSTATE_DIR[doc] = "The directory for the shared state cache." -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Yocto Project Status WW04’17
Current Dev Position: YP 2.3 M2 Next Deadline: YP 2.3 M2 by Jan 23, 2017 SWAT team rotation: Saul -> Paul on Jan. 20, 2017. SWAT team rotation: Paul -> Ross on Jan. 27, 2017. https://wiki.yoctoproject.org/wiki/Yocto_Build_Failure_Swat_Team Key Status/Updates: ·The 2.2.1 release has been held up by a bug in eSDK which we now know was ‘fixed’ by some of the tinfoil2 changes. Those clearly won’t be backported to 2.2 so we’re looking into what we need to do to fix this in 2.2 instead. ·Master has continued to be problematic to merge patches into. We have tracked down a glibc 2.25 issue with python3 on older hosts (e.g. centos7) which was causing some hard to isolate autobuilder failures. ·The M2 deadline has now passed. We were able to merge the oeqa rewrite and recipe specific sysroot patches. Unfortunately as yet we still don’t know the exact performance impact of this change but we’ve opted to move forward with it regardless. ·Master now contains all the patches we’ve been able to get to work cleanly. Examples of things which did not merge are the linux-libc-headers (due to musl issues) but we did merge the actual kernel updates and the container changes as the selftests didn’t pass. ·Since master builds cleanly and has a lot of change in as it stands, we’re tempted just to call this good for M2 and start the QA cycle. ·One particular challenge we continue to face is the length of time oe-selftest takes to run and we plan to have a focus on this during M3. Proposed upcoming dot releases: YP 2.2.1 Release by Jan. 20, 2017 (Will be after YP 2.3 M2 is out of QA) YP 2.1.3 Cut off May 8, 2017 YP 2.1.3 Release by May 19, 2017 YP 2.2.2 Cut off May 22, 2017 YP 2.2.2 Release by June 2, 2017 Key YP 2.3 Dates: YP 2.3 M2 Cutoff is Jan. 23, 2017 YP 2.3 M2 Release is Feb. 3, 2017 YP 2.3 M3 Cutoff is Feb 27, 2017 YP 2.3 M3 Release is Mar. 10, 2017 YP 2.3 M4 Cutoff is April 3, 2017 YP 2.3 M4 Release is April 28, 2017 Tracking Metrics: WDD 2614 (last week 2624) (https://wiki.yoctoproject.org/charts/combo.html) Key Status Links for YP: https://wiki.yoctoproject.org/wiki/Yocto_Project_v2.3_Status https://wiki.yoctoproject.org/wiki/Yocto_2.3_Schedule https://wiki.yoctoproject.org/wiki/Yocto_2.3_Features [If anyone has suggestions for other information you’d like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Program Manager INTEL, MS JF1-255, 2111 N.E. 25th Avenue, Hillsboro, OR 97124 • Work Telephone:(503) 712-0534 •Cell: (208) 244-4460 • Email:stephen.k.jol...@intel.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] core-image: Set default sshd configuration
When selecting OpenSSH as ssh server provider instead of dropbear, also install the correct configuration depending on whether the final rootfs is read-only or not. Signed-off-by: David Vincent--- meta/classes/core-image.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 8431440db4..d1f643d920 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -41,7 +41,7 @@ FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server" FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client" FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" -FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" +FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh ${SSHD_CONFIG}" FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}" @@ -52,6 +52,7 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' # An error exception would be raised if both image features foo and bar1(or bar2) are included +SSHD_CONFIG ??= "${@bb.utils.contains('IMAGE_FEATURES','read-only-rootfs','openssh-sshd-config-readonly','openssh-sshd-config',d)}" MACHINE_HWCODECS ??= "" CORE_IMAGE_BASE_INSTALL = '\ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for QA: create unit tests for event module
== Series Details == Series: QA: create unit tests for event module Revision: 1 URL : https://patchwork.openembedded.org/series/4918/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 842ad404b3) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 2/2] selftest: sstatetests: skip glibc-initial tests in case of non-glibc distro
From: Leonardo SandovalSome distros uses non-glibc so skip those tests requiring glibc-initial as target Signed-off-by: Leonardo Sandoval --- meta/lib/oeqa/selftest/sstate.py | 1 + meta/lib/oeqa/selftest/sstatetests.py | 25 +++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/meta/lib/oeqa/selftest/sstate.py b/meta/lib/oeqa/selftest/sstate.py index d27a45c..742f4d0 100644 --- a/meta/lib/oeqa/selftest/sstate.py +++ b/meta/lib/oeqa/selftest/sstate.py @@ -16,6 +16,7 @@ class SStateBase(oeSelfTest): self.sstate_path = get_bb_var('SSTATE_DIR') self.hostdistro = get_bb_var('NATIVELSBSTRING') self.distro_specific_sstate = os.path.join(self.sstate_path, self.hostdistro) +self.tclibc = get_bb_var('TCLIBC') # Creates a special sstate configuration with the option to add sstate mirrors def config_sstate(self, temp_sstate_location=False, add_local_mirrors=[]): diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index 6642539..e3f819c 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py @@ -51,12 +51,15 @@ class SStateTests(SStateBase): @testcase(976) def test_sstate_creation_distro_nonspecific_pass(self): -self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) +# glibc-initial is intended only for the glibc C library +if self.tclibc == 'glibc': +self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1375) def test_sstate_creation_distro_nonspecific_fail(self): -self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) - +# glibc-initial is intended only for the glibc C library +if self.tclibc == 'glibc': +self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) # Test the sstate files deletion part of the do_cleansstate task def run_test_cleansstate_task(self, targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True): @@ -78,16 +81,26 @@ class SStateTests(SStateBase): @testcase(977) def test_cleansstate_task_distro_specific_nonspecific(self): targetarch = get_bb_var('TUNE_ARCH') -self.run_test_cleansstate_task(['binutils-cross-' + targetarch, 'binutils-native', 'glibc-initial'], distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) +targets = ['binutils-cross-'+ targetarch, 'binutils-native'] +# glibc-initial is intended only for the glibc C library +if self.tclibc == 'glibc': +targets.append('glibc-initial') +self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) @testcase(1376) def test_cleansstate_task_distro_nonspecific(self): -self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) +# glibc-initial is intended only for the glibc C library +if self.tclibc == 'glibc': +self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1377) def test_cleansstate_task_distro_specific(self): targetarch = get_bb_var('TUNE_ARCH') -self.run_test_cleansstate_task(['binutils-cross-'+ targetarch, 'binutils-native', 'glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) +targets = ['binutils-cross-'+ targetarch, 'binutils-native'] +# glibc-initial is intended only for the glibc C library +if self.tclibc == 'glibc': +targets.append('glibc-initial') +self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) # Test rebuilding of distro-specific sstate files -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] autotools.bbclass: Change acpaths defaults to be a weak assignment
We currently have to override the default setting using a particular assignment order in the recipe, setting it weakly helps to get rid of this problem. Signed-off-by: Khem Raj--- meta/classes/autotools.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 3741d09706..da5ec27575 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -27,7 +27,7 @@ inherit siteinfo # results for autoconf tests we cannot run at build time. export CONFIG_SITE = "${@siteinfo_get_files(d)}" -acpaths = "default" +acpaths ?= "default" EXTRA_AUTORECONF = "--exclude=autopoint" export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 0/2] Skip imagefeature and sstatetest tests depending on distro
From: Leonardo SandovalOriginally, the selftests were defined for the 'poky' distro. However, there are more supported distros, including nodistro, poky-lsb and poky-tiny. This series just focus on two test cases: imagefeatures and sstatetests. [YOCTO #8525] The following changes since commit 4aa6644f92975ded908ef99cf313466e0845e071: kernel-fitimage: Use compressed ramdisks in FIT images if available (2017-01-23 12:05:23 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lsandov1/selftest-imagefeatures-sstatetest-distro-agnostic http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lsandov1/selftest-imagefeatures-sstatetest-distro-agnostic Leonardo Sandoval (2): selftest/imagefeatures: skip weston test if required features are not present selftest: sstatetests: skip glibc-initial tests in case of non-glibc distro meta/lib/oeqa/selftest/imagefeatures.py | 6 +++--- meta/lib/oeqa/selftest/sstate.py| 1 + meta/lib/oeqa/selftest/sstatetests.py | 25 +++-- 3 files changed, 23 insertions(+), 9 deletions(-) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 1/2] selftest/imagefeatures: skip weston test if required features are not present
From: Leonardo SandovalAlso, remove hard-coded features because the image already contains them. Signed-off-by: Leonardo Sandoval --- meta/lib/oeqa/selftest/imagefeatures.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py index d015c49..76896c7 100644 --- a/meta/lib/oeqa/selftest/imagefeatures.py +++ b/meta/lib/oeqa/selftest/imagefeatures.py @@ -91,9 +91,9 @@ class ImageFeatures(oeSelfTest): AutomatedBy: Daniel Istrate """ -features = 'DISTRO_FEATURES_append = " wayland"\n' -features += 'CORE_IMAGE_EXTRA_INSTALL += "wayland weston"' -self.write_config(features) +distro_features = get_bb_var('DISTRO_FEATURES') +if not ('opengl' in distro_features and 'wayland' in distro_features): +self.skipTest('neither opengl nor wayland present on DISTRO_FEATURES so core-image-weston cannot be built') # Build a core-image-weston bitbake('core-image-weston') -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for QA: create unit tests for event module
Jair, patchtest failed because your series is intended for bitbake project, not oe-core. Please send your series to Mailing list: bitbake-de...@lists.openembedded.org On 01/23/2017 12:53 PM, Patchwork wrote: == Series Details == Series: QA: create unit tests for event module Revision: 1 URL : https://patchwork.openembedded.org/series/4918/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 842ad404b3) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for QA: create unit tests for event module
Leonardo, Thank you for the clarification and sorry for the error. I'll re-submit it to the correct list. Regards, Jair > -Original Message- > From: Leonardo Sandoval > [mailto:leonardo.sandoval.gonza...@linux.intel.com] > Sent: Monday, January 23, 2017 3:13 PM > To: openembedded-core@lists.openembedded.org; Jair Gonzalez >> Subject: Re: [OE-core] ✗ patchtest: failure for QA: create unit tests for > event > module > > Jair, patchtest failed because your series is intended for bitbake project, > not > oe-core. Please send your series to > > Mailing list: bitbake-de...@lists.openembedded.org > > > > On 01/23/2017 12:53 PM, Patchwork wrote: > > == Series Details == > > > > Series: QA: create unit tests for event module > > Revision: 1 > > URL : https://patchwork.openembedded.org/series/4918/ > > State : failure > > > > == Summary == > > > > > > Thank you for submitting this patch series to OpenEmbedded Core. This > > is an automated response. Several tests have been executed on the > > proposed series by patchtest resulting in the following failures: > > > > > > > > * Issue Series does not apply on top of target branch > [test_series_merge_on_head] > >Suggested fixRebase your series on top of targeted branch > >Targeted branch master (currently at 842ad404b3) > > > > > > > > If you believe any of these test results are incorrect, please reply > > to the mailing list (openembedded-core@lists.openembedded.org) raising > your concerns. > > Otherwise we would appreciate you correcting the issues and submitting > > a new version of the patchset if applicable. Please ensure you > > add/increment the version number when sending the new version (i.e. > > [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). > > > > --- > > Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest > > Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gobject-introspection: Fix sysroot postinst scripting error
Clearly the echo into ld.so.conf doesn't make sense and there was a cut and paste error when writing this code. As long as the directory existed, the builds worked so it created a race. Fix it as people hit build failures. Signed-off-by: Richard Purdie--- .../recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb index 15c8c00..509fc5f 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb @@ -171,7 +171,7 @@ gi_ldsoconf_sysroot_preprocess () { mkdir -p ${SYSROOT_DESTDIR}${bindir} dest=${SYSROOT_DESTDIR}${bindir}/postinst-ldsoconf-${PN} echo "#!/bin/sh" > $dest - echo "echo mkdir -p ${STAGING_DIR_TARGET}${sysconfdir} > ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf" >> $dest + echo "mkdir -p ${STAGING_DIR_TARGET}${sysconfdir}" >> $dest echo "echo ${base_libdir} >> ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf" >> $dest echo "echo ${libdir} >> ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf" >> $dest chmod 755 $dest -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for sanity/abi-version: Force a clean TMPDIR after recipe specific sysroot changes
== Series Details == Series: sanity/abi-version: Force a clean TMPDIR after recipe specific sysroot changes Revision: 1 URL : https://patchwork.openembedded.org/series/4926/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 40463f9d80) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for gobject-introspection: Fix sysroot postinst scripting error
== Series Details == Series: gobject-introspection: Fix sysroot postinst scripting error Revision: 1 URL : https://patchwork.openembedded.org/series/4924/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 40463f9d80) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/3] ccache.bbclass: enable max size setup for ccache dir
On Fri, Jan 20, 2017 at 8:47 AM, Yannick GICQUELwrote: > 2017-01-20 17:23 GMT+01:00 Yannick GICQUEL : >> 2017-01-19 20:02 GMT+01:00 Andre McCurdy : >>> On Thu, Jan 19, 2017 at 7:01 AM, Yannick Gicquel >>> wrote: ccache directories are limited to 1G by default. >>> >>> 1G has been the default for a long time, so maybe it's time to propose >>> an upstream change to increase, e.g. to 10G, giving the size of the >>> webkitgtk build as justification? >> >> You are right, 1GB was the default cache size limit in old versions >> and it's up to 5GB since release 3.2 [1]. >> >>> Since we build ccache-native within oe-core, any such patch could be >>> applied to our version of ccache right now (ie we don't need to wait >>> for it to be accepted and merged upstream). >> >> Current ccache.bbclass implementation is using the host ccache, so the >> default limit can be different depending on the version deployed on >> host distro. The point is that even if we use ccache-native, their >> still will be a default size limit set. >> Even if 5GB (or 10GB) limit should fit the webkitgtk cache size >> requirements, some other recipes can require more space to gain full >> benefit of the ccache (e.g. chromium from meta-browser) and for those >> it can be useful to tune the size. >> >> Does it make sense? Yes, it does. If 5GB isn't enough, then enabling compression of files in ccache ( https://ccache.samba.org/manual.html#_cache_compression ) may be a better solution than removing the 5GB limit, but I do see the argument that since we don't place arbitrary limits on downloads or sstate directory sizes, why limit ccache? However, calling "ccache -M XXX" after every recipe's do_configure() still doesn't seem ideal. Firstly because the command will run many more times than necessary but also because, for users who over-ride CCACHE_DIR to try to share ccache files between builds, it will silently and permanently over-write any existing "max_size" option which they may have manually configured. As an alternative, does simply exporting CCACHE_MAXSIZE=0 from ccache.bbclass work? (In general, I'm all in favour of improving ccache support in oe-core so it's good to see these changes being proposed and discussed). >> Yannick >> >> [1]: https://ccache.samba.org/releasenotes.html#_ccache_3_2 >> >>> This patch enables the configuration of their limits, and as default location is TMPDIR, it proposes a size limit to "0" (unlimited). The setup can be overloaded in local.conf by setting CCACHE_MAX_SIZE to a custom value if needed. Signed-off-by: Yannick Gicquel --- meta/classes/ccache.bbclass | 8 1 file changed, 8 insertions(+) diff --git a/meta/classes/ccache.bbclass b/meta/classes/ccache.bbclass index 93fcaca..b6643a1 100644 --- a/meta/classes/ccache.bbclass +++ b/meta/classes/ccache.bbclass @@ -1,6 +1,14 @@ CCACHE = "${@bb.utils.which(d.getVar('PATH'), 'ccache') and 'ccache '}" export CCACHE_DIR ?= "${TMPDIR}/ccache/${MULTIMACH_HOST_SYS}/${PN}" CCACHE_DISABLE[unexport] = "1" +CCACHE_MAX_SIZE ?= "0" do_configure[dirs] =+ "${CCACHE_DIR}" do_kernel_configme[dirs] =+ "${CCACHE_DIR}" + +ccache_init() { +if [ -n "${CCACHE}" ]; then +${CCACHE} -M ${CCACHE_MAX_SIZE} +fi +} +do_configure[postfuncs] += "ccache_init" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] unfs3: Switch to using mirror tarball instead of subversion
This really is the last subversion url in OE-Core so replacing it with a mirror tarball will save us from the subversion-native build chain. Signed-off-by: Richard Purdie--- meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb index e7574fb..52aa17e 100644 --- a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb +++ b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb @@ -14,7 +14,10 @@ DEPENDS_append_class-nativesdk = " flex-nativesdk" MOD_PV = "497" S = "${WORKDIR}/trunk" -SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV};protocol=http \ +# Only subversion url left in OE-Core, use a mirror tarball instead since +# this rarely changes. +# svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV};protocol=http +SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/trunk_svn.code.sf.net_.p.unfs3.code_497_.tar.gz \ file://unfs3_parallel_build.patch \ file://alternate_rpc_ports.patch \ file://fix_pid_race_parent_writes_child_pid.patch \ @@ -23,8 +26,8 @@ SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV};protoco file://relative_max_socket_path_len.patch \ file://tcp_no_delay.patch \ " -SRC_URI[md5sum] = "3687acc4ee992e536472365dd99712a7" -SRC_URI[sha256sum] = "274b43ada9c6eea1da26eb7010d72889c5278984ba0b50dff4e093057d4d64f8" +SRC_URI[md5sum] = "2e43e471c77ade0331901c40b8f8e9a3" +SRC_URI[sha256sum] = "21009468a9ba07b72ea93780d025a63ab4e55bf8fc3127803c296f0900fe1bac" BBCLASSEXTEND = "native nativesdk" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sanity/abi-version: Force a clean TMPDIR after recipe specific sysroot changes
With the recipe specific sysroots, we need a clean tmpdir, else pseudo-native, openssl-native, subversion-native and serf-native need to be manually cleaned. After these there are probably more places where software doesn't rebuild correctly even if we pass in new parameters to it. The simplest solution is to force people to start from a clean TMPDIR since everything would rebuild anyway. Signed-off-by: Richard Purdie--- meta/classes/sanity.bbclass | 2 ++ meta/conf/abi_version.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index c9bb034..7bcceee 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -630,6 +630,8 @@ def sanity_handle_abichanges(status, d): subprocess.call(d.expand("rm ${TMPDIR}/sysroots/*/usr/lib/xorg/modules/drivers/modesetting_drv.so ${TMPDIR}/sysroots/*/pkgdata/runtime/xf86-video-modesetting* ${TMPDIR}/sysroots/*/pkgdata/runtime-reverse/xf86-video-modesetting* ${TMPDIR}/sysroots/*/pkgdata/shlibs2/xf86-video-modesetting*"), shell=True) with open(abifile, "w") as f: f.write(current_abi) +elif abi == "11" and current_abi == "12": +status.addresult("The layout of TMPDIR changed for Recipe Specific Sysroots.\nConversion doesn't make sense and this change will rebuild everything so please start with a clean TMPDIR.\n") elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)) diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index a829687..4964880 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "11" +OELAYOUT_ABI = "12" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] selftest/devtool: Add test to verify "modify virtual/kernel"
From: Jose Perez CarranzaThe purpose of this test case is to verify that devtool modify works correctly when building the kernel. [YOCTO #10817] Signed-off-by: Jose Perez Carranza --- meta/lib/oeqa/selftest/devtool.py | 85 +++ 1 file changed, 85 insertions(+) diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 79a4b1f..1ba8e00 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -1579,3 +1579,88 @@ class DevtoolTests(DevtoolBase): checkvars['S'] = '${WORKDIR}/${BPN}-%s' % recipever checkvars['SRC_URI'] = url self._test_recipe_contents(newrecipefile, checkvars, []) + +@testcase(1577) +def test_devtool_virtual_kernel_modify(self): +""" +Summary:The purpose of this test case is to verify that +devtool modify works correctly when building +the kernel. +Dependencies: NA +Steps: 1. Build kernel with bitbake. +2. Save the config file generated. +3. Clean the environment. +4. Use `devtool modify virtual/kernel` to validate following: + 4.1 The source is checked out correctly. + 4.2 The resulting configuration is the same as + what was get on step 2. + 4.3 The Kernel can be build correctly. + 4.4 Changes made on the source are reflected on the + subsequent builds. + 4.5 Changes on the configuration are reflected on the + subsequent builds + Expected: devtool modify is able to checkout the source of the kernel + and modification to the source and configurations are reflected + when building the kernel. + """ +#Set machine to qemxu86 to be able to modify the kernel and +#verify the modification. +features = 'MACHINE = "qemux86"\n' +self.write_config(features) +# Clean up the enviroment +bitbake('linux-yocto -c cleansstate') +tempdir = tempfile.mkdtemp(prefix='devtoolqa') +self.track_for_cleanup(tempdir) +self.track_for_cleanup(self.workspacedir) +self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') +self.add_command_to_tearDown('bitbake -c clean linux-yocto') +#Step 1 +#Here is just generated the config file instead of all the kernel to optimize the +#time of executing this test case. +bitbake('linux-yocto -c configure') +bbconfig = os.path.join(get_bb_var('B',"linux-yocto"),'.config') +buildir= get_bb_var('TOPDIR') +#Step 2 +runCmd('cp %s %s' % (bbconfig, buildir)) +self.assertTrue(os.path.exists(os.path.join(buildir, '.config')), +'Could not copy .config file from kernel') + +tmpconfig = os.path.join(buildir, '.config') +#Step 3 +bitbake('linux-yocto -c cleanall') +#Step 4.1 +runCmd('devtool modify virtual/kernel -x %s' % tempdir) +self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile')), +'Extracted source could not be found') +#Step 4.2 +configfile = os.path.join(tempdir,'.config') +diff = runCmd('diff %s %s' % (tmpconfig, configfile)) +self.assertEqual(0,diff.status,'Kernel .config file is not the same using bitbake and devtool') +#Step 4.3 +#NOTE: virtual/kernel is mapped to linux-yocto +result = runCmd('devtool build linux-yocto') +self.assertEqual(0,result.status,'Cannot build kernel using `devtool build`') +kernelfile = os.path.join(get_bb_var('KBUILD_OUTPUT',"linux-yocto"), 'vmlinux') +self.assertTrue(os.path.exists(kernelfile),'Kernel was not build correctly') + +#Modify the kernel source, this is specific for qemux86 +modfile = os.path.join(tempdir,'arch/x86/boot/header.S') +modstring = "use a boot loader - Devtool kernel testing" +modapplied = runCmd("sed -i 's/boot loader/%s/' %s" % (modstring, modfile)) +self.assertEqual(0,modapplied.status,'Modification to %s on kernel source failed' % modfile) +#Modify the configuration +codeconfigfile = os.path.join(tempdir,'.config.new') +modconfopt = "CONFIG_SG_POOL=n" +modconf = runCmd("sed -i 's/CONFIG_SG_POOL=y/%s/' %s" % (modconfopt, codeconfigfile)) +self.assertEqual(0,modconf.status,'Modification to %s failed' % codeconfigfile) +#Build again kernel with devtool +rebuild = runCmd('devtool build linux-yocto') +
[OE-core] [PATCH] elfutils: 0.166->0.168
1) Upgrade elfutils from 0.166 to 0.168 2) Delete 1 patch below to make it compatible with new version elfcmp-fix-self-comparision.patch 3) Modify 4 patches below to make it compatible with new version elfutils-0.166/hppa_backend.diff -> elfutils-0.168/hppa_backend.diff elfutils-0.166/mips_backend.diff -> elfutils-0.168/mips_backend.diff elfutils-0.166/m68k_backend.diff -> elfutils-0.168/m68k_backend.diff elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch -> elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch Signed-off-by: Zheng Ruoqin--- ...de-alternatives-for-glibc-assumptions-hel.patch | 1163 .../elfcmp-fix-self-comparision.patch | 41 - .../elfutils/elfutils-0.166/m68k_backend.diff | 492 - ...ferences-between-mips-machine-identifiers.patch |0 ...de-alternatives-for-glibc-assumptions-hel.patch | 1093 ++ ...m-Silence-Werror-maybe-uninitialized-fals.patch |0 .../0001-fix-a-stack-usage-warning.patch |0 .../0001-remove-the-unneed-checking.patch |0 ...-support-for-mips64-abis-in-mips_retval.c.patch |0 .../0003-Add-mips-n64-relocation-format-hack.patch |0 .../aarch64_uio.patch |0 .../arm_backend.diff |0 .../fixheadercheck.patch |0 .../hppa_backend.diff | 173 +-- .../kfreebsd_path.patch|0 .../elfutils/elfutils-0.168/m68k_backend.diff | 27 + .../mips_backend.diff | 168 +-- .../mips_readelf_w.patch |0 .../shadow.patch |0 .../testsuite-ignore-elflint.diff |0 .../uclibc-support.patch |0 .../{elfutils_0.166.bb => elfutils_0.168.bb} |7 +- 22 files changed, 1322 insertions(+), 1842 deletions(-) delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.166/m68k_backend.diff rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/0001-Ignore-differences-between-mips-machine-identifiers.patch (100%) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/0001-fix-a-stack-usage-warning.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/0001-remove-the-unneed-checking.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/0003-Add-mips-n64-relocation-format-hack.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/aarch64_uio.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/arm_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/fixheadercheck.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/hppa_backend.diff (88%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/kfreebsd_path.patch (100%) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/m68k_backend.diff rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/mips_backend.diff (88%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/mips_readelf_w.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/shadow.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/testsuite-ignore-elflint.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.166 => elfutils-0.168}/uclibc-support.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils_0.166.bb => elfutils_0.168.bb} (94%) diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch deleted file mode 100644 index 38b31f6..000 --- a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch +++ /dev/null @@ -1,1163 +0,0 @@ -From 4b0fe80b3951f044c1c1b14d1d7f5f0b8ab67507 Mon
[OE-core] [PATCH] python: Upgrade both python and python-native to 2.7.13
Rebased: - python-native/multilib.patch - python/multilib.patch - python/01-use-proper-tools-for-cross-build.patch Upstream: - CVE-2016-1000110 Signed-off-by: Alejandro Hernandez--- .../python/python-native/multilib.patch| 96 ++-- ...on-native_2.7.12.bb => python-native_2.7.13.bb} | 0 meta/recipes-devtools/python/python.inc| 4 +- .../01-use-proper-tools-for-cross-build.patch | 34 ++--- meta/recipes-devtools/python/python/multilib.patch | 118 +++ .../python/python-fix-CVE-2016-1000110.patch | 162 - .../python/{python_2.7.12.bb => python_2.7.13.bb} | 1 - 7 files changed, 126 insertions(+), 289 deletions(-) rename meta/recipes-devtools/python/{python-native_2.7.12.bb => python-native_2.7.13.bb} (100%) delete mode 100644 meta/recipes-devtools/python/python/python-fix-CVE-2016-1000110.patch rename meta/recipes-devtools/python/{python_2.7.12.bb => python_2.7.13.bb} (99%) diff --git a/meta/recipes-devtools/python/python-native/multilib.patch b/meta/recipes-devtools/python/python-native/multilib.patch index 916b40f..ad46085 100644 --- a/meta/recipes-devtools/python/python-native/multilib.patch +++ b/meta/recipes-devtools/python/python-native/multilib.patch @@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Nitin A Kamble -Index: Python-2.7.12/Include/pythonrun.h +Index: Python-2.7.13/Include/pythonrun.h === Python-2.7.12.orig/Include/pythonrun.h -+++ Python-2.7.12/Include/pythonrun.h +--- Python-2.7.13.orig/Include/pythonrun.h Python-2.7.13/Include/pythonrun.h @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -24,10 +24,10 @@ Index: Python-2.7.12/Include/pythonrun.h PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.7.12/Lib/distutils/command/install.py +Index: Python-2.7.13/Lib/distutils/command/install.py === Python-2.7.12.orig/Lib/distutils/command/install.py -+++ Python-2.7.12/Lib/distutils/command/install.py +--- Python-2.7.13.orig/Lib/distutils/command/install.py Python-2.7.13/Lib/distutils/command/install.py @@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE @@ -46,23 +46,23 @@ Index: Python-2.7.12/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.12/Lib/pydoc.py +Index: Python-2.7.13/Lib/pydoc.py === Python-2.7.12.orig/Lib/pydoc.py -+++ Python-2.7.12/Lib/pydoc.py -@@ -384,7 +384,7 @@ class Doc: - - docloc = os.environ.get("PYTHONDOCS", - "http://docs.python.org/library;) --basedir = os.path.join(sys.exec_prefix, "lib", -+basedir = os.path.join(sys.exec_prefix, sys.lib, -"python"+sys.version[0:3]) - if (isinstance(object, type(os)) and - (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-2.7.12/Lib/site.py +--- Python-2.7.13.orig/Lib/pydoc.py Python-2.7.13/Lib/pydoc.py +@@ -375,7 +375,7 @@ class Doc: + docmodule = docclass = docroutine = docother = docproperty = docdata = fail + + def getdocloc(self, object, +- basedir=os.path.join(sys.exec_prefix, "lib", ++ basedir=os.path.join(sys.exec_prefix, "sys.lib", +"python"+sys.version[0:3])): + """Return the location of module docs or None""" + +Index: Python-2.7.13/Lib/site.py === Python-2.7.12.orig/Lib/site.py -+++ Python-2.7.12/Lib/site.py +--- Python-2.7.13.orig/Lib/site.py Python-2.7.13/Lib/site.py @@ -288,13 +288,19 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) @@ -83,13 +83,13 @@ Index: Python-2.7.12/Lib/site.py sitepackages.append(prefix) -sitepackages.append(os.path.join(prefix, "lib", "site-packages")) +sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) - if sys.platform == "darwin": - # for framework builds *only* we add the standard Apple - # locations. -Index: Python-2.7.12/Lib/test/test_dl.py + return sitepackages + + def addsitepackages(known_paths): +Index: Python-2.7.13/Lib/test/test_dl.py ===
Re: [OE-core] [PATCH][Morty] binutils-2.27.inc: Fix alignment frags for aarch64
On 18-01-17 17:09, akuster808 wrote: On 01/18/2017 04:08 AM, Nathan Rossi wrote: On 18 January 2017 at 19:37, Mike Looijmanswrote: Could someone at least please say "yes" or "no"? I now have three projects waiting for this patch to be included in morty. If it's not going to happen, I'll have to add a bbappend to these layers to fix it. On 16-01-17 18:49, Manjukumar Harthikote Matha wrote: Ping, this has been applied to master Armin, you mentioned on IRC ~1 week ago that you had merged it to your staging branch? Any updates? Also I had a look and could not find the change in http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akuster/morty-next? Maybe I am looking in the wrong place though for your staging tree? I forgot to press go. Its there now. Much appreciated. Who's next in line to press "go" now? I still have three projects waiting. Apparently the ARM64 isn't very popular, no one seems to care about its build failures... Kind regards, Mike Looijmans System Expert TOPIC Products Materiaalweg 4, NL-5681 RJ Best Postbus 440, NL-5680 AK Best Telefoon: +31 (0) 499 33 69 79 E-mail: mike.looijm...@topicproducts.com Website: www.topicproducts.com Please consider the environment before printing this e-mail -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3] alsa-lib: update 1.1.2 -> 1.1.3
On Mon, Jan 23, 2017 at 6:04 AM, Burton, Rosswrote: > > On 23 January 2017 at 13:29, Andreas Müller > wrote: >> >> +# no python -> smixer is not build >> +ALLOW_EMPTY_${PN} = "1" > > > Not sure this is the right fix. What package does the Python support go > into? The smixer files should be in that package, and the real dependency > on PN-dev is to libasound, not PN. Can we fiddle the PN-dev RDEPENDS to > ensure that it depends on libasound instead of PN? shouldn't shlibs notice and add this dep automatically ? > > Ross > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3] alsa-lib: update 1.1.2 -> 1.1.3
On 23 January 2017 at 16:59, Khem Rajwrote: > shouldn't shlibs notice and add this dep automatically ? > Yes, but it's the incorrect dependency on PN that is the problem. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] testimage.bbclass: Add systemd test automatically
From: Mariano LopezThis adds systemd test automatically when an image is build with systemd DISTRO_FEATURE [YOCTO #10935] Signed-off-by: Mariano Lopez --- meta/classes/testimage.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 96e41c6..73a5c1a 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -36,8 +36,9 @@ TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted" TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged" RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}" +SYSTEMDSUITE = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" MINTESTSUITE = "ping" -NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog" +NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog ${SYSTEMDSUITE}" DEVTESTSUITE = "gcc kernelmodule ldd" DEFAULT_TEST_SUITES = "${MINTESTSUITE} auto" -- 2.6.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for openssh: Make sshd-config a package
On 01/23/2017 10:39 AM, David Vincent wrote: On lundi 23 janvier 2017 10:08:04 CET Leonardo Sandoval wrote: David, This is what I get from the command line oe-core$ git pw mbox 4904 | git apply --check error: documentation/ref-manual/ref-variables.xml: No such file or directory Meaning that you have a patch on your series that is targeted for the documentation folder, which is not part of the oe-core project. The latter need to be sent to: documentation: Git repository: http://git.yoctoproject.org/cgit/cgit.cgi/yocto-docs/ Mailing list: yo...@yoctoproject.org OK, my bad, I patched directly against my poky clone. I didn't know that documentation was handled elsewhere. So, I will resubmit it removing the latest patch. But since these patches are related, is there a specific procedure to follow ? I didn't found anything in the contribution guidelines on the wiki... I do not think so. Go ahead and send to the patches to the correct ML and perhaps include a cover letter indicating the patch relationship. Sorry for the inconvenience, no problem. By the way, there is enhancement (to be included during 2.3) that will target this type of problem: patch sent to the wrong ML; once implemented, the fail report will be more specific. David -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] tremor: Use mirror tarball instead of svn url
On Mon, Jan 23, 2017 at 4:57 AM, Richard Purdiewrote: > This is the only remaining svn url in OE-Core and building subversion-native > for things like the url checker is wearing and slows down builds. Since > this rarely changes, use the mirror tarball instead. Do we explicitly add subversion-native to builds ? or is it going to be removed automatically now that there is nothing needed it ? subversion-native should still remain though for other layers to use. > > Signed-off-by: Richard Purdie > --- > meta/recipes-multimedia/tremor/tremor_20150107.bb | 7 ++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-multimedia/tremor/tremor_20150107.bb > b/meta/recipes-multimedia/tremor/tremor_20150107.bb > index 937894a..96834bd9 100644 > --- a/meta/recipes-multimedia/tremor/tremor_20150107.bb > +++ b/meta/recipes-multimedia/tremor/tremor_20150107.bb > @@ -13,10 +13,15 @@ RECIPE_UPSTREAM_VERSION = "20150107" > RECIPE_UPSTREAM_DATE = "Jan 07, 2015" > CHECK_DATE = "Aug 12, 2015" > > -SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=19427;protocol=http \ > +# Only subversion url left in OE-Core, use a mirror tarball instead since > +# this rarely changes. > +# svn://svn.xiph.org/trunk;module=Tremor;rev=19427;protocol=http > +SRC_URI = > "http://downloads.yoctoproject.org/mirror/sources/Tremor_svn.xiph.org_.trunk_19427_.tar.gz > \ > file://obsolete_automake_macros.patch;striplevel=0 \ > file://tremor-arm-thumb2.patch \ > " > +SRC_URI[md5sum] = "b308f9598176c0b5059c0124ab122afe" > +SRC_URI[sha256sum] = > "2196802e1635f9ac44740fe4da12e6c1ad3942862427a67268de2b65b1d4" > > S = "${WORKDIR}/Tremor" > > -- > 2.7.4 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] tremor: Use mirror tarball instead of svn url
On Mon, 2017-01-23 at 09:11 -0800, Khem Raj wrote: > On Mon, Jan 23, 2017 at 4:57 AM, Richard Purdie >wrote: > > > > This is the only remaining svn url in OE-Core and building > > subversion-native > > for things like the url checker is wearing and slows down builds. > > Since > > this rarely changes, use the mirror tarball instead. > Do we explicitly add subversion-native to builds ? or is it going to > be removed automatically now that there is nothing needed it ? > subversion-native should still remain though for other layers to use. Its automatic, no svn:// urls, no subversion-native builds. (git-native in ASSUME_PROVIDED stops that for git:// urls but remove it, the same thing happens). Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] tremor: Use mirror tarball instead of svn url
On 23 January 2017 at 17:11, Khem Rajwrote: > Do we explicitly add subversion-native to builds ? or is it going to > be removed automatically now that there is nothing needed it ? > subversion-native should still remain though for other layers to use. > It's automatic: if scheme == "svn": d.appendVarFlag('do_fetch', 'depends', ' subversion-native:do_populate_sysroot') (base.bbclass) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] classes/oeqa: Replace subprocess.check_call() with check_output()
If you use subprocess.check_output() the traceback will contain the output when the command fails which is very useful for debugging. There is no good reason not to use this everywhere. Signed-off-by: Richard Purdie--- meta/classes/sstate.bbclass| 4 ++-- meta/classes/staging.bbclass | 6 +++--- meta/classes/uninative.bbclass | 2 +- meta/lib/oe/rootfs.py | 6 +++--- meta/lib/oeqa/sdk/utils/sdkbuildproject.py | 2 +- meta/lib/oeqa/utils/buildproject.py| 2 +- meta/lib/oeqa/utils/targetbuild.py | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index a767a02..0fdeb9d 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -573,14 +573,14 @@ python sstate_hardcode_path () { sstate_hardcode_cmd = "%s | xargs %s | %s | xargs %s %s" % (sstate_scan_cmd, sstate_grep_cmd, sstate_filelist_cmd, xargs_no_empty_run_cmd, sstate_sed_cmd) bb.note("Removing hardcoded paths from sstate package: '%s'" % (sstate_hardcode_cmd)) -subprocess.check_call(sstate_hardcode_cmd, shell=True, cwd=sstate_builddir) +subprocess.check_output(sstate_hardcode_cmd, shell=True, cwd=sstate_builddir) # If the fixmefn is empty, remove it.. if os.stat(fixmefn).st_size == 0: os.remove(fixmefn) else: bb.note("Replacing absolute paths in fixmepath file: '%s'" % (sstate_filelist_relative_cmd)) -subprocess.check_call(sstate_filelist_relative_cmd, shell=True) +subprocess.check_output(sstate_filelist_relative_cmd, shell=True) } def sstate_package(ss, d): diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 1a4668e..fc387ea 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -290,7 +290,7 @@ def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d): fixme_path = d.getVar(fixmevar) cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) bb.note(cmd) -subprocess.check_call(cmd, shell=True) +subprocess.check_output(cmd, shell=True) def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): @@ -333,7 +333,7 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): staging_processfixme(fixme, targetdir, targetsysroot, nativesysroot, d) for p in postinsts: -subprocess.check_call(p, shell=True) +subprocess.check_output(p, shell=True) # # Manifests here are complicated. The main sysroot area has the unpacked sstate @@ -561,7 +561,7 @@ python extend_recipe_sysroot() { staging_processfixme(fixme[f], multilibs[f].getVar("RECIPE_SYSROOT"), recipesysroot, recipesysrootnative, d) for p in postinsts: -subprocess.check_call(p, shell=True) +subprocess.check_output(p, shell=True) for dep in configuredeps: c = setscenedeps[dep][0] diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index ba7ca63..410fb72 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -60,7 +60,7 @@ python uninative_event_fetchloader() { os.symlink(localpath, tarballpath) cmd = d.expand("mkdir -p ${UNINATIVE_STAGING_DIR}-uninative; cd ${UNINATIVE_STAGING_DIR}-uninative; tar -xjf ${UNINATIVE_DLDIR}/%s/${UNINATIVE_TARBALL}; ${UNINATIVE_STAGING_DIR}-uninative/relocate_sdk.py ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux ${UNINATIVE_LOADER} ${UNINATIVE_LOADER} ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/${bindir_native}/patchelf-uninative ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux${base_libdir_native}/libc*.so" % chksum) -subprocess.check_call(cmd, shell=True) +subprocess.check_output(cmd, shell=True) with open(loaderchksum, "w") as f: f.write(chksum) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 5b842ba..9c8a0eb 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -303,10 +303,10 @@ class Rootfs(object, metaclass=ABCMeta): bb.note("> Executing %s intercept ..." % script) try: -subprocess.check_call(script_full) +subprocess.check_output(script_full) except subprocess.CalledProcessError as e: -bb.warn("The postinstall intercept hook '%s' failed (exit code: %d)! See log for details!" % -(script, e.returncode)) +bb.warn("The postinstall intercept hook '%s' failed (exit code: %d)! See log for details! (Output: %s)" % +(script, e.returncode, e.output)) with open(script_full) as intercept: registered_pkgs = None diff --git a/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
Re: [OE-core] do_populate_sysroot: Function failed: relocatable_binaries_preprocess
On Mon, 2017-01-23 at 11:44 -0500, Paul Gortmaker wrote: > After updating this morning (everything on master, re-using the > existing > build dir that was built OK within the last 48h) I saw this: > > ERROR: pseudo-native-1.8.1-r0 do_populate_sysroot: pseudo-native: > chrpath command failed with exit code 7: > b'/home/paul/poky/build/tmp/work/x86_64-linux/pseudo-native/1.8.1- > r0/sysroot-destdir/home/paul/poky/build/tmp/work/x86_64-linux/pseudo- > native/1.8.1-r0/recipe-sysroot-native/usr/bin/pseudodb: > RPATH=/home/paul/poky/build/tmp/sysroots/x86_64- > linux/usr/lib:/home/paul/poky/build/tmp/sysroots/x86_64- > linux/lib\n'b"new > rpath > '$ORIGIN/../../../../../../../sysroots/x86_64- > linux/usr/lib:$ORIGIN/../../../../../../../sysroots/x86_64-linux/lib' > too large; maximum length 107\n" > ERROR: pseudo-native-1.8.1-r0 do_populate_sysroot: Function failed: > relocatable_binaries_preprocess > ERROR: Logfile of failure stored in: > /home/paul/poky/build/tmp/work/x86_64-linux/pseudo-native/1.8.1- > r0/temp/log.do_populate_sysroot.11 To follow up we've figured out this is the error you see if you take an existing build directory, pre recipe specific sysroot and then update to post recipe specific sysroot. It seems that pseudo-native, openssl-native and subversion-native have issues where you can pass in new configuration but they don't recompile the binaries, despite those binaries depending on the paths you pass in. We're seeing how widespread the problem is before deciding exactly how to handle this. It might be a case of some PR bumps, obvioulsy wiping TMPDIR is the comprehensive solution. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [bitbake-selftest][PATCH 0/2] QA: create unit tests for event module
This patch set adds a test unit to the bitbake event module and appends it to the bitbake-selftest script's dictionary containing the list of the default tests to execute when the script is run. The following changes since commit b47ecf28775830efab423fa12f0addb68671cc06: poky.ent: Added "pip3" as an essential host installation package (2017-01-20 11:57:25 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib jairglez/bbevents http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jairglez/bbevents Jair Gonzalez (2): bitbake: tests: create unit tests for event module bitbake: selftest: add bb.tests.event to bitbake-selftest bitbake/bin/bitbake-selftest | 1 + bitbake/lib/bb/tests/event.py | 324 ++ 2 files changed, 325 insertions(+) create mode 100644 bitbake/lib/bb/tests/event.py -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] useradd_base: keep group if it still has users
perform_groupdel() tries to delete a group irrespective if other users have it as their primary group, thus the call to groupdel will fail with the following error error: groupdel: cannot remove the primary group of user '' Add a check to perform_groupdel() to determine if there are other users and keep the group, printing a warning. This is called right after a user is deleted to delete it's group. If the last user is deleted, only then the group is also deleted. Signed-off-by: Ioan-Adrian Ratiu--- meta/classes/useradd_base.bbclass | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass index ba87edc57a..551c82c322 100644 --- a/meta/classes/useradd_base.bbclass +++ b/meta/classes/useradd_base.bbclass @@ -69,11 +69,21 @@ perform_groupdel () { bbnote "${PN}: Performing groupdel with [$opts]" local groupname=`echo "$opts" | awk '{ print $NF }'` local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" + if test "x$group_exists" != "x"; then - eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupdel \$opts\" || true - group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" - if test "x$group_exists" != "x"; then - bbfatal "${PN}: groupdel command did not succeed." + local awk_input='BEGIN {FS=":"}; $1=="'$groupname'" { print $3 }' + local groupid=`echo "$awk_input" | awk -f- $rootdir/etc/group` + local awk_check_users='BEGIN {FS=":"}; $4=="'$groupid'" {print $1}' + local other_users=`echo "$awk_check_users" | awk -f- $rootdir/etc/passwd` + + if test "x$other_users" = "x"; then + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupdel \$opts\" || true + group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" + if test "x$group_exists" != "x"; then + bbfatal "${PN}: groupdel command did not succeed." + fi + else + bbnote "${PN}: '$groupname' is primary group for users '$other_users', not removing it" fi else bbnote "${PN}: group $groupname doesn't exist, not removing it" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [bitbake-selftest][PATCH 1/2] bitbake: tests: create unit tests for event module
This change adds a new unit test module (bb.tests.event) for bitbake event. It includes the following items: - Client and server stubs setup - Testing the module's main functions including: - get_class_handlers - set_class_handlers - clean_class_handlers - enable_threadlock - disable_threadlock - get_handlers - set_handlers - execute_handler - fire_class_handlers - print_ui_queue - fire_ui_handlers - fire - fire_from_worker - register - remove - register_UIHhandler - unregister_UIHhandler - Testing event handling using: - class Event(object) - class OperationStarted(Event) - class OperationCompleted(Event) - class OperationProgress(Event) - class ConfigParsed(Event) [YOCTO #10368] Signed-off-by: Jair Gonzalez--- bitbake/lib/bb/tests/event.py | 324 ++ 1 file changed, 324 insertions(+) create mode 100644 bitbake/lib/bb/tests/event.py diff --git a/bitbake/lib/bb/tests/event.py b/bitbake/lib/bb/tests/event.py new file mode 100644 index 000..5e7b434 --- /dev/null +++ b/bitbake/lib/bb/tests/event.py @@ -0,0 +1,324 @@ +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# BitBake Tests for the Event implementation (event.py) +# +# Copyright (C) 2017 Jair Gonzalez +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +import unittest +import bb +import logging +import bb.compat +import bb.event +import importlib +import threading +import time +from unittest.mock import Mock + + +class EventQueueStub(): +""" Class used as specification for UI event handler queue stub objects """ +def __init__(self): +return + +def send(self, event): +return + + +class PickleEventQueueStub(): +""" Class used as specification for UI event handler queue stub objects +with sendpickle method """ +def __init__(self): +return + +def sendpickle(self, pickled_event): +return + + +class UIClientStub(): +""" Class used as specification for UI event handler stub objects """ +def __init__(self): +self.event = None + + +class EventHandlingTest(unittest.TestCase): +""" Event handling test class """ +_threadlock_test_calls = [] + +def setUp(self): +self._test_process = Mock() +ui_client1 = UIClientStub() +ui_client2 = UIClientStub() +self._test_ui1 = Mock(wraps=ui_client1) +self._test_ui2 = Mock(wraps=ui_client2) +importlib.reload(bb.event) + +def _create_test_handlers(self): +""" Method used to create a test handler ordered dictionary """ +test_handlers = bb.compat.OrderedDict() +test_handlers["handler1"] = self._test_process.handler1 +test_handlers["handler2"] = self._test_process.handler2 +return test_handlers + +def test_class_handlers(self): +""" Test set_class_handlers and get_class_handlers methods """ +test_handlers = self._create_test_handlers() +bb.event.set_class_handlers(test_handlers) +self.assertEqual(test_handlers, + bb.event.get_class_handlers()) + +def test_handlers(self): +""" Test set_handlers and get_handlers """ +test_handlers = self._create_test_handlers() +bb.event.set_handlers(test_handlers) +self.assertEqual(test_handlers, + bb.event.get_handlers()) + +def test_clean_class_handlers(self): +""" Test clean_class_handlers method """ +cleanDict = bb.compat.OrderedDict() +self.assertEqual(cleanDict, + bb.event.clean_class_handlers()) + +def test_register(self): +""" Test register method for class handlers """ +result = bb.event.register("handler", self._test_process.handler) +self.assertEqual(result, bb.event.Registered) +handlers_dict = bb.event.get_class_handlers() +self.assertIn("handler", handlers_dict) + +def test_already_registered(self): +""" Test detection of an already registed class handler """ +bb.event.register("handler", self._test_process.handler) +handlers_dict =
[OE-core] [bitbake-selftest][PATCH 2/2] bitbake: selftest: add bb.tests.event to bitbake-selftest
Tests for bitbake event module were created on bb.tests.event. This change is to include them on the default test list in bitbake-selftest script. [YOCTO #10368] Signed-off-by: Jair Gonzalez--- bitbake/bin/bitbake-selftest | 1 + 1 file changed, 1 insertion(+) diff --git a/bitbake/bin/bitbake-selftest b/bitbake/bin/bitbake-selftest index 380e003..afe1603 100755 --- a/bitbake/bin/bitbake-selftest +++ b/bitbake/bin/bitbake-selftest @@ -28,6 +28,7 @@ except RuntimeError as exc: tests = ["bb.tests.codeparser", "bb.tests.cow", "bb.tests.data", + "bb.tests.event", "bb.tests.fetch", "bb.tests.parse", "bb.tests.utils"] -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core