Re: [OE-core] [PATCH 3/3] libepoxy: Upgrade 1.4.2 -> 1.4.3
On Wed, Jul 12, 2017 at 7:11 AM, Khem Rajwrote: > On Tue, Jul 11, 2017 at 9:56 PM, Andrea Galbusera > wrote: > > On Wed, Jul 12, 2017 at 12:38 AM, Khem Raj wrote: > >> > >> On Tue, Jul 11, 2017 at 3:02 PM, Andrea Galbusera > >> wrote: > >> > > >> > > >> > Il 11 lug 2017 8:00 PM, "Khem Raj" ha scritto: > >> > > >> > On Tue, Jul 11, 2017 at 1:34 AM, Jussi Kukkonen > >> > wrote: > >> >> On 11 July 2017 at 11:27, Jussi Kukkonen > >> >> wrote: > >> >>> > >> >>> On 11 July 2017 at 10:42, Jussi Kukkonen > >> >>> wrote: > >> > > >> > Exception: FileExistsError: [Errno 17] File exists: > >> > > >> > > >> > '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/ > sysroots-components/raspberrypi3/userland/usr/include/KHR/khrplatform.h' > >> > -> > >> > > >> > > >> > '/home/gizero/work/smartliving/distro/repo- > master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky- > linux-gnueabi/gtk+3/3.22.16-r0/recipe-sysroot/usr/include/ > KHR/khrplatform.h' > >> > >> > >> /usr/include/KHR/khrplatform.h is the egl platform header file, > >> provided > >> by both mesa and RPI userland. Does mesa end up in your gtk+3 > >> recipe-sysroot > >> somehow? > >> > >> For clarity: this could be a bug but it is unlikely to be related > to > >> the > >> libepoxy change (it does not use or ship the actual header file). > >> > >> >>> > >> >>> > >> >>> Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- > >> >>> mesa > >> >>> accidentally shipped khrplatform.h even when egl was disabled (which > >> >>> is > >> >>> what > >> >>> mesa-gl in oe-core does). > >> >>> > >> >> > >> >> Sorry, I've not had enough coffee. It was the other way round: > >> >> khrplatform.h is the platform header that mesa now thinks is needed > >> >> whether > >> >> egl is enabled or not -- so they've started installing it in any case > >> >> from > >> >> 17.1.4 which means mesa-gl now provides khrplatform.h and thus > >> >> conflicts > >> >> with userland. > >> >> > >> >> I don't know what the correct fix is yet, just wanted to correct my > >> >> original > >> >> wrong info. > >> >> > >> > > >> > Post an update to sync this header for userland package. > >> > > >> > > >> > Will this help solving the gtk+3 issue of mesa-gl and userland now > both > >> > providing the same header and causing recipe-sysroot construction to > >> > fail? > >> > >> No it certainly would not. But we can then decide who provides it, in > >> a easy way. > > > > > > I may be in the need to craft something locally to unbreak building with > > current master... Could you please shed some light on how this should be > > done then? Is this a matter of completely removing either mesa-gl or > > userland from gtk+3 deps or a more selective change to avoid the clash in > > recipe-sysroot? > > Firstly, determine where this file belongs to. If it is part of > egl/gles then it should go to userland, otherwise it should be > provided by mesa when using userland for graphics > If I understand correctly your point, you mean it is about having the two upstream agreeing on where the header belongs to and fixing either one or the other to stop providing it. In the meanwhile, from an oe perspective, having such a patch in place for any of the two or even removing the file in an appropriate do_install_append should do the job, right? -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] libepoxy: Upgrade 1.4.2 -> 1.4.3
On Tue, Jul 11, 2017 at 9:56 PM, Andrea Galbuserawrote: > On Wed, Jul 12, 2017 at 12:38 AM, Khem Raj wrote: >> >> On Tue, Jul 11, 2017 at 3:02 PM, Andrea Galbusera >> wrote: >> > >> > >> > Il 11 lug 2017 8:00 PM, "Khem Raj" ha scritto: >> > >> > On Tue, Jul 11, 2017 at 1:34 AM, Jussi Kukkonen >> > wrote: >> >> On 11 July 2017 at 11:27, Jussi Kukkonen >> >> wrote: >> >>> >> >>> On 11 July 2017 at 10:42, Jussi Kukkonen >> >>> wrote: >> > >> > Exception: FileExistsError: [Errno 17] File exists: >> > >> > >> > '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/sysroots-components/raspberrypi3/userland/usr/include/KHR/khrplatform.h' >> > -> >> > >> > >> > '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/gtk+3/3.22.16-r0/recipe-sysroot/usr/include/KHR/khrplatform.h' >> >> >> /usr/include/KHR/khrplatform.h is the egl platform header file, >> provided >> by both mesa and RPI userland. Does mesa end up in your gtk+3 >> recipe-sysroot >> somehow? >> >> For clarity: this could be a bug but it is unlikely to be related to >> the >> libepoxy change (it does not use or ship the actual header file). >> >> >>> >> >>> >> >>> Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- >> >>> mesa >> >>> accidentally shipped khrplatform.h even when egl was disabled (which >> >>> is >> >>> what >> >>> mesa-gl in oe-core does). >> >>> >> >> >> >> Sorry, I've not had enough coffee. It was the other way round: >> >> khrplatform.h is the platform header that mesa now thinks is needed >> >> whether >> >> egl is enabled or not -- so they've started installing it in any case >> >> from >> >> 17.1.4 which means mesa-gl now provides khrplatform.h and thus >> >> conflicts >> >> with userland. >> >> >> >> I don't know what the correct fix is yet, just wanted to correct my >> >> original >> >> wrong info. >> >> >> > >> > Post an update to sync this header for userland package. >> > >> > >> > Will this help solving the gtk+3 issue of mesa-gl and userland now both >> > providing the same header and causing recipe-sysroot construction to >> > fail? >> >> No it certainly would not. But we can then decide who provides it, in >> a easy way. > > > I may be in the need to craft something locally to unbreak building with > current master... Could you please shed some light on how this should be > done then? Is this a matter of completely removing either mesa-gl or > userland from gtk+3 deps or a more selective change to avoid the clash in > recipe-sysroot? Firstly, determine where this file belongs to. If it is part of egl/gles then it should go to userland, otherwise it should be provided by mesa when using userland for graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [poky][master] [PATCH v5 0/1] initramfs-framework:configuration to boot up live image
From: "Ng, Wei Tee"Hi, This patch is to get initramfs-framework able to boot up live image. A new scriplet named setup-live module has been created to handle the removeable media detection and assign the rootfs.img. This is because the current rootfs module has no support for rootfs images, only rootfs partitions. This version 5 included the changes for re-correct the indenting issues and squashing 2 commits into single commit. It involve the creation of initramfs-module-setup-live in the recipe and added udev-extraconf rdepends on this module because it is needed for automounting process. This changes has been verified with build test and boot up test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-indent http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-indent Ng, Wei Tee (1): initramfs-framwork: module to support boot live image .../initrdscripts/initramfs-framework/setup-live | 66 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] initramfs-framwork: module to support boot live image
From: "Ng, Wei Tee"setup-live module is a new module being introduced to integrate the functionality of init-live.sh into new scriptlet named setup-live in order to support the live boot image. The udev-extraconf rdepends is being added to perform automounting. It gets to run before the rootfs and finish module. The setup-live scriplet include the changes for: - Create a conditional loop for the bootparam_root variable. If it is not set, then it will boot from ROOT_IMAGE. Else, it will boot normally which is not from removable media. - Gives a standard path to the original boot disk mount which can be used to. While /media/sda is a good guess, it isn't always right, nor is it a good assumption that only one boot disk is in the system. - The current rootfs module has no support for rootfs images, currently it only support for rootfs partitions for wic image. Therefore, there is a need to assign the rootfs image for live image. [YOCTO #11701] Signed-off-by: Ng, Wei Tee --- This v5 is to re-correct the bad indents in recipe file. .../initrdscripts/initramfs-framework/setup-live | 66 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live new file mode 100644 index 000..ec4a139 --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -0,0 +1,66 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=30 + + if [ -z $bootparam_root ]; then + echo "Waiting for removable media..." + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo -n " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + C=$(( C + 1 )) + fi + sleep 1 + done + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + else + break + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 67a1b04..211e89d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -13,7 +13,8 @@ SRC_URI = "file://init \ file://mdev \ file://udev \ file://e2fs \ - file://debug" + file://debug \ + file://setup-live" S = "${WORKDIR}" @@ -25,6 +26,9 @@ do_install() { install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish +# setup-live +install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live + # mdev install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev @@ -48,7 +52,8
Re: [OE-core] [PATCH 3/3] libepoxy: Upgrade 1.4.2 -> 1.4.3
On Wed, Jul 12, 2017 at 12:38 AM, Khem Rajwrote: > On Tue, Jul 11, 2017 at 3:02 PM, Andrea Galbusera > wrote: > > > > > > Il 11 lug 2017 8:00 PM, "Khem Raj" ha scritto: > > > > On Tue, Jul 11, 2017 at 1:34 AM, Jussi Kukkonen > > wrote: > >> On 11 July 2017 at 11:27, Jussi Kukkonen > wrote: > >>> > >>> On 11 July 2017 at 10:42, Jussi Kukkonen > >>> wrote: > > > > Exception: FileExistsError: [Errno 17] File exists: > > > > '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/ > sysroots-components/raspberrypi3/userland/usr/include/KHR/khrplatform.h' > > -> > > > > '/home/gizero/work/smartliving/distro/repo- > master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky- > linux-gnueabi/gtk+3/3.22.16-r0/recipe-sysroot/usr/include/ > KHR/khrplatform.h' > > > /usr/include/KHR/khrplatform.h is the egl platform header file, > provided > by both mesa and RPI userland. Does mesa end up in your gtk+3 > recipe-sysroot > somehow? > > For clarity: this could be a bug but it is unlikely to be related to > the > libepoxy change (it does not use or ship the actual header file). > > >>> > >>> > >>> Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa > >>> accidentally shipped khrplatform.h even when egl was disabled (which is > >>> what > >>> mesa-gl in oe-core does). > >>> > >> > >> Sorry, I've not had enough coffee. It was the other way round: > >> khrplatform.h is the platform header that mesa now thinks is needed > >> whether > >> egl is enabled or not -- so they've started installing it in any case > from > >> 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts > >> with userland. > >> > >> I don't know what the correct fix is yet, just wanted to correct my > >> original > >> wrong info. > >> > > > > Post an update to sync this header for userland package. > > > > > > Will this help solving the gtk+3 issue of mesa-gl and userland now both > > providing the same header and causing recipe-sysroot construction to > fail? > > No it certainly would not. But we can then decide who provides it, in > a easy way. > I may be in the need to craft something locally to unbreak building with current master... Could you please shed some light on how this should be done then? Is this a matter of completely removing either mesa-gl or userland from gtk+3 deps or a more selective change to avoid the clash in recipe-sysroot? -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Upgrade to 2017.07 release (WIP)
On Tue, Jul 11, 2017 at 09:09:47PM -0400, Denys Dmytriyenko wrote: > On Mon, Jul 10, 2017 at 03:12:19PM -0400, Tom Rini wrote: > > On Mon, Jul 10, 2017 at 12:08:41PM -0700, Khem Raj wrote: > > > On 7/10/17 12:06 PM, Tom Rini wrote: > > > > On Mon, Jul 10, 2017 at 09:02:39PM +0200, Marek Vasut wrote: > > > >> On 07/10/2017 09:01 PM, Tom Rini wrote: > > > >>> On Mon, Jul 10, 2017 at 08:57:19PM +0200, Marek Vasut wrote: > > > On 07/10/2017 08:51 PM, Otavio Salvador wrote: > > > > On Mon, Jul 10, 2017 at 3:47 PM, Marek Vasutwrote: > > > >> On 07/10/2017 08:36 PM, Otavio Salvador wrote: > > > >>> This patch upgrades the U-Boot to the 2017.07 release. > > > >>> > > > >>> Signed-off-by: Otavio Salvador > > > >>> --- > > > >>> > > > >>> .../u-boot/{u-boot-common_2017.05.inc => > > > >>> u-boot-common_2017.07.inc} | 2 +- > > > >>> .../u-boot/{u-boot-fw-utils_2017.05.bb => > > > >>> u-boot-fw-utils_2017.07.bb} | 0 > > > >>> .../u-boot/{u-boot-mkimage_2017.05.bb => > > > >>> u-boot-mkimage_2017.07.bb} | 0 > > > >>> meta/recipes-bsp/u-boot/{u-boot_2017.05.bb => u-boot_2017.07.bb} > > > >>>| 0 > > > >>> 4 files changed, 1 insertion(+), 1 deletion(-) > > > >>> rename meta/recipes-bsp/u-boot/{u-boot-common_2017.05.inc => > > > >>> u-boot-common_2017.07.inc} (88%) > > > >>> rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2017.05.bb => > > > >>> u-boot-fw-utils_2017.07.bb} (100%) > > > >>> rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2017.05.bb => > > > >>> u-boot-mkimage_2017.07.bb} (100%) > > > >>> rename meta/recipes-bsp/u-boot/{u-boot_2017.05.bb => > > > >>> u-boot_2017.07.bb} (100%) > > > >>> > > > >>> diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc > > > >>> b/meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc > > > >>> similarity index 88% > > > >>> rename from meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc > > > >>> rename to meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc > > > >>> index 0e52f27df8..f27989daa1 100644 > > > >>> --- a/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc > > > >>> +++ b/meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc > > > >>> @@ -7,7 +7,7 @@ PE = "1" > > > >>> > > > >>> # We use the revision in order to avoid having to fetch it from > > > >>> the > > > >>> # repo during parse > > > >>> -SRCREV = "64c4ffa9fa223f7ae8640f9c8f3044bfa0e3bfda" > > > >>> +SRCREV = "d85ca029f257b53a96da6c2fb421e78a003a9943" > > > >> > > > >> Where did you get this hash from, it's not in the U-Boot repo ... > > > > > > > > From the tag used by Tom. You can check it on his github repository. > > > > > > I cannot, that is NOT where the U-Boot recipe points to nor is it in > > > any > > > way an official U-Boot source git tree . > > > >>> > > > >>> It's also on the official github mirror. I'll go see why the DENX git > > > >>> is lagging behind. > > > >> > > > >> Hm that's weird. How can it be a mirror if it contains objects not in > > > >> the mirrored repo ? ;-) > > > > > > > > git supports multiple push URIs. So I update all 3 locations with a > > > > single push. However, git.denx.de works differently than github.com > > > > does. > > > > > > may be pushing to upstream and then pulling before populating the > > > mirrors could solve such issues. but I think we should use github.com > > > in OE src_uri's for speed reasons. > > > > On the back end, things are a bit more complex than that, but I'm > > working to resolve the current error now. FWIW, changing the OE recipe > > to fetch from https://github.com/u-boot/u-boot.git would be fine with > > me, it's owned by myself, Wolfgang and the person that helped us out and > > got that project created to start with, so it will only have official > > changes in it. > > FWIW, I'd be against such change, as long as denx.de remains the official > home of U-boot. We don't pull kernel from https://github.com/torvalds/linux No, but you do pull it from ${KERNELORG_MIRROR}. At the end of the day, I don't have a preference either way. git.denx.de is the official home, github has an official mirror. We've actually put in some time making sure that git.denx.de is in-sync and up to date (this recent issue was that incrond has an inode leak). It should be considered a reliable source. -- Tom signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] dropbear: reduce local pending patches
Signed-off-by: Dengke Du--- meta/recipes-core/dropbear/dropbear/0003-configure.patch| 13 +++-- .../dropbear/fix-libtomcrypt-libtommath-ordering.patch | 12 +++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/meta/recipes-core/dropbear/dropbear/0003-configure.patch b/meta/recipes-core/dropbear/dropbear/0003-configure.patch index c53ab01..8469a50 100644 --- a/meta/recipes-core/dropbear/dropbear/0003-configure.patch +++ b/meta/recipes-core/dropbear/dropbear/0003-configure.patch @@ -1,19 +1,20 @@ -From c5f5c5054c1b15539dccf866e2c3faba7ed68456 Mon Sep 17 00:00:00 2001 +From 58dd24a80ca0f400d0761afd9ce2b7f684fc9125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Thu, 25 Apr 2013 00:27:25 +0200 -Subject: [PATCH 3/6] configure: add a variable to allow openpty check to be cached +Subject: [PATCH] configure: add a variable to allow openpty check to be cached -Upstream-Status: Pending +Upstream-Status: Submitted [ https://github.com/mkj/dropbear/pull/48 ] +Signed-off-by: Dengke Du --- configure.ac | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 05461f3..9c16d90 100644 +index 893b904..245408d 100644 --- a/configure.ac +++ b/configure.ac -@@ -166,15 +166,20 @@ AC_ARG_ENABLE(openpty, +@@ -177,15 +177,20 @@ AC_ARG_ENABLE(openpty, AC_MSG_NOTICE(Not using openpty) else AC_MSG_NOTICE(Using openpty if available) @@ -38,5 +39,5 @@ index 05461f3..9c16d90 100644 AC_ARG_ENABLE(syslog, [ --disable-syslogDon't include syslog support], -- -1.7.11.7 +2.8.1 diff --git a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch index de930f2..d27d1eb 100644 --- a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch +++ b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch @@ -1,4 +1,4 @@ -From 2fd8d2aedad0c50cdf1e43edd2387874b720ad4c Mon Sep 17 00:00:00 2001 +From 0999f907ec73db33309c2e4a771125649aaad466 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 16 Sep 2016 12:18:23 -0700 Subject: [PATCH] fix libtomcrypt/libtommath ordering @@ -11,18 +11,20 @@ prepended to LIBTOM_LIBS as they are found, not appended. Note that LIBTOM_LIBS is not used when linking with the bundled libtom libs. -Upstream-Status: Pending +Upstream-Status: Pending [ The dropbear upstream master branch already +contains this, this patch will be droped when meet next release ] Signed-off-by: Andre McCurdy +Signed-off-by: Dengke Du --- configure.ac | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index b6abe4c..85bb8bc 100644 +index 245408d..d624853 100644 --- a/configure.ac +++ b/configure.ac -@@ -390,16 +390,16 @@ AC_ARG_ENABLE(bundled-libtom, +@@ -393,16 +393,16 @@ AC_ARG_ENABLE(bundled-libtom, AC_MSG_NOTICE(Forcing bundled libtom*) else BUNDLED_LIBTOM=0 @@ -44,5 +46,5 @@ index b6abe4c..85bb8bc 100644 ) -- -1.9.1 +2.8.1 -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] dropbear, chrpath: reduce local pending patches
The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/dropbear-chrpath-reduce-local-pending-patch https://github.com//tree/dengke/dropbear-chrpath-reduce-local-pending-patch Dengke Du (2): dropbear: reduce local pending patches chrpath: reduce local pending patches .../dropbear/dropbear/0003-configure.patch | 13 +-- .../fix-libtomcrypt-libtommath-ordering.patch | 12 ++- .../chrpath/chrpath/standarddoc.patch | 25 -- 3 files changed, 33 insertions(+), 17 deletions(-) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] chrpath: reduce local pending patches
Signed-off-by: Dengke Du--- .../chrpath/chrpath/standarddoc.patch | 25 -- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch index f96f104..3d303fb 100644 --- a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch +++ b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch @@ -1,14 +1,24 @@ -Upstream-Status: Pending +From 285b5fbf1d6b25ff55d305c17edf4d327bf19dd3 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Tue, 5 Jul 2011 23:42:29 +0100 +Subject: [PATCH] chrpath: Ensure the package respects the docdir variable -autoconf/automake set docdir automatically, use their value ensuring +autoconf/automake set docdir automatically, use their value ensuring doc files are placed into $datadir/doc, not $prefix/doc. RP 5/7/2011 -Index: chrpath-0.13/Makefile.am -=== chrpath-0.13.orig/Makefile.am 2011-07-05 23:40:14.769920254 +0100 -+++ chrpath-0.13/Makefile.am 2011-07-05 23:40:19.819920635 +0100 +Upstream-Status: Submitted [ http://lists.alioth.debian.org/pipermail/chrpath-devel/Week-of-Mon-20170710/13.html ] + +Signed-off-by: Dengke Du +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b50ad21..5f7e861 100644 +--- a/Makefile.am b/Makefile.am @@ -1,7 +1,5 @@ SUBDIRS = testsuite deb @@ -17,3 +27,6 @@ Index: chrpath-0.13/Makefile.am doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README bin_PROGRAMS = chrpath +-- +2.8.1 + -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] slang: add ptest
On 07/12/2017 01:31 AM, Stefan Strogin wrote: Hi Robert, Thanks for the report. Could you say how to reproduce the error? What target architecture, config options, oe-core version, etc do you use? I have tried with openembedded-core 643c81af (master), with MACHINE = "qemux86-64", EXTRA_IMAGE_FEATURES ?= "debug-tweaks ptest-pkgs" DISTRO_FEATURES += "ptest" and CORE_IMAGE_EXTRA_INSTALL += "slang" set in local.conf, everything builds fine. The ARCH doesn't matter, I can see the error on every builds, is there "ERROR: /usr/bin/ncurses5-config should not be used" in your log.do_configure please ? What does it use for ncurses in your build? // Robert -- Stefan On 11/07/17 04:36, Robert Yang wrote: Hello Stefan, There is an error when do_compile_ptest_base: | ../objs/libslang.a(sldisply.o): In function `tt_tgetstr': | /usr/src/debug/slang/2.3.1a-r0/slang-2.3.1a/src/sldisply.c:2576: undefined reference to `tgetstr' | ../objs/libslang.a(sldisply.o): In function `SLtt_initialize': | /usr/src/debug/slang/2.3.1a-r0/slang-2.3.1a/src/sldisply.c:2770: undefined reference to `tgetent' | ../objs/libslang.a(sldisply.o): In function `tt_tgetflag': | /usr/src/debug/slang/2.3.1a-r0/slang-2.3.1a/src/sldisply.c:2635: undefined reference to `tgetflag' It is because it uses ncurses5-config which is wrong in oe-core, the log.do_configure shows: checking for ncurses5-config... /buildarea/lyang1/test_m/tmp/work/i586-poky-linux/slang/2.3.1a-r0/recipe-sysroot/usr/bin/crossscripts/ncurses5-config checking for terminfo... ERROR: /usr/bin/ncurses5-config should not be used, use an alternative such as pkg-config Would you please fix it? // Robert On 06/21/2017 12:21 AM, Stefan Strogin wrote: This patch adds ptest for slang, it uses `make runtests` to run tests. The Makefile runs runtests.sh for each *.sl and *.slc tests. runtests.sh is patched for printing test results in a common format, Makefile is patched in order not to compile any dependencies. Changes v2->v3: rebased on the latest master (1d9a88f6). Signed-off-by: Stefan StroginCc: xe-linux-exter...@cisco.com --- meta/recipes-extended/slang/slang/run-ptest| 3 +++ ...-add-output-in-the-format-result-testname.patch | 30 ++ meta/recipes-extended/slang/slang_2.3.1a.bb| 25 +- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/slang/slang/run-ptest create mode 100644 meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch diff --git a/meta/recipes-extended/slang/slang/run-ptest b/meta/recipes-extended/slang/slang/run-ptest new file mode 100644 index 00..39f474af31 --- /dev/null +++ b/meta/recipes-extended/slang/slang/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +make -C test runtests diff --git a/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch b/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch new file mode 100644 index 00..27a9bb87ea --- /dev/null +++ b/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch @@ -0,0 +1,30 @@ +From 38688ee2754415cf2a1935dafb8278861b7315e7 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Thu, 2 Mar 2017 00:26:31 +0200 +Subject: [PATCH] test: add output in the format "result: testname" + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Stefan Strogin +--- + src/test/runtests.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/test/runtests.sh b/src/test/runtests.sh +index a3eaad0..64f0705 100755 +--- a/src/test/runtests.sh b/src/test/runtests.sh +@@ -34,8 +34,10 @@ do + then + n_failed=`expr ${n_failed} + 1` + tests_failed="$tests_failed $testfile" ++ echo "FAIL: $testfile" + else + touch lastrun/$testfile ++ echo "PASS: $testfile" + fi + done + +-- +2.11.0 + diff --git a/meta/recipes-extended/slang/slang_2.3.1a.bb b/meta/recipes-extended/slang/slang_2.3.1a.bb index c71d80481f..b302104ee1 100644 --- a/meta/recipes-extended/slang/slang_2.3.1a.bb +++ b/meta/recipes-extended/slang/slang_2.3.1a.bb @@ -17,6 +17,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ file://no-x.patch \ file://dont-link-to-host.patch \ + file://test-add-output-in-the-format-result-testname.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "c5235313042ed0e71ec708f7b85ec241" @@ -25,7 +27,7 @@ SRC_URI[sha256sum] = "54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021 UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/; PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n" -inherit autotools-brokensep +inherit autotools-brokensep ptest CLEANBROKEN = "1"
[OE-core] [PATCH 1/1] bind: 9.10..3-P3 -> 9.10.5-P3
From: Kai KangUpgrade bind from 9.10.3-P3 to 9.10.5-P3 * Update md5sum of LIC_FILES_CHKSUM that it update year in file COPYRIGHT * Remvoe mips1-not-support-opcode.diff which has been merged * Remove CVE patches that there are backported from upstream * Use python3 for build and make sure install .py files to right directory Signed-off-by: Kai Kang --- ...0001-build-use-pkg-config-to-find-libxml2.patch | 10 +- .../bind/bind/CVE-2016-1285.patch | 154 --- .../bind/bind/CVE-2016-1286_1.patch| 79 -- .../bind/bind/CVE-2016-1286_2.patch| 317 -- .../bind/bind/CVE-2016-2088.patch | 247 - .../bind/bind/CVE-2016-2775.patch | 90 -- .../bind/bind/CVE-2016-2776.patch | 123 --- .../bind/bind/CVE-2016-6170.patch | 1090 .../bind/bind/CVE-2016-8864.patch | 219 .../bind/bind/bind-confgen-build-unix.o-once.patch | 10 +- .../bind/bind/mips1-not-support-opcode.diff| 104 -- .../use-python3-and-fix-install-lib-path.patch | 36 + .../bind/{bind_9.10.3-P3.bb => bind_9.10.5-P3.bb} | 25 +- 13 files changed, 61 insertions(+), 2443 deletions(-) delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-1285.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-1286_1.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-1286_2.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-2088.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-2775.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-2776.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-6170.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-8864.patch delete mode 100644 meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff create mode 100644 meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch rename meta/recipes-connectivity/bind/{bind_9.10.3-P3.bb => bind_9.10.5-P3.bb} (85%) diff --git a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch b/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch index 805cbb3..1e23c0f 100644 --- a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch +++ b/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch @@ -7,15 +7,19 @@ Signed-off-by: Ross Burton Update context for version 9.10.3-P2. Signed-off-by: Kai Kang + +Update context for version 9.10.5-P3. + +Signed-off-by: Kai Kang --- configure.in | 23 +++ 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/configure.in b/configure.in -index 0db826d..75819eb 100644 +index 4da73a4..6f2a754 100644 --- a/configure.in +++ b/configure.in -@@ -2107,26 +2107,9 @@ case "$use_libxml2" in +@@ -2282,26 +2282,9 @@ case "$use_libxml2" in DST_LIBXML2_INC="" ;; auto|yes) @@ -25,7 +29,7 @@ index 0db826d..75819eb 100644 - libxml2_cflags=`xml2-config --cflags` - ;; - *) -- if test "$use_libxml2" = "yes" ; then +- if test "yes" = "$use_libxml2" ; then - AC_MSG_RESULT(no) - AC_MSG_ERROR(required libxml2 version not available) - else diff --git a/meta/recipes-connectivity/bind/bind/CVE-2016-1285.patch b/meta/recipes-connectivity/bind/bind/CVE-2016-1285.patch deleted file mode 100644 index 2149bd1..000 --- a/meta/recipes-connectivity/bind/bind/CVE-2016-1285.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 70037e040e587329cec82123e12b9f4f7c945f67 Mon Sep 17 00:00:00 2001 -From: Mark Andrews -Date: Thu, 18 Feb 2016 12:11:27 +1100 -Subject: [PATCH] 4318. [security] Malformed control messages can - trigger assertions in named and rndc. (CVE-2016-1285) - [RT #41666] - -(cherry picked from commit a2b15b3305acd52179e6f3dc7d073b07fbc40b8e) - -CVE: CVE-2016-1285 -Upstream-Status: Backport -[Removed doc/arm/notes.xml changes from upstream patch] - -Signed-off-by: Sona Sarmadi - CHANGES | 3 +++ - bin/named/control.c | 2 +- - bin/named/controlconf.c | 2 +- - bin/rndc/rndc.c | 8 - doc/arm/notes.xml | 11 +++ - lib/isccc/cc.c | 14 +++--- - 6 files changed, 27 insertions(+), 13 deletions(-) - -diff --git a/CHANGES b/CHANGES -index b9bd9ef..2c727d5 100644 a/CHANGES -+++ b/CHANGES -@@ -1,3 +1,6 @@ -+4318. [security] Malformed control messages can trigger assertions -+
[OE-core] [PATCH 0/1] bind: 9.10..3-P3 -> 9.10.5-P3
From: Kai KangThe following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/bind http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/bind Kai Kang (1): bind: 9.10..3-P3 -> 9.10.5-P3 ...0001-build-use-pkg-config-to-find-libxml2.patch | 10 +- .../bind/bind/CVE-2016-1285.patch | 154 --- .../bind/bind/CVE-2016-1286_1.patch| 79 -- .../bind/bind/CVE-2016-1286_2.patch| 317 -- .../bind/bind/CVE-2016-2088.patch | 247 - .../bind/bind/CVE-2016-2775.patch | 90 -- .../bind/bind/CVE-2016-2776.patch | 123 --- .../bind/bind/CVE-2016-6170.patch | 1090 .../bind/bind/CVE-2016-8864.patch | 219 .../bind/bind/bind-confgen-build-unix.o-once.patch | 10 +- .../bind/bind/mips1-not-support-opcode.diff| 104 -- .../use-python3-and-fix-install-lib-path.patch | 36 + .../bind/{bind_9.10.3-P3.bb => bind_9.10.5-P3.bb} | 25 +- 13 files changed, 61 insertions(+), 2443 deletions(-) delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-1285.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-1286_1.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-1286_2.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-2088.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-2775.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-2776.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-6170.patch delete mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-8864.patch delete mode 100644 meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff create mode 100644 meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch rename meta/recipes-connectivity/bind/{bind_9.10.3-P3.bb => bind_9.10.5-P3.bb} (85%) -- 2.10.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Upgrade to 2017.07 release (WIP)
On Mon, Jul 10, 2017 at 03:12:19PM -0400, Tom Rini wrote: > On Mon, Jul 10, 2017 at 12:08:41PM -0700, Khem Raj wrote: > > On 7/10/17 12:06 PM, Tom Rini wrote: > > > On Mon, Jul 10, 2017 at 09:02:39PM +0200, Marek Vasut wrote: > > >> On 07/10/2017 09:01 PM, Tom Rini wrote: > > >>> On Mon, Jul 10, 2017 at 08:57:19PM +0200, Marek Vasut wrote: > > On 07/10/2017 08:51 PM, Otavio Salvador wrote: > > > On Mon, Jul 10, 2017 at 3:47 PM, Marek Vasutwrote: > > >> On 07/10/2017 08:36 PM, Otavio Salvador wrote: > > >>> This patch upgrades the U-Boot to the 2017.07 release. > > >>> > > >>> Signed-off-by: Otavio Salvador > > >>> --- > > >>> > > >>> .../u-boot/{u-boot-common_2017.05.inc => > > >>> u-boot-common_2017.07.inc} | 2 +- > > >>> .../u-boot/{u-boot-fw-utils_2017.05.bb => > > >>> u-boot-fw-utils_2017.07.bb} | 0 > > >>> .../u-boot/{u-boot-mkimage_2017.05.bb => > > >>> u-boot-mkimage_2017.07.bb} | 0 > > >>> meta/recipes-bsp/u-boot/{u-boot_2017.05.bb => u-boot_2017.07.bb} > > >>> | 0 > > >>> 4 files changed, 1 insertion(+), 1 deletion(-) > > >>> rename meta/recipes-bsp/u-boot/{u-boot-common_2017.05.inc => > > >>> u-boot-common_2017.07.inc} (88%) > > >>> rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2017.05.bb => > > >>> u-boot-fw-utils_2017.07.bb} (100%) > > >>> rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2017.05.bb => > > >>> u-boot-mkimage_2017.07.bb} (100%) > > >>> rename meta/recipes-bsp/u-boot/{u-boot_2017.05.bb => > > >>> u-boot_2017.07.bb} (100%) > > >>> > > >>> diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc > > >>> b/meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc > > >>> similarity index 88% > > >>> rename from meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc > > >>> rename to meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc > > >>> index 0e52f27df8..f27989daa1 100644 > > >>> --- a/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc > > >>> +++ b/meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc > > >>> @@ -7,7 +7,7 @@ PE = "1" > > >>> > > >>> # We use the revision in order to avoid having to fetch it from the > > >>> # repo during parse > > >>> -SRCREV = "64c4ffa9fa223f7ae8640f9c8f3044bfa0e3bfda" > > >>> +SRCREV = "d85ca029f257b53a96da6c2fb421e78a003a9943" > > >> > > >> Where did you get this hash from, it's not in the U-Boot repo ... > > > > > > From the tag used by Tom. You can check it on his github repository. > > > > I cannot, that is NOT where the U-Boot recipe points to nor is it in > > any > > way an official U-Boot source git tree . > > >>> > > >>> It's also on the official github mirror. I'll go see why the DENX git > > >>> is lagging behind. > > >> > > >> Hm that's weird. How can it be a mirror if it contains objects not in > > >> the mirrored repo ? ;-) > > > > > > git supports multiple push URIs. So I update all 3 locations with a > > > single push. However, git.denx.de works differently than github.com > > > does. > > > > may be pushing to upstream and then pulling before populating the > > mirrors could solve such issues. but I think we should use github.com > > in OE src_uri's for speed reasons. > > On the back end, things are a bit more complex than that, but I'm > working to resolve the current error now. FWIW, changing the OE recipe > to fetch from https://github.com/u-boot/u-boot.git would be fine with > me, it's owned by myself, Wolfgang and the person that helped us out and > got that project created to start with, so it will only have official > changes in it. FWIW, I'd be against such change, as long as denx.de remains the official home of U-boot. We don't pull kernel from https://github.com/torvalds/linux -- Denys -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dhcp: fix genetle shutdown not work while bind9 compile with --enable-threads
On 2017年07月11日 19:19, Burton, Ross wrote: On 11 July 2017 at 09:13, Hongxu Jia> wrote: +Upstream-Status: Inappropriate [OE specific] This is not OE specific. We enable a specific build combination, and it breaks. Have you reported this upstream? Should we disable gentle shutdown as it's clearly not being tested that much? The upstream disable gentle shutdown and disable threads by default. The difficult point is disable thread in bind6, and the fix is on dhcp. We enable threads and backport the patch from fedora. Disable gentle shutdown will introduce other issue (dhcpd could not stopped by SIGTERM) The root cause is enable threads, if we disable it, everything is ok. I will try to find a nice way to report upstream. //Hongxu Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gnu-efi: Upgrade package to 3.0.6 and refresh patches
Version 3.0.6 fixes a failure when using the pxe headers and allows us to drop the explicit fall through patch as it was fixed upstream. Other patches were rebased on top of the new version. Signed-off-by: California Sullivan--- ...plicit-fall-through-so-Wextra-will-work-i.patch | 34 -- .../gnu-efi/gnu-efi/gcc46-compatibility.patch | 24 -- .../gnu-efi/gnu-efi/parallel-make-archives.patch | 54 -- .../gnu-efi/{gnu-efi_3.0.5.bb => gnu-efi_3.0.6.bb} | 5 +- 4 files changed, 51 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.5.bb => gnu-efi_3.0.6.bb} (92%) diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch deleted file mode 100644 index d0aeb2d..000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 676a8a9001f06808b4dbe0a545d76b5d9a8ebf48 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 2 Feb 2017 13:51:27 -0500 -Subject: [PATCH] Mark our explicit fall through so -Wextra will work in gcc 7 - -gcc 7 introduces detection of fall-through behavior in switch/case -statements, and will warn if -Wimplicit-fallthrough is present and there -is no comment stating that the fall-through is intentional. This is -also triggered by -Wextra, as it enables -Wimplicit-fallthrough=1. - -This patch adds the comment in the one place we use fall-through. - -Signed-off-by: Peter Jones -Upstream-Status: Pending - - lib/print.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/print.c b/lib/print.c -index b8a9d38..cb732f0 100644 a/lib/print.c -+++ b/lib/print.c -@@ -1131,6 +1131,7 @@ Returns: - case 'X': - Item.Width = Item.Long ? 16 : 8; - Item.Pad = '0'; -+ /* falls through */ - case 'x': - ValueToHex ( - Item.Scratch, --- -2.12.2 - diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch index 0ce6d7b..69efd34 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch @@ -1,3 +1,8 @@ +From 8d16ae374c5d4d9fac45c002605a66cfb8c08be5 Mon Sep 17 00:00:00 2001 +From: Steve Langasek +Date: Wed, 9 Sep 2015 08:26:06 + +Subject: [PATCH 3/3] gnu-efi, syslinux: Support gcc < 4.7 + don't break with old compilers and -DGNU_EFI_USE_MS_ABI It's entirely legitimate to request GNU_EFI_USE_MS_ABI even if the current compiler doesn't support it, and gnu-efi should transparently fall back to @@ -6,16 +11,25 @@ checking, but at least it will still compile. Author: Steve Langasek Upstream-Status: Pending -Index: gnu-efi-3.0.3/inc/x86_64/efibind.h -=== gnu-efi-3.0.3.orig/inc/x86_64/efibind.h -+++ gnu-efi-3.0.3/inc/x86_64/efibind.h +[Rebased for 3.0.6] +Signed-off-by: California Sullivan +--- + inc/x86_64/efibind.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h +index 4309f9f..02c0af1 100644 +--- a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h @@ -25,8 +25,6 @@ Revision History #if defined(GNU_EFI_USE_MS_ABI) - #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) + #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))||(defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2))) #define HAVE_USE_MS_ABI 1 -#else -#error Compiler is too old for GNU_EFI_USE_MS_ABI #endif #endif +-- +2.9.4 + diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch index e5b47c1..0110260 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch @@ -1,4 +1,7 @@ -Fix parallel make failure for archives +From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001 +From: Saul Wold +Date: Sun, 9 Mar 2014 15:22:15 +0200 +Subject: [PATCH 1/3] Fix parallel make failure for archives Upstream-Status: Pending @@ -12,31 +15,18 @@ for details. Signed-off-by: Saul Wold Signed-off-by: Darren Hart +[Rebased for 3.0.6] +Signed-off-by: California Sullivan
Re: [OE-core] [PATCH 3/3] libepoxy: Upgrade 1.4.2 -> 1.4.3
On Tue, Jul 11, 2017 at 3:02 PM, Andrea Galbuserawrote: > > > Il 11 lug 2017 8:00 PM, "Khem Raj" ha scritto: > > On Tue, Jul 11, 2017 at 1:34 AM, Jussi Kukkonen > wrote: >> On 11 July 2017 at 11:27, Jussi Kukkonen wrote: >>> >>> On 11 July 2017 at 10:42, Jussi Kukkonen >>> wrote: > > Exception: FileExistsError: [Errno 17] File exists: > > '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/sysroots-components/raspberrypi3/userland/usr/include/KHR/khrplatform.h' > -> > > '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/gtk+3/3.22.16-r0/recipe-sysroot/usr/include/KHR/khrplatform.h' /usr/include/KHR/khrplatform.h is the egl platform header file, provided by both mesa and RPI userland. Does mesa end up in your gtk+3 recipe-sysroot somehow? For clarity: this could be a bug but it is unlikely to be related to the libepoxy change (it does not use or ship the actual header file). >>> >>> >>> Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa >>> accidentally shipped khrplatform.h even when egl was disabled (which is >>> what >>> mesa-gl in oe-core does). >>> >> >> Sorry, I've not had enough coffee. It was the other way round: >> khrplatform.h is the platform header that mesa now thinks is needed >> whether >> egl is enabled or not -- so they've started installing it in any case from >> 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts >> with userland. >> >> I don't know what the correct fix is yet, just wanted to correct my >> original >> wrong info. >> > > Post an update to sync this header for userland package. > > > Will this help solving the gtk+3 issue of mesa-gl and userland now both > providing the same header and causing recipe-sysroot construction to fail? No it certainly would not. But we can then decide who provides it, in a easy way. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] libepoxy: Upgrade 1.4.2 -> 1.4.3
Il 11 lug 2017 8:00 PM, "Khem Raj"ha scritto: On Tue, Jul 11, 2017 at 1:34 AM, Jussi Kukkonen wrote: > On 11 July 2017 at 11:27, Jussi Kukkonen wrote: >> >> On 11 July 2017 at 10:42, Jussi Kukkonen wrote: Exception: FileExistsError: [Errno 17] File exists: '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/ sysroots-components/raspberrypi3/userland/usr/include/KHR/khrplatform.h' -> '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/work/ cortexa7hf-neon-vfpv4-poky-linux-gnueabi/gtk+3/3.22.16- r0/recipe-sysroot/usr/include/KHR/khrplatform.h' >>> >>> >>> /usr/include/KHR/khrplatform.h is the egl platform header file, provided >>> by both mesa and RPI userland. Does mesa end up in your gtk+3 recipe-sysroot >>> somehow? >>> >>> For clarity: this could be a bug but it is unlikely to be related to the >>> libepoxy change (it does not use or ship the actual header file). >>> >> >> >> Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa >> accidentally shipped khrplatform.h even when egl was disabled (which is what >> mesa-gl in oe-core does). >> > > Sorry, I've not had enough coffee. It was the other way round: > khrplatform.h is the platform header that mesa now thinks is needed whether > egl is enabled or not -- so they've started installing it in any case from > 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts > with userland. > > I don't know what the correct fix is yet, just wanted to correct my original > wrong info. > Post an update to sync this header for userland package. Will this help solving the gtk+3 issue of mesa-gl and userland now both providing the same header and causing recipe-sysroot construction to fail? > > -- > ___ > 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] valgrind: Update 3.12.0 -> 3.13.0
On 11 July 2017 at 13:45, Burton, Rosswrote: > I just replicated this and yes your failure is gold specific. > Fixed, patch on the list, and sent it upstream. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] valgrind: fix link failure with gold
Signed-off-by: Ross Burton--- .../valgrind/valgrind/link-gz-tests.patch | 25 ++ meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch b/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch new file mode 100644 index 000..b55c9043cd5 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch @@ -0,0 +1,25 @@ +When checking if the compiler supports compressed debug sections we need to actually link instead of just compile. Otherwise the compiler thinks that they are supported, but gold does not support -gz=zlib. + +Upstream-Status: Submitted (https://bugs.kde.org/show_bug.cgi?id=382256) +Signed-off-by: Ross Burton + +--- a/configure.ac~2017-07-11 11:53:16.0 +0100 b/configure.ac 2017-07-11 18:16:13.674130483 +0100 +@@ -2119,7 +2119,7 @@ + safe_CFLAGS=$CFLAGS + CFLAGS="-g -gz=zlib" + +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[ + return 0; + ]])], [ + ac_have_gz_zlib=yes +@@ -2139,7 +2139,7 @@ + safe_CFLAGS=$CFLAGS + CFLAGS="-g -gz=zlib-gnu" + +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[ + return 0; + ]])], [ + ac_have_gz_zlib_gnu=yes diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index b63d27861d5..0cc5eefc88e 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -35,6 +35,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ + file://link-gz-tests.patch \ " SRC_URI_append_libc-musl = "\ file://0001-fix-build-for-musl-targets.patch \ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dpky.py: Adds testcases for dpkg package manager
From: Libertad CruzAdds dpkg testcases for testing basic operation functionality for the dpkg package manager. [YOCTO #10063] Signed-off-by: Libertad Cruz --- meta/lib/oeqa/runtime/cases/dpkg.py | 52 + 1 file changed, 52 insertions(+) create mode 100644 meta/lib/oeqa/runtime/cases/dpkg.py diff --git a/meta/lib/oeqa/runtime/cases/dpkg.py b/meta/lib/oeqa/runtime/cases/dpkg.py new file mode 100644 index 000..cd1183c --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/dpkg.py @@ -0,0 +1,52 @@ +import os +import re +import subprocess + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.oeid import OETestID +from oeqa.core.decorator.data import skipIfNotDataVar, skipIfNotFeature +from oeqa.runtime.decorator.package import OEHasPackage + + +class dpkgTest(OERuntimeTestCase): +def dpkg(self, command, expected=0): +status, output = self.target.run(command, 1500) +message = os.linesep.join([command, output]) +self.assertEqual(status, expected, message) +return output + +class dpkgBasicTest(dpkgTest): +@skipIfNotFeature('package-management','Test requires package-management to be in IMAGE_FEATURES') +@skipIfNotDataVar('IMAGE_PKGTYPE','deb','DEB is not the primary package manager') +@OEHasPackage(['dpkg']) + +@OETestDepends(['ssh.SSHTest.test_ssh']) +@OETestID(1801) +def test_dpkg_help(self): +self.dpkg('dpkg --help') + +@OETestDepends(['dpkg.dpkgBasicTest.test_dpkg_help']) +@OETestID(1802) +def test_dpkg_version(self): +self.dpkg('dpkg --version') + +@OETestID(1803) +def test_dpkg_Dhelp(self): +self.dpkg('dpkg -Dhelp') + +@OETestID(1805) +def test_dpkg_force_help(self): +self.dpkg('dpkg --force-help') + +@OETestID(1806) +def test_dpkg_deb_help(self): +self.dpkg('dpkg-deb --help') + +@OETestID(1812) +def test_dpkg_status(self): +self.dpkg('dpkg -s dpkg') + +@OETestID(1814) +def test_dpkg_list(self): +self.dpkg('dpkg -l') -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [morty][PATCH 1/1] openssl-native: Compile with -fPIC
Hi Armin, Could we backport this patch to morty? On 07/11/2017 12:39 PM, Khem Raj wrote: On Tue, Jul 11, 2017 at 12:07 PM, Martin Kellywrote: Hi, Is there any issue with backporting this to morty? It would help me fix a build crash I'm seeing on morty, and I'm currently using the backport in a separate repo with no issue. there should be no issues. Let Armin know of your request. On 06/28/2017 11:06 AM, Martin Kelly wrote: On 05/26/2017 12:03 AM, Mirza Krak wrote: From: Khem Raj Fixes | /usr/bin/ld: libcrypto.a(sha1-x86_64.o): relocation R_X86_64_PC32 against undefined symbol `OPENSSL_ia32cap_P' can not be used when making a shared object; recompile with -fPIC | /usr/bin/ld: final link failed: Bad value Signed-off-by: Khem Raj (cherry picked from commit 0a19e72081771fca8ed94fb2a2a8996fd3dce00c) Signed-off-by: Mirza Krak --- I hit the same compiler error as in above commit message when running on morty branch. I simply cherry-picked that fix in to morty branch. I looked in the git log of oe-core and it seems to me that it shall be ok to do that? This is a re-send since I messed up Subject the first time around [1] I want to put in my $0.02 that I have hit the same issue and would also like the fix to be cherry-picked into morty. I tested and agree that it seems to work with no issue. [1]. http://lists.openembedded.org/pipermail/openembedded-core/2017-May/136489.html meta/recipes-connectivity/openssl/openssl_1.0.2j.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb index 9a7cdedd05..b6fb126349 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb @@ -5,6 +5,7 @@ require openssl.inc DEPENDS += "cryptodev-linux" CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" +CFLAG_append_class-native = " -fPIC" LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6" -- 2.13.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 oeqa core and oe-selftest threaded enablement
== Series Details == Series: oeqa core and oe-selftest threaded enablement Revision: 1 URL : https://patchwork.openembedded.org/series/7694/ 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 b1c4661742) * Issue Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists [test_target_mailing_list] Suggested fixSend the series again to the correct mailing list (ML) Suggested ML p...@yoctoproject.org [http://git.yoctoproject.org/cgit/cgit.cgi/poky/] Patch's path:meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py 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 26/30] selftest/cases/devtool{, end}: Move update/finish_modify tests to its own module
This devtool tests are set to run at end because made changes into the poky repository causing problems (non deteministic meta data) in other execution threads. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/devtool.py | 545 ++-- meta/lib/oeqa/selftest/cases/devtool_end.py | 506 ++ 2 files changed, 532 insertions(+), 519 deletions(-) create mode 100644 meta/lib/oeqa/selftest/cases/devtool_end.py diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 3d8d246bb7c..44ba361f16c 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -112,6 +112,32 @@ class DevtoolBase(OESelftestTestCase): filelist.append(' '.join(splitline)) return filelist +def _check_src_repo(self, repo_dir): +"""Check srctree git repository""" +self.assertTrue(os.path.isdir(os.path.join(repo_dir, '.git')), +'git repository for external source tree not found') +result = self.runCmd('git status --porcelain', cwd=repo_dir) +self.assertEqual(result.output.strip(), "", + 'Created git repo is not clean') +result = self.runCmd('git symbolic-ref HEAD', cwd=repo_dir) +self.assertEqual(result.output.strip(), "refs/heads/devtool", + 'Wrong branch in git repo') + +def _check_repo_status(self, repo_dir, expected_status): +"""Check the worktree status of a repository""" +result = self.runCmd('git status . --porcelain', +cwd=repo_dir) +for line in result.output.splitlines(): +for ind, (f_status, fn_re) in enumerate(expected_status): +if re.match(fn_re, line[3:]): +if f_status != line[:2]: +self.fail('Unexpected status in line: %s' % line) +expected_status.pop(ind) +break +else: +self.fail('Unexpected modified file in line: %s' % line) +if expected_status: +self.fail('Missing file changes: %s' % expected_status) class DevtoolCommon(DevtoolBase): _use_own_builddir = True @@ -150,33 +176,6 @@ class DevtoolTests(DevtoolCommon): _use_own_builddir = True _main_thread = False -def _check_src_repo(self, repo_dir): -"""Check srctree git repository""" -self.assertTrue(os.path.isdir(os.path.join(repo_dir, '.git')), -'git repository for external source tree not found') -result = self.runCmd('git status --porcelain', cwd=repo_dir) -self.assertEqual(result.output.strip(), "", - 'Created git repo is not clean') -result = self.runCmd('git symbolic-ref HEAD', cwd=repo_dir) -self.assertEqual(result.output.strip(), "refs/heads/devtool", - 'Wrong branch in git repo') - -def _check_repo_status(self, repo_dir, expected_status): -"""Check the worktree status of a repository""" -result = self.runCmd('git status . --porcelain', -cwd=repo_dir) -for line in result.output.splitlines(): -for ind, (f_status, fn_re) in enumerate(expected_status): -if re.match(fn_re, line[3:]): -if f_status != line[:2]: -self.fail('Unexpected status in line: %s' % line) -expected_status.pop(ind) -break -else: -self.fail('Unexpected modified file in line: %s' % line) -if expected_status: -self.fail('Missing file changes: %s' % expected_status) - @OETestID(1158) def test_create_workspace(self): # Check preconditions @@ -687,417 +686,6 @@ class DevtoolTests(DevtoolCommon): self._check_src_repo(tempdir) # This is probably sufficient - -@OETestID(1169) -def test_devtool_update_recipe(self): -# Check preconditions -testrecipe = 'minicom' -bb_vars = self.get_bb_vars(['FILE', 'SRC_URI'], testrecipe) -recipefile = bb_vars['FILE'] -src_uri = bb_vars['SRC_URI'] -self.assertNotIn('git://', src_uri, 'This test expects the %s recipe to NOT be a git recipe' % testrecipe) -self._check_repo_status(os.path.dirname(recipefile), []) -# First, modify a recipe -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 %s' % self.workspacedir) -# (don't bother with cleaning the recipe on teardown, we won't be building it) -# We don't use -x here so that we test the behaviour of devtool modify without it -result = self.runCmd('devtool modify
[OE-core] [PATCH 28/30] argparse_oe: Add int_positive type
Sometimes only expect positive values from cmdline so it's better to filter at parsing cmdline step instead of validate later. Signed-off-by: Aníbal Limón--- scripts/lib/argparse_oe.py | 7 +++ 1 file changed, 7 insertions(+) diff --git a/scripts/lib/argparse_oe.py b/scripts/lib/argparse_oe.py index bf6eb17197b..9bdfc1ceca2 100644 --- a/scripts/lib/argparse_oe.py +++ b/scripts/lib/argparse_oe.py @@ -167,3 +167,10 @@ class OeHelpFormatter(argparse.HelpFormatter): return '\n'.join(lines) else: return super(OeHelpFormatter, self)._format_action(action) + +def int_positive(value): +ivalue = int(value) +if ivalue <= 0: +raise argparse.ArgumentTypeError( +"%s is not a positive int value" % value) +return ivalue -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 27/30] seltest/cases/devtool: Build dbus on test_devtool_add_git_local
The dbus-wait recipe has the dependency of dbus, due to now we have build folder per test class the dependency needs to be build before run devtool add because without it the DEPENDS field is unset. The devtool/recipetool uses previously build recipes to figure out the dependencies. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/devtool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 44ba361f16c..c5ca95022bb 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -248,6 +248,8 @@ class DevtoolTests(DevtoolCommon): # Test devtool add self.track_for_cleanup(self.workspacedir) self.add_command_to_tearDown('bitbake-layers remove-layer %s' % self.workspacedir) +# dbus needs to be built because is a dependency of dbus-wait +self.bitbake('dbus') # Don't specify a name since we should be able to auto-detect it result = self.runCmd('devtool add %s' % srcdir) self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 24/30] oeqa/selftest/cases: recipetool enable for threaded runs
- Change to use wrappers from OESelfTestCase. - Move templayer dir creation to RecipetoolBase class because now every class has its own build folder. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/recipetool.py | 105 +++-- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index bdd405f1cc0..59544336578 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -3,30 +3,30 @@ import shutil import tempfile import urllib.parse -from oeqa.utils.commands import runCmd, bitbake, get_bb_var -from oeqa.utils.commands import get_bb_vars, create_temp_layer -from oeqa.core.decorator.oeid import OETestID from oeqa.selftest.cases import devtool +from oeqa.utils.commands import create_temp_layer +from oeqa.core.decorator.oeid import OETestID -templayerdir = None - -def setUpModule(): -global templayerdir -templayerdir = tempfile.mkdtemp(prefix='recipetoolqa') -create_temp_layer(templayerdir, 'selftestrecipetool') -runCmd('bitbake-layers add-layer %s' % templayerdir) - +class RecipetoolBase(devtool.DevtoolBase): +@classmethod +def setUpClass(cls): +super(RecipetoolBase, cls).setUpClass() -def tearDownModule(): -runCmd('bitbake-layers remove-layer %s' % templayerdir, ignore_status=True) -runCmd('rm -rf %s' % templayerdir) +cls.templayerdir = tempfile.mkdtemp(prefix='recipetoolqa') +create_temp_layer(cls.templayerdir, 'selftestrecipetool') +cls.runCmd('bitbake-layers add-layer %s' % cls.templayerdir) +@classmethod +def tearDownClass(cls): +super(RecipetoolBase, cls).tearDownClass() -class RecipetoolBase(devtool.DevtoolBase): +cls.runCmd('bitbake-layers remove-layer %s' % cls.templayerdir, +ignore_status=True) +cls.runCmd('rm -rf %s' % cls.templayerdir) def setUpLocal(self): super(RecipetoolBase, self).setUpLocal() -self.templayerdir = templayerdir + self.tempdir = tempfile.mkdtemp(prefix='recipetoolqa') self.track_for_cleanup(self.tempdir) self.testfile = os.path.join(self.tempdir, 'testfile') @@ -34,15 +34,15 @@ class RecipetoolBase(devtool.DevtoolBase): f.write('Test file\n') def tearDownLocal(self): -runCmd('rm -rf %s/recipes-*' % self.templayerdir) +self.runCmd('rm -rf %s/recipes-*' % self.templayerdir) super(RecipetoolBase, self).tearDownLocal() def _try_recipetool_appendcmd(self, cmd, testrecipe, expectedfiles, expectedlines=None): -result = runCmd(cmd) +result = self.runCmd(cmd) self.assertNotIn('Traceback', result.output) # Check the bbappend was created and applies properly -recipefile = get_bb_var('FILE', testrecipe) +recipefile = self.get_bb_var('FILE', testrecipe) bbappendfile = self._check_bbappend(testrecipe, recipefile, self.templayerdir) # Check the bbappend contents @@ -66,14 +66,16 @@ class RecipetoolBase(devtool.DevtoolBase): class RecipetoolTests(RecipetoolBase): +_use_own_builddir = True +_main_thread = False @classmethod def setUpClass(cls): super(RecipetoolTests, cls).setUpClass() # Ensure we have the right data in shlibs/pkgdata cls.logger.info('Running bitbake to generate pkgdata') -bitbake('-c packagedata base-files coreutils busybox selftest-recipetool-appendfile') -bb_vars = get_bb_vars(['COREBASE', 'BBPATH']) +cls.bitbake('-c packagedata base-files coreutils busybox selftest-recipetool-appendfile') +bb_vars = cls.get_bb_vars(['COREBASE', 'BBPATH']) cls.corebase = bb_vars['COREBASE'] cls.bbpath = bb_vars['BBPATH'] @@ -83,7 +85,7 @@ class RecipetoolTests(RecipetoolBase): def _try_recipetool_appendfile_fail(self, destfile, newfile, checkerror): cmd = 'recipetool appendfile %s %s %s' % (self.templayerdir, destfile, newfile) -result = runCmd(cmd, ignore_status=True) +result = self.runCmd(cmd, ignore_status=True) self.assertNotEqual(result.status, 0, 'Command "%s" should have failed but didn\'t' % cmd) self.assertNotIn('Traceback', result.output) for errorstr in checkerror: @@ -125,7 +127,7 @@ class RecipetoolTests(RecipetoolBase): bbappendfile, _ = self._try_recipetool_appendfile('coreutils', '/bin/ls', self.testfile, '-r coreutils', expectedlines, [testfile2name]) # But file should have copiedfile = os.path.join(os.path.dirname(bbappendfile), 'coreutils', testfile2name) -result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True) +result = self.runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True)
[OE-core] [PATCH 25/30] oeqa/selftest/cases: Move devtool deploy test case to own module
The devtool deploy test case uses runqemu that uses tinfoil so tinfoil requires to run on the main thread. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/devtool.py| 91 ++--- meta/lib/oeqa/selftest/cases/devtool_deploy.py | 93 ++ 2 files changed, 97 insertions(+), 87 deletions(-) create mode 100644 meta/lib/oeqa/selftest/cases/devtool_deploy.py diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index c66e77a9ace..3d8d246bb7c 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -6,7 +6,7 @@ import glob import fnmatch import oeqa.utils.ftools as ftools -from oeqa.utils.commands import create_temp_layer, runqemu +from oeqa.utils.commands import create_temp_layer from oeqa.selftest.case import OESelftestTestCase from oeqa.core.decorator.oeid import OETestID @@ -114,6 +114,9 @@ class DevtoolBase(OESelftestTestCase): class DevtoolCommon(DevtoolBase): +_use_own_builddir = True +_main_thread = False + @classmethod def setUpClass(cls): super(DevtoolCommon, cls).setUpClass() @@ -1144,92 +1147,6 @@ class DevtoolTests(DevtoolCommon): matches2 = glob.glob(stampprefix2 + '*') self.assertFalse(matches2, 'Stamp files exist for recipe %s that should have been cleaned' % testrecipe2) -@OETestID(1272) -def test_devtool_deploy_target(self): -# NOTE: Whilst this test would seemingly be better placed as a runtime test, -# unfortunately the runtime tests run under bitbake and you can't run -# devtool within bitbake (since devtool needs to run bitbake itself). -# Additionally we are testing build-time functionality as well, so -# really this has to be done as an oe-selftest test. -# -# Check preconditions -machine = self.get_bb_var('MACHINE') -if not machine.startswith('qemu'): -self.skipTest('This test only works with qemu machines') -if not os.path.exists('/etc/runqemu-nosudo'): -self.skipTest('You must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') -result = self.runCmd('PATH="$PATH:/sbin:/usr/sbin" ip tuntap show', ignore_status=True) -if result.status != 0: -result = self.runCmd('PATH="$PATH:/sbin:/usr/sbin" ifconfig -a', ignore_status=True) -if result.status != 0: -self.skipTest('Failed to determine if tap devices exist with ifconfig or ip: %s' % result.output) -for line in result.output.splitlines(): -if line.startswith('tap'): -break -else: -self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') -self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') -# Definitions -testrecipe = 'mdadm' -testfile = '/sbin/mdadm' -testimage = 'oe-selftest-image' -testcommand = '/sbin/mdadm --help' -# Build an image to run -self.bitbake("%s qemu-native qemu-helper-native" % testimage) -deploy_dir_image = self.get_bb_var('DEPLOY_DIR_IMAGE') -self.add_command_to_tearDown('bitbake -c clean %s' % testimage) -self.add_command_to_tearDown('rm -f %s/%s*' % (deploy_dir_image, testimage)) -# Clean recipe so the first deploy will fail -self.bitbake("%s -c clean" % testrecipe) -# Try devtool modify -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 %s' % self.workspacedir) -self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe) -result = self.runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) -# Test that deploy-target at this point fails (properly) -result = self.runCmd('devtool deploy-target -n %s root@localhost' % testrecipe, ignore_status=True) -self.assertNotEqual(result.output, 0, 'devtool deploy-target should have failed, output: %s' % result.output) -self.assertNotIn(result.output, 'Traceback', 'devtool deploy-target should have failed with a proper error not a traceback, output: %s' % result.output) -result = self.runCmd('devtool build %s' % testrecipe) -# First try a dry-run of deploy-target -result = self.runCmd('devtool deploy-target -n %s root@localhost' % testrecipe) -self.assertIn(' %s' % testfile, result.output) -# Boot the image -with runqemu(testimage) as qemu: -# Now really test deploy-target -result = self.runCmd('devtool deploy-target -c %s root@%s' %
[OE-core] [PATCH 23/30] oeqa/selftest/cases: devtool enable threaded runs
- Add new class DevtoolCommon to split devtool suite into other modules. - Change to use wrappers from OESelfTest class (runCmd, bitbake). - When remove workspacedir using bitbake-layers use full path because now has it own builddir. - Add a build of xz-native because some tests needs it to decompress tarballs and is supposed to be provided, see bug [YOCTO #11474]. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/devtool.py | 644 1 file changed, 325 insertions(+), 319 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 28c84679a17..c66e77a9ace 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -6,13 +6,12 @@ import glob import fnmatch import oeqa.utils.ftools as ftools +from oeqa.utils.commands import create_temp_layer, runqemu + from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer -from oeqa.utils.commands import get_bb_vars, runqemu from oeqa.core.decorator.oeid import OETestID class DevtoolBase(OESelftestTestCase): - def _test_recipe_contents(self, recipefile, checkvars, checkinherits): with open(recipefile, 'r') as f: invar = None @@ -62,7 +61,7 @@ class DevtoolBase(OESelftestTestCase): self.assertIn(inherit, inherits, 'Missing inherit of %s' % inherit) def _check_bbappend(self, testrecipe, recipefile, appenddir): -result = runCmd('bitbake-layers show-appends', cwd=self.builddir) +result = self.runCmd('bitbake-layers show-appends', cwd=self.builddir) resultlines = result.output.splitlines() inrecipe = False bbappends = [] @@ -88,7 +87,7 @@ class DevtoolBase(OESelftestTestCase): create_temp_layer(templayerdir, templayername, priority, recipepathspec) if addlayer: self.add_command_to_tearDown('bitbake-layers remove-layer %s || true' % templayerdir) -result = runCmd('bitbake-layers add-layer %s' % templayerdir, cwd=self.builddir) +result = self.runCmd('bitbake-layers add-layer %s' % templayerdir, cwd=self.builddir) def _process_ls_output(self, output): """ @@ -114,47 +113,54 @@ class DevtoolBase(OESelftestTestCase): return filelist -class DevtoolTests(DevtoolBase): - +class DevtoolCommon(DevtoolBase): @classmethod def setUpClass(cls): -super(DevtoolTests, cls).setUpClass() -bb_vars = get_bb_vars(['TOPDIR', 'SSTATE_DIR']) +super(DevtoolCommon, cls).setUpClass() +bb_vars = cls.get_bb_vars(['TOPDIR', 'SSTATE_DIR']) cls.original_sstate = bb_vars['SSTATE_DIR'] cls.devtool_sstate = os.path.join(bb_vars['TOPDIR'], 'sstate_devtool') cls.sstate_conf = 'SSTATE_DIR = "%s"\n' % cls.devtool_sstate cls.sstate_conf += ('SSTATE_MIRRORS += "file://.* file:///%s/PATH"\n' % cls.original_sstate) +# XXX: some test cases needs xz-native to unpack like mdadm recipes +# and it is supposed to be provided +cls.bitbake("xz-native") + @classmethod def tearDownClass(cls): cls.logger.debug('Deleting devtool sstate cache on %s' % cls.devtool_sstate) -runCmd('rm -rf %s' % cls.devtool_sstate) -super(DevtoolTests, cls).tearDownClass() +cls.runCmd('rm -rf %s' % cls.devtool_sstate) +super(DevtoolCommon, cls).tearDownClass() def setUp(self): """Test case setup function""" -super(DevtoolTests, self).setUp() +super(DevtoolCommon, self).setUp() self.workspacedir = os.path.join(self.builddir, 'workspace') self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory ' 'under the build directory') self.append_config(self.sstate_conf) +class DevtoolTests(DevtoolCommon): +_use_own_builddir = True +_main_thread = False + def _check_src_repo(self, repo_dir): """Check srctree git repository""" self.assertTrue(os.path.isdir(os.path.join(repo_dir, '.git')), 'git repository for external source tree not found') -result = runCmd('git status --porcelain', cwd=repo_dir) +result = self.runCmd('git status --porcelain', cwd=repo_dir) self.assertEqual(result.output.strip(), "", 'Created git repo is not clean') -result = runCmd('git symbolic-ref HEAD', cwd=repo_dir) +result = self.runCmd('git symbolic-ref HEAD', cwd=repo_dir) self.assertEqual(result.output.strip(), "refs/heads/devtool", 'Wrong branch in git repo') def _check_repo_status(self, repo_dir, expected_status): """Check the worktree status of a
[OE-core] [PATCH 22/30] oeqa/selftest/cases: eSDK enable threaded runs
- Change some staticmethods to classmethods to be able access wrappers from OESelfTestCase. - Remove unused method update_configuration. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/eSDK.py | 61 +++- 1 file changed, 19 insertions(+), 42 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/eSDK.py b/meta/lib/oeqa/selftest/cases/eSDK.py index 60f4e239ab0..618f93c53c1 100644 --- a/meta/lib/oeqa/selftest/cases/eSDK.py +++ b/meta/lib/oeqa/selftest/cases/eSDK.py @@ -4,7 +4,6 @@ import os import glob from oeqa.core.decorator.oeid import OETestID from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars class oeSDKExtSelfTest(OESelftestTestCase): """ @@ -12,16 +11,15 @@ class oeSDKExtSelfTest(OESelftestTestCase): # This code is planned to be part of the automation for eSDK containig # Install libraries and headers, image generation binary feeds, sdk-update. """ - -@staticmethod -def get_esdk_environment(env_eSDK, tmpdir_eSDKQA): +@classmethod +def get_esdk_environment(cls, env_eSDK, tmpdir_eSDKQA): # XXX: at this time use the first env need to investigate # what environment load oe-selftest, i586, x86_64 pattern = os.path.join(tmpdir_eSDKQA, 'environment-setup-*') return glob.glob(pattern)[0] -@staticmethod -def run_esdk_cmd(env_eSDK, tmpdir_eSDKQA, cmd, postconfig=None, **options): +@classmethod +def run_esdk_cmd(cls, env_eSDK, tmpdir_eSDKQA, cmd, postconfig=None, **options): if postconfig: esdk_conf_file = os.path.join(tmpdir_eSDKQA, 'conf', 'local.conf') with open(esdk_conf_file, 'a+') as f: @@ -31,57 +29,37 @@ class oeSDKExtSelfTest(OESelftestTestCase): if not 'shell' in options: options['shell'] = True -runCmd("cd %s; . %s; %s" % (tmpdir_eSDKQA, env_eSDK, cmd), **options) +cls.runCmd("cd %s; . %s; %s" % (tmpdir_eSDKQA, env_eSDK, cmd), **options) -@staticmethod -def generate_eSDK(image): +@classmethod +def generate_eSDK(cls, image): pn_task = '%s -c populate_sdk_ext' % image -bitbake(pn_task) +cls.bitbake(pn_task) -@staticmethod -def get_eSDK_toolchain(image): +@classmethod +def get_eSDK_toolchain(cls, image): pn_task = '%s -c populate_sdk_ext' % image -bb_vars = get_bb_vars(['SDK_DEPLOY', 'TOOLCHAINEXT_OUTPUTNAME'], pn_task) +bb_vars = cls.get_bb_vars(['SDK_DEPLOY', 'TOOLCHAINEXT_OUTPUTNAME'], pn_task) sdk_deploy = bb_vars['SDK_DEPLOY'] toolchain_name = bb_vars['TOOLCHAINEXT_OUTPUTNAME'] return os.path.join(sdk_deploy, toolchain_name + '.sh') -@staticmethod -def update_configuration(cls, image, tmpdir_eSDKQA, env_eSDK, ext_sdk_path): -sstate_dir = os.path.join(cls.builddir, 'sstate-cache') - -oeSDKExtSelfTest.generate_eSDK(cls.image) - -cls.ext_sdk_path = oeSDKExtSelfTest.get_eSDK_toolchain(cls.image) -runCmd("%s -y -d \"%s\"" % (cls.ext_sdk_path, cls.tmpdir_eSDKQA)) - -cls.env_eSDK = oeSDKExtSelfTest.get_esdk_environment('', cls.tmpdir_eSDKQA) - -sstate_config=""" -SDK_LOCAL_CONF_WHITELIST = "SSTATE_MIRRORS" -SSTATE_MIRRORS = "file://.* file://%s/PATH" -CORE_IMAGE_EXTRA_INSTALL = "perl" -""" % sstate_dir - -with open(os.path.join(cls.tmpdir_eSDKQA, 'conf', 'local.conf'), 'a+') as f: -f.write(sstate_config) - @classmethod def setUpClass(cls): super(oeSDKExtSelfTest, cls).setUpClass() cls.tmpdir_eSDKQA = tempfile.mkdtemp(prefix='eSDKQA') -sstate_dir = get_bb_var('SSTATE_DIR') +sstate_dir = cls.get_bb_var('SSTATE_DIR') cls.image = 'core-image-minimal' -oeSDKExtSelfTest.generate_eSDK(cls.image) +cls.generate_eSDK(cls.image) # Install eSDK -cls.ext_sdk_path = oeSDKExtSelfTest.get_eSDK_toolchain(cls.image) -runCmd("%s -y -d \"%s\"" % (cls.ext_sdk_path, cls.tmpdir_eSDKQA)) +cls.ext_sdk_path = cls.get_eSDK_toolchain(cls.image) +cls.runCmd("%s -y -d \"%s\"" % (cls.ext_sdk_path, cls.tmpdir_eSDKQA)) -cls.env_eSDK = oeSDKExtSelfTest.get_esdk_environment('', cls.tmpdir_eSDKQA) +cls.env_eSDK = cls.get_esdk_environment('', cls.tmpdir_eSDKQA) # Configure eSDK to use sstate mirror from poky sstate_config=""" @@ -99,13 +77,12 @@ SSTATE_MIRRORS = "file://.* file://%s/PATH" @OETestID(1602) def test_install_libraries_headers(self): pn_sstate = 'bc' -bitbake(pn_sstate) +self.bitbake(pn_sstate) cmd = "devtool sdk-install %s " % pn_sstate -oeSDKExtSelfTest.run_esdk_cmd(self.env_eSDK, self.tmpdir_eSDKQA, cmd) +self.run_esdk_cmd(self.env_eSDK, self.tmpdir_eSDKQA, cmd) @OETestID(1603) def
[OE-core] [PATCH 21/30] oeqa/selftest/cases: runtime enable threaded runs
- Use wrappers from OESelfTestCase for runCmd, bitbake, etc. - Split into tree modules because runtime_test_export and runtime_test_postinsts uses runqemu/tinfoil and needs to be executed into the main thread. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/runtime_test.py | 225 + .../lib/oeqa/selftest/cases/runtime_test_export.py | 104 ++ .../oeqa/selftest/cases/runtime_test_postinsts.py | 114 +++ 3 files changed, 226 insertions(+), 217 deletions(-) create mode 100644 meta/lib/oeqa/selftest/cases/runtime_test_export.py create mode 100644 meta/lib/oeqa/selftest/cases/runtime_test_postinsts.py diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 2a70ae15b81..e45410e0e56 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -1,110 +1,9 @@ from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu from oeqa.core.decorator.oeid import OETestID -import os -import re - -class TestExport(OESelftestTestCase): - -@classmethod -def tearDownClass(cls): -runCmd("rm -rf /tmp/sdk") -super(TestExport, cls).tearDownClass() - -@OETestID(1499) -def test_testexport_basic(self): -""" -Summary: Check basic testexport functionality with only ping test enabled. -Expected: 1. testexport directory must be created. - 2. runexported.py must run without any error/exception. - 3. ping test must succeed. -Product: oe-core -Author: Mariano Lopez -""" - -features = 'INHERIT += "testexport"\n' -# These aren't the actual IP addresses but testexport class needs something defined -features += 'TEST_SERVER_IP = "192.168.7.1"\n' -features += 'TEST_TARGET_IP = "192.168.7.1"\n' -features += 'TEST_SUITES = "ping"\n' -self.write_config(features) - -# Build tesexport for core-image-minimal -bitbake('core-image-minimal') -bitbake('-c testexport core-image-minimal') - -testexport_dir = get_bb_var('TEST_EXPORT_DIR', 'core-image-minimal') - -# Verify if TEST_EXPORT_DIR was created -isdir = os.path.isdir(testexport_dir) -self.assertEqual(True, isdir, 'Failed to create testexport dir: %s' % testexport_dir) - -with runqemu('core-image-minimal') as qemu: -# Attempt to run runexported.py to perform ping test -test_path = os.path.join(testexport_dir, "oe-test") -data_file = os.path.join(testexport_dir, 'data', 'testdata.json') -manifest = os.path.join(testexport_dir, 'data', 'manifest') -cmd = ("%s runtime --test-data-file %s --packages-manifest %s " - "--target-ip %s --server-ip %s --quiet" - % (test_path, data_file, manifest, qemu.ip, qemu.server_ip)) -result = runCmd(cmd) -# Verify ping test was succesful -self.assertEqual(0, result.status, 'oe-test runtime returned a non 0 status') - -@OETestID(1641) -def test_testexport_sdk(self): -""" -Summary: Check sdk functionality for testexport. -Expected: 1. testexport directory must be created. - 2. SDK tarball must exists. - 3. Uncompressing of tarball must succeed. - 4. Check if the SDK directory is added to PATH. - 5. Run tar from the SDK directory. -Product: oe-core -Author: Mariano Lopez -""" - -features = 'INHERIT += "testexport"\n' -# These aren't the actual IP addresses but testexport class needs something defined -features += 'TEST_SERVER_IP = "192.168.7.1"\n' -features += 'TEST_TARGET_IP = "192.168.7.1"\n' -features += 'TEST_SUITES = "ping"\n' -features += 'TEST_EXPORT_SDK_ENABLED = "1"\n' -features += 'TEST_EXPORT_SDK_PACKAGES = "nativesdk-tar"\n' -self.write_config(features) - -# Build tesexport for core-image-minimal -bitbake('core-image-minimal') -bitbake('-c testexport core-image-minimal') - -needed_vars = ['TEST_EXPORT_DIR', 'TEST_EXPORT_SDK_DIR', 'TEST_EXPORT_SDK_NAME'] -bb_vars = get_bb_vars(needed_vars, 'core-image-minimal') -testexport_dir = bb_vars['TEST_EXPORT_DIR'] -sdk_dir = bb_vars['TEST_EXPORT_SDK_DIR'] -sdk_name = bb_vars['TEST_EXPORT_SDK_NAME'] - -# Check for SDK -tarball_name = "%s.sh" % sdk_name -tarball_path = os.path.join(testexport_dir, sdk_dir, tarball_name) -msg = "Couldn't find SDK tarball: %s" % tarball_path -self.assertEqual(os.path.isfile(tarball_path), True, msg) - -# Extract SDK and run
[OE-core] [PATCH 19/30] oeqa/selftest/cases: imagefeatures enable threaded runs
- Change to use wrapper methos from OESelfTestCase. - Move tests that use runqemu to its own module because it needs tinfoil and run in the main thread. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/imagefeatures.py | 78 +++--- meta/lib/oeqa/selftest/cases/imagefeatures_boot.py | 63 + 2 files changed, 73 insertions(+), 68 deletions(-) create mode 100644 meta/lib/oeqa/selftest/cases/imagefeatures_boot.py diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py index e6652ec7aba..325be934419 100644 --- a/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py @@ -1,69 +1,11 @@ +import os + from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu from oeqa.core.decorator.oeid import OETestID -from oeqa.utils.sshcontrol import SSHControl -import os class ImageFeatures(OESelftestTestCase): - -test_user = 'tester' -root_user = 'root' - -@OETestID(1107) -def test_non_root_user_can_connect_via_ssh_without_password(self): -""" -Summary: Check if non root user can connect via ssh without password -Expected: 1. Connection to the image via ssh using root user without providing a password should be allowed. - 2. Connection to the image via ssh using tester user without providing a password should be allowed. -Product: oe-core -Author: Ionut Chisanovici -AutomatedBy: Daniel Istrate -""" - -features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n' -features += 'INHERIT += "extrausers"\n' -features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) -self.write_config(features) - -# Build a core-image-minimal -bitbake('core-image-minimal') - -with runqemu("core-image-minimal") as qemu: -# Attempt to ssh with each user into qemu with empty password -for user in [self.root_user, self.test_user]: -ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user) -status, output = ssh.run("true") -self.assertEqual(status, 0, 'ssh to user %s failed with %s' % (user, output)) - -@OETestID(1115) -def test_all_users_can_connect_via_ssh_without_password(self): -""" -Summary: Check if all users can connect via ssh without password -Expected: 1. Connection to the image via ssh using root user without providing a password should NOT be allowed. - 2. Connection to the image via ssh using tester user without providing a password should be allowed. -Product: oe-core -Author: Ionut Chisanovici -AutomatedBy: Daniel Istrate -""" - -features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n' -features += 'INHERIT += "extrausers"\n' -features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) -self.write_config(features) - -# Build a core-image-minimal -bitbake('core-image-minimal') - -with runqemu("core-image-minimal") as qemu: -# Attempt to ssh with each user into qemu with empty password -for user in [self.root_user, self.test_user]: -ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user) -status, output = ssh.run("true") -if user == 'root': -self.assertNotEqual(status, 0, 'ssh to user root was allowed when it should not have been') -else: -self.assertEqual(status, 0, 'ssh to user tester failed with %s' % output) - +_use_own_builddir = True +_main_thread = False @OETestID(1116) def test_clutter_image_can_be_built(self): @@ -76,7 +18,7 @@ class ImageFeatures(OESelftestTestCase): """ # Build a core-image-clutter -bitbake('core-image-clutter') +self.bitbake('core-image-clutter') @OETestID(1117) def test_wayland_support_in_image(self): @@ -89,12 +31,12 @@ class ImageFeatures(OESelftestTestCase): AutomatedBy: Daniel Istrate """ -distro_features = get_bb_var('DISTRO_FEATURES') +distro_features = self.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
[OE-core] [PATCH 20/30] oeqa/selftest/cases: runqemu enable thraded runs
- Update to use wrappers {bitbake,get_bb_var} from OESelfTestCase class. - Run into the main thread because it needs tinfoil to run. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/runqemu.py | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index 4050a4123ba..e30cb24046f 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -6,12 +6,11 @@ import re import logging from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import bitbake, runqemu, get_bb_var +from oeqa.utils.commands import runqemu from oeqa.core.decorator.oeid import OETestID class RunqemuTests(OESelftestTestCase): """Runqemu test class""" - image_is_ready = False deploy_dir_image = '' @@ -37,8 +36,8 @@ SYSLINUX_TIMEOUT = "10" ) if not RunqemuTests.image_is_ready: -RunqemuTests.deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') -bitbake(self.recipe) +RunqemuTests.deploy_dir_image = self.get_bb_var('DEPLOY_DIR_IMAGE') +self.bitbake(self.recipe) RunqemuTests.image_is_ready = True @OETestID(2001) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/30] oeqa/selftest/cases: Use testlayer_path instead of call get_test_layer()
The testlayer_path is set at init of selftest so isn't need to call every time get_test_layer to get it. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 4 ++-- meta/lib/oeqa/selftest/cases/oescripts.py | 2 +- meta/lib/oeqa/selftest/cases/sstate.py | 2 +- meta/lib/oeqa/selftest/cases/sstatetests.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py index 0e5896234c3..b42aa3638d5 100644 --- a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py +++ b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py @@ -2,7 +2,7 @@ import os import shutil import oeqa.utils.ftools as ftools -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer +from oeqa.utils.commands import runCmd, bitbake, get_bb_var from oeqa.selftest.cases.sstate import SStateBase diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 88d69724f93..28c84679a17 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -8,7 +8,7 @@ import fnmatch import oeqa.utils.ftools as ftools from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer -from oeqa.utils.commands import get_bb_vars, runqemu, get_test_layer +from oeqa.utils.commands import get_bb_vars, runqemu from oeqa.core.decorator.oeid import OETestID class DevtoolBase(OESelftestTestCase): @@ -1530,7 +1530,7 @@ class DevtoolTests(DevtoolBase): # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) self.assertIn('/meta/', recipedir) relpth = os.path.relpath(recipedir, os.path.join(get_bb_var('COREBASE'), 'meta')) -appenddir = os.path.join(get_test_layer(), relpth) +appenddir = os.path.join(self.testlayer_path, relpth) self.track_for_cleanup(appenddir) # Try finish to the original layer self.add_command_to_tearDown('rm -rf %s ; cd %s ; git checkout %s' % (recipedir, os.path.dirname(recipedir), recipedir)) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 1ee753763ec..f7fe200cfac 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -1,6 +1,6 @@ from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase -from oeqa.utils.commands import Command, runCmd, bitbake, get_bb_var, get_test_layer +from oeqa.utils.commands import Command, runCmd, bitbake, get_bb_var from oeqa.core.decorator.oeid import OETestID class BuildhistoryDiffTests(BuildhistoryBase): diff --git a/meta/lib/oeqa/selftest/cases/sstate.py b/meta/lib/oeqa/selftest/cases/sstate.py index bc2fdbd8ccb..b8c2880ad06 100644 --- a/meta/lib/oeqa/selftest/cases/sstate.py +++ b/meta/lib/oeqa/selftest/cases/sstate.py @@ -6,7 +6,7 @@ import shutil import oeqa.utils.ftools as ftools from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import runCmd, bitbake, get_bb_vars, get_test_layer +from oeqa.utils.commands import runCmd, bitbake, get_bb_vars class SStateBase(OESelftestTestCase): diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 07a206824aa..4617d16d212 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -4,7 +4,7 @@ import glob import subprocess from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer +from oeqa.utils.commands import runCmd, bitbake, get_bb_var from oeqa.selftest.cases.sstate import SStateBase from oeqa.core.decorator.oeid import OETestID -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 29/30] oeqa/selftest/context: Enable support for threaded runs
Add an option to specify how many threads will be used for execution, default to 1. If the thread_num are greater than 1 the OESelftestContextThreaded will be used, this is due to compatibility reasons. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/context.py | 26 ++ 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 697ea0b4933..e54c871596d 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -11,11 +11,12 @@ from shutil import copyfile import tempfile from random import choice -import oeqa +from argparse_oe import int_positive -from oeqa.core.context import OETestContext, OETestContextExecutor +import oeqa +from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun - +from oeqa.core.threaded import OETestContextThreaded from oeqa.utils.commands import runCmd, get_bb_vars, get_test_layer class OESelftestTestContext(OETestContext): @@ -38,14 +39,19 @@ class OESelftestTestContext(OETestContext): def listTests(self, display_type, machine=None): return super(OESelftestTestContext, self).listTests(display_type) +class OESelftestTestContextThreaded(OESelftestTestContext, OETestContextThreaded): +pass + class OESelftestTestContextExecutor(OETestContextExecutor): -_context_class = OESelftestTestContext +_context_class = OESelftestTestContextThreaded _script_executor = 'oe-selftest' name = 'oe-selftest' help = 'oe-selftest test component' description = 'Executes selftest tests' +DEFAULT_THREADS = 1 + def register_commands(self, logger, parser): group = parser.add_mutually_exclusive_group(required=True) @@ -66,6 +72,11 @@ class OESelftestTestContextExecutor(OETestContextExecutor): action="store_true", default=False, help='List all available tests.') +parser.add_argument('-t', '--thread-num', required=False, action='store', +dest="thread_num", default=self.DEFAULT_THREADS, type=int_positive, +help='Number of threads to use for execute selftests,'\ + ' default: %d' % self.DEFAULT_THREADS) + parser.add_argument('--machine', required=False, choices=['random', 'all'], help='Run tests on different machines (random/all).') @@ -137,6 +148,8 @@ class OESelftestTestContextExecutor(OETestContextExecutor): self.tc_kwargs['init']['config_paths']['base_builddir'] = \ tempfile.mkdtemp(prefix='build-selftest-', dir=builddir) +self.tc_kwargs['load']['process_num'] = args.thread_num + def _pre_run(self): def _check_required_env_variables(vars): for var in vars: @@ -199,6 +212,11 @@ class OESelftestTestContextExecutor(OETestContextExecutor): self.module_paths = self._get_cases_paths( self.tc_kwargs['init']['td']['BBPATH'].split(':')) +if self.tc_kwargs['load']['process_num'] == 1: +self._context_class = OESelftestTestContext +# OESelftestTestContext class doesn't expect process_num +del self.tc_kwargs['load']['process_num'] + self.tc = self._context_class(**self.tc_kwargs['init']) self.tc.loadTests(self.module_paths, **self.tc_kwargs['load']) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 18/30] oeqa/selftest/cases: tinfoil to run in the main thread
The tinfoil tests needs to initialize bitbake internals and wasn't designed to be in a thread environment causing problems when try for example set signal handlers in a thread different than the main one. To workaround this execute tinfoil tests in the main thread and don't use custom builddir because isn't make sense too. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/tinfoil.py | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py index aa1af7e0423..7248b755812 100644 --- a/meta/lib/oeqa/selftest/cases/tinfoil.py +++ b/meta/lib/oeqa/selftest/cases/tinfoil.py @@ -9,7 +9,6 @@ from oeqa.core.decorator.oeid import OETestID class TinfoilTests(OESelftestTestCase): """ Basic tests for the tinfoil API """ - @OETestID(1568) def test_getvar(self): with bb.tinfoil.Tinfoil() as tinfoil: -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/30] oeqa/selftest/cases: Use builddir from class instead of get from environment
Now the build directory is setup by Test class, so the builddir attr points to the actual BUILDDIR instead of get from environment. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py | 7 +++ meta/lib/oeqa/selftest/cases/bbtests.py | 4 ++-- meta/lib/oeqa/selftest/cases/eSDK.py| 2 +- meta/lib/oeqa/selftest/cases/signing.py | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py index b42aa3638d5..98b8b60f51a 100644 --- a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py +++ b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py @@ -11,7 +11,6 @@ class RebuildFromSState(SStateBase): @classmethod def setUpClass(self): super(RebuildFromSState, self).setUpClass() -self.builddir = os.path.join(os.environ.get('BUILDDIR')) def get_dep_targets(self, primary_targets): found_targets = [] @@ -24,16 +23,16 @@ class RebuildFromSState(SStateBase): os.mkdir(builddir) self.track_for_cleanup(builddir) os.mkdir(os.path.join(builddir, 'conf')) -shutil.copyfile(os.path.join(os.environ.get('BUILDDIR'), 'conf/local.conf'), os.path.join(builddir, 'conf/local.conf')) +shutil.copyfile(self.localconf_path, os.path.join(builddir, 'conf/local.conf')) config = {} config['default_sstate_dir'] = "SSTATE_DIR ?= \"${TOPDIR}/sstate-cache\"" config['null_sstate_mirrors'] = "SSTATE_MIRRORS = \"\"" config['default_tmp_dir'] = "TMPDIR = \"${TOPDIR}/tmp\"" for key in config: ftools.append_file(os.path.join(builddir, 'conf/selftest.inc'), config[key]) -shutil.copyfile(os.path.join(os.environ.get('BUILDDIR'), 'conf/bblayers.conf'), os.path.join(builddir, 'conf/bblayers.conf')) +shutil.copyfile(self.local_bblayers_path, os.path.join(builddir, 'conf/bblayers.conf')) try: -shutil.copyfile(os.path.join(os.environ.get('BUILDDIR'), 'conf/auto.conf'), os.path.join(builddir, 'conf/auto.conf')) +shutil.copyfile(self.autoconf_path, os.path.join(builddir, 'conf/auto.conf')) except: pass diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index 4c82049032b..df11a6bc6d0 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -22,8 +22,8 @@ class BitbakeTests(OESelftestTestCase): @OETestID(790) def test_run_bitbake_from_dir_2(self): my_env = os.environ.copy() -my_env['BBPATH'] = my_env['BUILDDIR'] -os.chdir(os.path.dirname(os.environ['BUILDDIR'])) +my_env['BBPATH'] = self.builddir +os.chdir(os.path.dirname(self.builddir)) self.assertEqual(bitbake('-e', env=my_env).status, 0, msg = "bitbake couldn't run from builddir") @OETestID(806) diff --git a/meta/lib/oeqa/selftest/cases/eSDK.py b/meta/lib/oeqa/selftest/cases/eSDK.py index f36c3ccd3b4..60f4e239ab0 100644 --- a/meta/lib/oeqa/selftest/cases/eSDK.py +++ b/meta/lib/oeqa/selftest/cases/eSDK.py @@ -49,7 +49,7 @@ class oeSDKExtSelfTest(OESelftestTestCase): @staticmethod def update_configuration(cls, image, tmpdir_eSDKQA, env_eSDK, ext_sdk_path): -sstate_dir = os.path.join(os.environ['BUILDDIR'], 'sstate-cache') +sstate_dir = os.path.join(cls.builddir, 'sstate-cache') oeSDKExtSelfTest.generate_eSDK(cls.image) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index edb5f653f20..6ef8d8eb5d0 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -105,7 +105,7 @@ class Signing(OESelftestTestCase): test_recipe = 'ed' -builddir = os.environ.get('BUILDDIR') +builddir = self.builddir sstatedir = os.path.join(builddir, 'test-sstate') self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 17/30] oeqa/selftest/cases: Use wrapper methods from OESelfTestCase class
In order to support threaded runs in oe-selftest cases, there is a need to use wrapper methods that takes into account the current builddir by Test class. Signed-off-by: Aníbal Limón--- .../lib/oeqa/selftest/cases/_sstatetests_noauto.py | 16 ++-- meta/lib/oeqa/selftest/cases/archiver.py | 21 +++-- meta/lib/oeqa/selftest/cases/bblayers.py | 45 - meta/lib/oeqa/selftest/cases/bbtests.py| 101 +++-- meta/lib/oeqa/selftest/cases/buildhistory.py | 9 +- meta/lib/oeqa/selftest/cases/buildoptions.py | 51 ++- meta/lib/oeqa/selftest/cases/containerimage.py | 9 +- meta/lib/oeqa/selftest/cases/distrodata.py | 7 +- meta/lib/oeqa/selftest/cases/image_typedep.py | 8 +- meta/lib/oeqa/selftest/cases/layerappend.py| 22 ++--- meta/lib/oeqa/selftest/cases/liboe.py | 13 +-- meta/lib/oeqa/selftest/cases/lic_checksum.py | 8 +- meta/lib/oeqa/selftest/cases/manifest.py | 13 +-- meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 7 +- meta/lib/oeqa/selftest/cases/oescripts.py | 5 +- meta/lib/oeqa/selftest/cases/package.py| 10 +- meta/lib/oeqa/selftest/cases/pkgdata.py| 73 +++ meta/lib/oeqa/selftest/cases/prservice.py | 19 ++-- meta/lib/oeqa/selftest/cases/signing.py| 38 meta/lib/oeqa/selftest/cases/sstate.py | 5 +- meta/lib/oeqa/selftest/cases/sstatetests.py| 51 ++- 21 files changed, 273 insertions(+), 258 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py index 98b8b60f51a..08e71f33526 100644 --- a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py +++ b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py @@ -2,19 +2,15 @@ import os import shutil import oeqa.utils.ftools as ftools -from oeqa.utils.commands import runCmd, bitbake, get_bb_var from oeqa.selftest.cases.sstate import SStateBase - class RebuildFromSState(SStateBase): - -@classmethod -def setUpClass(self): -super(RebuildFromSState, self).setUpClass() +_use_own_builddir = True +_main_thread = False def get_dep_targets(self, primary_targets): found_targets = [] -bitbake("-g " + ' '.join(map(str, primary_targets))) +self.bitbake("-g " + ' '.join(map(str, primary_targets))) with open(os.path.join(self.builddir, 'pn-buildlist'), 'r') as pnfile: found_targets = pnfile.read().splitlines() return found_targets @@ -59,7 +55,7 @@ class RebuildFromSState(SStateBase): rebuild_targets = primary_targets self.configure_builddir(buildA) -runCmd((". %s/oe-init-build-env %s && " % (get_bb_var('COREBASE'), buildA)) + 'bitbake ' + ' '.join(map(str, primary_targets)), shell=True, executable='/bin/bash') +self.runCmd((". %s/oe-init-build-env %s && " % (self.get_bb_var('COREBASE'), buildA)) + 'bitbake ' + ' '.join(map(str, primary_targets)), shell=True, executable='/bin/bash') self.hardlink_tree(os.path.join(buildA, 'sstate-cache'), os.path.join(self.builddir, 'sstate-cache-buildA')) shutil.rmtree(buildA) @@ -69,13 +65,13 @@ class RebuildFromSState(SStateBase): self.configure_builddir(buildB) self.hardlink_tree(os.path.join(self.builddir, 'sstate-cache-buildA'), os.path.join(buildB, 'sstate-cache')) -result_cleansstate = runCmd((". %s/oe-init-build-env %s && " % (get_bb_var('COREBASE'), buildB)) + 'bitbake -ccleansstate ' + target, ignore_status=True, shell=True, executable='/bin/bash') +result_cleansstate = self.runCmd((". %s/oe-init-build-env %s && " % (self.get_bb_var('COREBASE'), buildB)) + 'bitbake -ccleansstate ' + target, ignore_status=True, shell=True, executable='/bin/bash') if not result_cleansstate.status == 0: failed_cleansstate.append(target) shutil.rmtree(buildB) continue -result_build = runCmd((". %s/oe-init-build-env %s && " % (get_bb_var('COREBASE'), buildB)) + 'bitbake ' + target, ignore_status=True, shell=True, executable='/bin/bash') +result_build = self.runCmd((". %s/oe-init-build-env %s && " % (self.get_bb_var('COREBASE'), buildB)) + 'bitbake ' + target, ignore_status=True, shell=True, executable='/bin/bash') if not result_build.status == 0: failed_rebuild.append(target) diff --git a/meta/lib/oeqa/selftest/cases/archiver.py b/meta/lib/oeqa/selftest/cases/archiver.py index 72026d573cc..347d0a8a5f5 100644 --- a/meta/lib/oeqa/selftest/cases/archiver.py +++ b/meta/lib/oeqa/selftest/cases/archiver.py @@ -1,10 +1,11 @@ import os import glob -from oeqa.utils.commands import bitbake, get_bb_vars from oeqa.selftest.case import OESelftestTestCase
[OE-core] [PATCH 13/30] oeqa/selftest/case: tearDown extra commands print what actually fails
Its better to have the output to see what actually fails in a command that is aim to execute at end of a test case. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/case.py | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index bbdce4cf9e8..c6f2d184ea3 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -224,13 +224,18 @@ to ensure accurate results.") def tearDown(self): if self._extra_tear_down_commands: -failed_extra_commands = [] +failed_extra_commands = {} for command in self._extra_tear_down_commands: result = self.runCmd(command, ignore_status=True) -if not result.status == 0: -failed_extra_commands.append(command) +if not result.status == 0: +failed_extra_commands[command] = result if failed_extra_commands: -self.logger.warning("tearDown commands have failed: %s" % ', '.join(map(str, failed_extra_commands))) +self.logger.warning("%s: tearDown commands have failed" % \ +self.id()) +for cmd in failed_extra_commands: +result = failed_extra_commands[cmd] +self.logger.warning("%s: %s\n%s" % (self.id(), cmd, +result.output)) self.logger.debug("Trying to move on.") self._extra_tear_down_commands = [] -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/30] oeqa/selftest/case: Support bitbake memres mode in per build directory
If BBSERVER is set on the environment the bitbake is set to be used as a memres, so starts an bitbake server per TestClass. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/case.py | 9 + 1 file changed, 9 insertions(+) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index c6f2d184ea3..d98a3760415 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -97,6 +97,12 @@ class OESelftestTestCase(OETestCase): cls.runCmd("git init; git add *; git commit -a -m 'initial'", cwd=cls.testlayer_path) +if cls._use_own_builddir and 'BBSERVER' in os.environ: +env = os.environ.copy() +del env['BBSERVER'] +result = cls.runCmd('bitbake --server-only -t xmlrpc -B localhost:-1', +env=env) + # XXX: sometimes meta-selftest isn't on bblayers at first backup try: cls.runCmd("bitbake-layers remove-layer %s" % cls.orig_testlayer_path) @@ -119,6 +125,9 @@ class OESelftestTestCase(OETestCase): @classmethod def tearDownClass(cls): +if cls._use_own_builddir and 'BBSERVER' in os.environ: +cls.runCmd('bitbake --kill-server') + cls.remove_include() cls.remove_inc_files() super(OESelftestTestCase, cls).tearDownClass() -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/30] oeqa/selftest/case: Creates meta-selftest layer per class
The meta-selftest layer is used by test cases to modify meta data but in a threaded environment two test cases can modify the meta data causing errors because the signatures will change. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/case.py | 34 +++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index 3998aeac5c4..bbdce4cf9e8 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -7,6 +7,7 @@ import shutil import glob import errno import re +import subprocess from unittest.util import safe_repr import oeqa.utils.ftools as ftools @@ -24,6 +25,8 @@ class OESelftestTestCase(OETestCase): @classmethod def _setUpBuildDir(cls): +cls.orig_testlayer_path = cls.tc.config_paths['testlayer_path'] + if cls._use_own_builddir: cls.builddir = os.path.join(cls.tc.config_paths['base_builddir'], cls.__module__, cls.__name__) @@ -35,14 +38,23 @@ class OESelftestTestCase(OETestCase): "conf/bblayers.conf") cls.local_bblayers_backup = os.path.join(cls.builddir, "conf/bblayers.conf.bk") + +cls.base_testlayer_path = os.path.join(cls.builddir, +'layers') +cls.testlayer_path = os.path.join(cls.base_testlayer_path, +os.path.basename(cls.orig_testlayer_path)) else: cls.builddir = cls.tc.config_paths['builddir'] + cls.localconf_path = cls.tc.config_paths['localconf'] cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] cls.local_bblayers_path = cls.tc.config_paths['bblayers'] cls.local_bblayers_backup = \ cls.tc.config_paths['bblayers_class_backup'] +cls.base_testlayer_path = os.path.dirname(cls.orig_testlayer_path) +cls.testlayer_path = cls.orig_testlayer_path + cls.testinc_path = os.path.join(cls.builddir, "conf/selftest.inc") cls.testinc_bblayers_path = os.path.join(cls.builddir, "conf/bblayers.inc") @@ -53,8 +65,11 @@ class OESelftestTestCase(OETestCase): os.makedirs(cls.builddir) builddir_conf = os.path.join(cls.builddir, 'conf') -origdir_conf = os.path.join(cls.tc.config_paths['builddir'], 'conf') -shutil.copytree(origdir_conf, builddir_conf) +os.makedirs(builddir_conf) +shutil.copyfile(cls.tc.config_paths['localconf_backup'], +os.path.join(builddir_conf, 'local.conf')) +shutil.copyfile(cls.tc.config_paths['bblayers_backup'], +os.path.join(builddir_conf, 'bblayers.conf')) ftools.append_file(cls.localconf_path, "# added by oe-selftest base class") @@ -75,11 +90,24 @@ class OESelftestTestCase(OETestCase): ftools.append_file(cls.localconf_path, "PARALLEL_MAKE?=\"-j %d\"" % cls.tc.loader.process_num) +# copy meta-selftest per class to avoid races when changing meta-data +# and init git repository because some tests review the repo status +os.makedirs(cls.base_testlayer_path) +shutil.copytree(cls.orig_testlayer_path, cls.testlayer_path) +cls.runCmd("git init; git add *; git commit -a -m 'initial'", +cwd=cls.testlayer_path) + +# XXX: sometimes meta-selftest isn't on bblayers at first backup +try: +cls.runCmd("bitbake-layers remove-layer %s" % cls.orig_testlayer_path) +except: +pass +cls.runCmd("bitbake-layers add-layer %s" % cls.testlayer_path) + @classmethod def setUpClass(cls): super(OESelftestTestCase, cls).setUpClass() -cls.testlayer_path = cls.tc.config_paths['testlayer_path'] cls._setUpBuildDir() cls._track_for_cleanup = [ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 30/30] oeqa/selftest/cases: systemd_boot enable threaded runs
Signed-off-by: Aníbal Limón--- .../lib/oeqa/selftest/cases/systemd_boot.py| 26 -- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py index dd5eeec1633..0bd52dc6b85 100644 --- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py +++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py @@ -3,9 +3,11 @@ import os from oeqa.selftest.case import OESelftestTestCase from oeqa.core.decorator.oeid import OETestID from oeqa.core.decorator.depends import OETestDepends -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu class Systemdboot(OESelftestTestCase): +_use_own_builddir = True +_main_thread = False + def _common_setup(self): """ Common setup for test cases: 1445, 1528 @@ -22,7 +24,7 @@ class Systemdboot(OESelftestTestCase): """ # Build a genericx86-64/efi systemdboot image -bitbake('mtools-native core-image-minimal') +self.bitbake('mtools-native core-image-minimal') @OETestID(1445) @@ -38,14 +40,14 @@ class Systemdboot(OESelftestTestCase): # We'd use DEPLOY_DIR_IMAGE here, except that we need its value for # MACHINE="genericx86-64 which is probably not the one configured -systemdbootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'systemd-bootx64.efi') +systemdbootfile = os.path.join(self.get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'systemd-bootx64.efi') self._common_setup() # Ensure we're actually testing that this gets built and not that # it was around from an earlier build -bitbake('-c cleansstate systemd-boot') -runCmd('rm -f %s' % systemdbootfile) +self.bitbake('-c cleansstate systemd-boot') +self.runCmd('rm -f %s' % systemdbootfile) self._common_build() @@ -71,20 +73,20 @@ class Systemdboot(OESelftestTestCase): AutomatedBy: Jose Perez Carranza """ -systemdbootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', +systemdbootfile = os.path.join(self.get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'systemd-bootx64.efi') -systemdbootimage = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', +systemdbootimage = os.path.join(self.get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'core-image-minimal-genericx86-64.hddimg') -imagebootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', +imagebootfile = os.path.join(self.get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'bootx64.efi') -mcopynative = os.path.join(get_bb_var('STAGING_BINDIR_NATIVE'), 'mcopy') +mcopynative = os.path.join(self.get_bb_var('STAGING_BINDIR_NATIVE'), 'mcopy') #Clean environment before start the test if os.path.isfile(imagebootfile): -runCmd('rm -f %s' % imagebootfile) +self.runCmd('rm -f %s' % imagebootfile) #Step 1 -runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative ,systemdbootimage, +self.runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative ,systemdbootimage, imagebootfile)) #Step 2 @@ -93,6 +95,6 @@ class Systemdboot(OESelftestTestCase): % imagebootfile) #Step 3 -result = runCmd('md5sum %s %s' % (systemdbootfile, imagebootfile)) +result = self.runCmd('md5sum %s %s' % (systemdbootfile, imagebootfile)) self.assertEqual(result.output.split()[0], result.output.split()[2], '%s was not correclty generated' % imagebootfile) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/30] oeqa/selftest/{case, context}: Add builddir by test class and context
The build directory by Test class will enable to use several instances of bitbake in parallel to enable oe-selftest threaded runs. [YOCTO #11429] Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/case.py| 97 --- meta/lib/oeqa/selftest/context.py | 4 ++ 2 files changed, 74 insertions(+), 27 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index 871009c568b..dd24e366abd 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -13,28 +13,73 @@ from oeqa.utils.commands import runCmd, bitbake, get_bb_var from oeqa.core.case import OETestCase class OESelftestTestCase(OETestCase): +_use_own_builddir = False +_main_thread = True +_end_thread = False + def __init__(self, methodName="runTest"): self._extra_tear_down_commands = [] super(OESelftestTestCase, self).__init__(methodName) @classmethod +def _setUpBuildDir(cls): +if cls._use_own_builddir: +cls.builddir = os.path.join(cls.tc.config_paths['base_builddir'], +cls.__module__, cls.__name__) + +cls.localconf_path = os.path.join(cls.builddir, "conf/local.conf") +cls.localconf_backup = os.path.join(cls.builddir, +"conf/local.conf.bk") +cls.local_bblayers_path = os.path.join(cls.builddir, +"conf/bblayers.conf") +cls.local_bblayers_backup = os.path.join(cls.builddir, +"conf/bblayers.conf.bk") +else: +cls.builddir = cls.tc.config_paths['builddir'] +cls.localconf_path = cls.tc.config_paths['localconf'] +cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] +cls.local_bblayers_path = cls.tc.config_paths['bblayers'] +cls.local_bblayers_backup = \ +cls.tc.config_paths['bblayers_class_backup'] + +cls.testinc_path = os.path.join(cls.builddir, "conf/selftest.inc") +cls.testinc_bblayers_path = os.path.join(cls.builddir, +"conf/bblayers.inc") +cls.machineinc_path = os.path.join(cls.builddir, "conf/machine.inc") + +# creates a custom build directory for every test class +if not os.path.exists(cls.builddir): +os.makedirs(cls.builddir) + +builddir_conf = os.path.join(cls.builddir, 'conf') +origdir_conf = os.path.join(cls.tc.config_paths['builddir'], 'conf') +shutil.copytree(origdir_conf, builddir_conf) + +ftools.append_file(cls.localconf_path, "# added by oe-selftest base class") + +# shares original sstate_dir across build directories to speed up +sstate_line = "SSTATE_DIR=\"%s\"" % cls.td['SSTATE_DIR'] +ftools.append_file(cls.localconf_path, sstate_line) + +# shares original dl_dir across build directories to avoid additional +# network usage +dldir_line = "DL_DIR=\"%s\"" % cls.td['DL_DIR'] +ftools.append_file(cls.localconf_path, dldir_line) + +# use the same value of threads for BB_NUMBER_THREADS/PARALLEL_MAKE +# to avoid ran out resources (cpu/memory) +if hasattr(cls.tc.loader, 'process_num'): +ftools.append_file(cls.localconf_path, "BB_NUMBER_THREADS?=\"%d\"" % +cls.tc.loader.process_num) +ftools.append_file(cls.localconf_path, "PARALLEL_MAKE?=\"-j %d\"" % +cls.tc.loader.process_num) + +@classmethod def setUpClass(cls): super(OESelftestTestCase, cls).setUpClass() cls.testlayer_path = cls.tc.config_paths['testlayer_path'] -cls.builddir = cls.tc.config_paths['builddir'] - -cls.localconf_path = cls.tc.config_paths['localconf'] -cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] -cls.local_bblayers_path = cls.tc.config_paths['bblayers'] -cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] - -cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], -"conf/selftest.inc") -cls.testinc_bblayers_path = os.path.join(cls.tc.config_paths['builddir'], -"conf/bblayers.inc") -cls.machineinc_path = os.path.join(cls.tc.config_paths['builddir'], -"conf/machine.inc") +cls._setUpBuildDir() cls._track_for_cleanup = [ cls.testinc_path, cls.testinc_bblayers_path, @@ -52,35 +97,31 @@ class OESelftestTestCase(OETestCase): @classmethod def add_include(cls): if "#include added by oe-selftest" \ -not in ftools.read_file(os.path.join(cls.builddir, "conf/local.conf")): -cls.logger.info("Adding: \"include selftest.inc\" in %s" % os.path.join(cls.builddir, "conf/local.conf")) -
[OE-core] [PATCH 09/30] oeqa/core/tests: Update test_loader threaded to cover main thread usage
Signed-off-by: Aníbal Limón--- meta/lib/oeqa/core/tests/test_loader.py | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/core/tests/test_loader.py b/meta/lib/oeqa/core/tests/test_loader.py index e0d917d317d..c4d5eeb462b 100755 --- a/meta/lib/oeqa/core/tests/test_loader.py +++ b/meta/lib/oeqa/core/tests/test_loader.py @@ -88,25 +88,28 @@ class TestLoader(TestBase): self.cases_path = [os.path.join(self.cases_path, 'loader', 'threaded')] tc = self._testLoaderThreaded() -self.assertEqual(len(tc.suites), 3, "Expected to be 3 suites") +self.assertTrue(len(tc.suites['main']._tests), +"Expected to have tests in main suite") +self.assertEqual(len(tc.suites['pool']), 2, +"Expected to be 2 suites in pool") case_ids = ['threaded.ThreadedTest.test_threaded_no_depends', 'threaded.ThreadedTest2.test_threaded_same_module', 'threaded_depends.ThreadedTest3.test_threaded_depends'] -for case in tc.suites[0]._tests: +for case in tc.suites['main']._tests: self.assertEqual(case.id(), -case_ids[tc.suites[0]._tests.index(case)]) +case_ids[tc.suites['main']._tests.index(case)]) case_ids = ['threaded_alone.ThreadedTestAlone.test_threaded_alone'] -for case in tc.suites[1]._tests: +for case in tc.suites['pool'][0]._tests: self.assertEqual(case.id(), -case_ids[tc.suites[1]._tests.index(case)]) +case_ids[tc.suites['pool'][0]._tests.index(case)]) case_ids = ['threaded_module.ThreadedTestModule.test_threaded_module', 'threaded_module.ThreadedTestModule2.test_threaded_module2'] -for case in tc.suites[2]._tests: +for case in tc.suites['pool'][1]._tests: self.assertEqual(case.id(), -case_ids[tc.suites[2]._tests.index(case)]) +case_ids[tc.suites['pool'][1]._tests.index(case)]) self.cases_path = cases_path -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/30] oeqa/core/threaded: logSummary add skipped tests info
Signed-off-by: Aníbal Limón--- meta/lib/oeqa/core/threaded.py | 11 +++ 1 file changed, 11 insertions(+) diff --git a/meta/lib/oeqa/core/threaded.py b/meta/lib/oeqa/core/threaded.py index a7dc0aed401..022c9ac59a2 100644 --- a/meta/lib/oeqa/core/threaded.py +++ b/meta/lib/oeqa/core/threaded.py @@ -234,6 +234,14 @@ class OETestResultThreaded(object): self._results[tid]['result'].wasSuccessful() return wasSuccessful +def getSkippedTests(self): +skipped = 0 + +for tid in self._results.keys(): +skipped = skipped + len(self.tc._results[tid]['skipped']) + +return skipped + def stop(self): for tid in self._results.keys(): self._results[tid]['result'].stop() @@ -248,6 +256,9 @@ class OETestResultThreaded(object): msg = "%s - OK - All required tests passed" % component else: msg = "%s - FAIL - Required tests failed" % component +skipped = self.getSkippedTests() +if skipped: +msg += " (skipped=%d)" % skipped self.tc.logger.info(msg) def logDetails(self): -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/30] oeqa/selftest/case: Add wrappers to utils.commands modules
This methods are wrappers to use builddir by Test class. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/case.py | 96 +- 1 file changed, 94 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index dd24e366abd..3998aeac5c4 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -6,10 +6,11 @@ import os import shutil import glob import errno +import re from unittest.util import safe_repr import oeqa.utils.ftools as ftools -from oeqa.utils.commands import runCmd, bitbake, get_bb_var +from oeqa.utils.commands import runCmd, bitbake, get_bb_env, get_bb_var, get_bb_vars from oeqa.core.case import OETestCase class OESelftestTestCase(OETestCase): @@ -197,7 +198,7 @@ to ensure accurate results.") if self._extra_tear_down_commands: failed_extra_commands = [] for command in self._extra_tear_down_commands: -result = runCmd(command, ignore_status=True) +result = self.runCmd(command, ignore_status=True) if not result.status == 0: failed_extra_commands.append(command) if failed_extra_commands: @@ -313,3 +314,94 @@ to ensure accurate results.") msg = self._formatMessage(msg, "%s exists when it should not" % safe_repr(expr)) raise self.failureException(msg) + +# utils commands to run on it's on builddir +@classmethod +def _env_own_builddir(cls, **kwargs): +env = None + +if 'env' in kwargs: +env = kwargs['env'] + +if not 'BUILDDIR' in env: +env['BUILDDIR'] = cls.builddir +if not 'BBPATH' in env: +env['BBPATH'] = cls.builddir + +else: +env = os.environ.copy() +env['BUILDDIR'] = cls.builddir +env['BBPATH'] = cls.builddir + +kwargs['env'] = env + +# XXX: tinfoil doesn't honor BBPATH bblayers and tinfoil test +# modules uses it +if not 'cwd' in kwargs: +kwargs['cwd'] = cls.builddir + +# XXX: uncomment for debugging purposes +#kwargs['output_log'] = cls.logger + +return kwargs + +@classmethod +def runCmd(cls, *args, **kwargs): +kwargs = cls._env_own_builddir(**kwargs) +return runCmd(*args, **kwargs) + +@classmethod +def bitbake(cls, *args, **kwargs): +kwargs = cls._env_own_builddir(**kwargs) +return bitbake(*args, **kwargs) + +@classmethod +def get_bb_env(cls, target=None, postconfig=None): +if target: +return cls.bitbake("-e %s" % target, postconfig=postconfig).output +else: +return cls.bitbake("-e", postconfig=postconfig).output + +@classmethod +def get_bb_vars(cls, variables=None, target=None, postconfig=None): +"""Get values of multiple bitbake variables""" +bbenv = cls.get_bb_env(target, postconfig=postconfig) + +if variables is not None: +variables = variables.copy() +var_re = re.compile(r'^(export )?(?P\w+(_.*)?)="(?P.*)"$') +unset_re = re.compile(r'^unset (?P\w+)$') +lastline = None +values = {} +for line in bbenv.splitlines(): +match = var_re.match(line) +val = None +if match: +val = match.group('value') +else: +match = unset_re.match(line) +if match: +# Handle [unexport] variables +if lastline.startswith('# "'): +val = lastline.split('"')[1] +if val: +var = match.group('var') +if variables is None: +values[var] = val +else: +if var in variables: +values[var] = val +variables.remove(var) +# Stop after all required variables have been found +if not variables: +break +lastline = line +if variables: +# Fill in missing values +for var in variables: +values[var] = None +return values + +@classmethod +def get_bb_var(cls, var, target=None, postconfig=None): +return cls.get_bb_vars([var], target, postconfig)[var] -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/30] oeqa/core/threaded: Enable support to use the main thread
Some test cases needs to be executed by the main thread for several resons, this implmentation enables usage of the main thread to execute suites. The rules are if some test case request by test class attr _main_thread it will be executed, if no tests are scheduled to be executed into the main thread the algorithm with take the first suite in the pool, finallay this will avoid thread usage if only one suite needs to be executed. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/core/threaded.py | 104 - 1 file changed, 83 insertions(+), 21 deletions(-) diff --git a/meta/lib/oeqa/core/threaded.py b/meta/lib/oeqa/core/threaded.py index 2cafe03a212..34217f1a8b8 100644 --- a/meta/lib/oeqa/core/threaded.py +++ b/meta/lib/oeqa/core/threaded.py @@ -27,9 +27,42 @@ class OETestLoaderThreaded(OETestLoader): self.process_num = min(multiprocessing.cpu_count(), len(suite._tests)) -suites = [] -for _ in range(self.process_num): -suites.append(self.suiteClass()) +suites = {} +suites['main'] = self.suiteClass() +suites['pool'] = [] +for _ in range(self.process_num - 1): +suites['pool'].append(self.suiteClass()) + +def _add_to_main_thread(main_suite, case, depends): +""" +Some test cases needs to be run into the main +thread for several resons. + +A test case that needs to run in the main thread +can be for specific set via test class _main_thread +attr or because is on the same module or for a dependency +reason. +""" + +if hasattr(case.__class__, '_main_thread') and \ +case.__class__._main_thread or \ +self.process_num == 1: +main_suite.addTest(case) +return True + +for c in main_suite._tests: +if case.__module__ == c.__module__: +main_suite.addTest(case) +return True + +if case.id() in depends: +case_depends = depends[case.id()] +for c in main_suite._tests: +if c.id() in case_depends: +main_suite.addTest(case) +return True + +return False def _search_for_module_idx(suites, case): """ @@ -37,8 +70,7 @@ class OETestLoaderThreaded(OETestLoader): in the same thread because PyUnit keeps track of setUp{Module, Class,} and tearDown{Module, Class,}. """ - -for idx in range(self.process_num): +for idx in range(self.process_num - 1): suite = suites[idx] for c in suite._tests: if case.__module__ == c.__module__: @@ -53,7 +85,7 @@ class OETestLoaderThreaded(OETestLoader): of dependant test to figure out if skip or not. """ -for idx in range(self.process_num): +for idx in range(self.process_num - 1): suite = suites[idx] for case in suite._tests: @@ -62,6 +94,11 @@ class OETestLoaderThreaded(OETestLoader): return -1 def _get_best_idx(suites): +""" +The best index is selected to the suite that has +minor test cases to run. +""" + sizes = [len(suite._tests) for suite in suites] return sizes.index(min(sizes)) @@ -71,27 +108,35 @@ class OETestLoaderThreaded(OETestLoader): if isinstance(case, TestSuite): _fill_suites(case) else: -idx = _search_for_module_idx(suites, case) - depends = {} if 'depends' in self.tc._registry: depends = self.tc._registry['depends'] +if _add_to_main_thread(suites['main'], case, depends): +continue + +# Get the best index in the suite pool to add the case +idx = _search_for_module_idx(suites['pool'], case) if idx == -1 and case.id() in depends: case_depends = depends[case.id()] -idx = _search_for_depend_idx(suites, case_depends) - +idx = _search_for_depend_idx(suites['pool'], case_depends) if idx == -1: -idx = _get_best_idx(suites) +idx = _get_best_idx(suites['pool']) +suites['pool'][idx].addTest(case) -suites[idx].addTest(case) _fill_suites(suite) -suites_tmp = suites -suites = [] +# clean suites in pool without test cases +
[OE-core] [PATCH 05/30] oe/copy_buildsystem: check_sstate_task_list also pop BBPATH from env
The BBPATH environment could be set and can make a failure when try to build an extensible sdk because it will look the bitbake.lock file in the original build folder. Example: $ export BBPATH=`pwd` $ bitbake core-image-minimal -c populate_sdk_ext ERROR: bitbake failed: ERROR: Only one copy of bitbake should be run against a build directory ERROR: core-image-minimal-1.0-r0 do_populate_sdk_ext: Function failed: copy_buildsystem Signed-off-by: Aníbal Limón--- meta/lib/oe/copy_buildsystem.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index a3729041835..dd506a39e6c 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py @@ -239,6 +239,7 @@ def check_sstate_task_list(d, targets, filteroutfile, cmdprefix='', cwd=None, lo cmd = "%sBB_SETSCENE_ENFORCE=1 PSEUDO_DISABLED=1 oe-check-sstate %s -s -o %s %s" % (cmdprefix, targets, filteroutfile, logparam) env = dict(d.getVar('BB_ORIGENV', False)) env.pop('BUILDDIR', '') +env.pop('BBPATH', '') pathitems = env['PATH'].split(':') env['PATH'] = ':'.join([item for item in pathitems if not item.endswith('/bitbake/bin')]) bb.process.run(cmd, stderr=subprocess.STDOUT, env=env, cwd=cwd, executable='/bin/bash') -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/30] oeqa/core/threaded: Add support to run into a thread at end of execution
Some test cases aren't allowed to run into a multi-thread environment so add the posibility to run those tests at end of execution. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/core/threaded.py | 102 +++-- 1 file changed, 78 insertions(+), 24 deletions(-) diff --git a/meta/lib/oeqa/core/threaded.py b/meta/lib/oeqa/core/threaded.py index 34217f1a8b8..a7dc0aed401 100644 --- a/meta/lib/oeqa/core/threaded.py +++ b/meta/lib/oeqa/core/threaded.py @@ -30,18 +30,35 @@ class OETestLoaderThreaded(OETestLoader): suites = {} suites['main'] = self.suiteClass() suites['pool'] = [] +suites['end'] = self.suiteClass() for _ in range(self.process_num - 1): suites['pool'].append(self.suiteClass()) +def _add_by_module_or_dep(suite, case, depends): +""" +A test case that needs to run into the same thread +because is on the same module or for dependency +reasons. +""" + +for c in suite._tests: +if case.__module__ == c.__module__: +suite.addTest(case) +return True + +if case.id() in depends: +case_depends = depends[case.id()] +for c in suite._tests: +if c.id() in case_depends: +suite.addTest(case) +return True + +return False + def _add_to_main_thread(main_suite, case, depends): """ Some test cases needs to be run into the main -thread for several resons. - -A test case that needs to run in the main thread -can be for specific set via test class _main_thread -attr or because is on the same module or for a dependency -reason. +thread by request. """ if hasattr(case.__class__, '_main_thread') and \ @@ -50,19 +67,20 @@ class OETestLoaderThreaded(OETestLoader): main_suite.addTest(case) return True -for c in main_suite._tests: -if case.__module__ == c.__module__: -main_suite.addTest(case) -return True +return _add_by_module_or_dep(main_suite, case, depends) -if case.id() in depends: -case_depends = depends[case.id()] -for c in main_suite._tests: -if c.id() in case_depends: -main_suite.addTest(case) -return True +def _add_to_end_thread(end_suite, case, depends): +""" +Some test cases needs to be run into at end of +execution into the main by request. +""" +if hasattr(case.__class__, '_end_thread') and \ +case.__class__._end_thread or \ +self.process_num == 1: +end_suite.addTest(case) +return True -return False +return _add_by_module_or_dep(end_suite, case, depends) def _search_for_module_idx(suites, case): """ @@ -112,6 +130,9 @@ class OETestLoaderThreaded(OETestLoader): if 'depends' in self.tc._registry: depends = self.tc._registry['depends'] +if _add_to_end_thread(suites['end'], case, depends): +continue + if _add_to_main_thread(suites['main'], case, depends): continue @@ -135,7 +156,7 @@ class OETestLoaderThreaded(OETestLoader): # if the main suite doesn't have test cases # use the first element of the suites pool -if not len(suites['main']._tests): +if not len(suites['main']._tests) and len(suites['pool']): suites['main'] = suites['pool'].pop(0) return suites @@ -268,6 +289,12 @@ class _ThreadedPool: self.tasks = queue.Queue(num_tasks) self.workers = [] +self.stream = stream +self.result = result + +self.end_task = None +self.end_worker = None + for _ in range(num_workers): worker = _Worker(self.tasks, result, stream) self.workers.append(worker) @@ -280,12 +307,25 @@ class _ThreadedPool: """Add a task to the queue""" self.tasks.put((func, args, kargs)) +def add_end_task(self, func, *args, **kwargs): +"""Add a task to be executed at end""" + +self.end_task = queue.Queue(1) +self.end_task.put((func, args, kwargs)) +self.end_worker = _Worker(self.end_task, self.result, +self.stream) + def wait_completion(self): """Wait for completion of all the tasks in the queue""" self.tasks.join()
[OE-core] [PATCH 04/30] bb/tinfoil: run_command handle busy status in bitbake server
When tinfoil request a command to bitbake is handled in async manner [1], sometimes is this ends on return a Busy status. This is a workaround a needs to be fixed in proper manner inside bitbake code. For example when running clientComplete and buildFile is on progress, ERROR: Function failed: base_do_unpack Traceback (most recent call last): File "/home/alimon/repos/poky/scripts/lib/devtool/standard.py", line 797, in modify initial_rev = _extract_source(srctree, args.keep_temp, args.branch, False, rd, tinfoil) File "/home/alimon/repos/poky/scripts/lib/devtool/standard.py", line 562, in _extract_source runtask(fn, 'unpack') File "/home/alimon/repos/poky/scripts/lib/devtool/standard.py", line 552, in runtask raise DevtoolError('Task do_%s failed' % task) devtool.DevtoolError: Task do_unpack failed During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/alimon/repos/poky/scripts/devtool", line 351, in ret = main() File "/home/alimon/repos/poky/scripts/devtool", line 338, in main ret = args.func(args, config, basepath, workspace) File "/home/alimon/repos/poky/scripts/lib/devtool/standard.py", line 864, in modify tinfoil.shutdown() File "/home/alimon/repos/poky/bitbake/lib/bb/tinfoil.py", line 427, in shutdown self.run_command('clientComplete') File "/home/alimon/repos/poky/bitbake/lib/bb/tinfoil.py", line 320, in run_command raise TinfoilCommandFailed(result[1]) bb.tinfoil.TinfoilCommandFailed: Busy (buildFile in progress) Signed-off-by: Aníbal Limón--- bitbake/lib/bb/tinfoil.py | 23 +++ 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py index fb0da622433..f3a1563e8f3 100644 --- a/bitbake/lib/bb/tinfoil.py +++ b/bitbake/lib/bb/tinfoil.py @@ -21,6 +21,7 @@ import os import sys import atexit import re +import time from collections import OrderedDict, defaultdict import bb.cache @@ -298,7 +299,7 @@ class Tinfoil: config_params = TinfoilConfigParameters(config_only=False) self.run_actions(config_params) -def run_command(self, command, *params): +def run_command(self, command, *params, ntries=0): """ Run a command on the server (as implemented in bb.command). Note that there are two types of command - synchronous and @@ -315,9 +316,23 @@ class Tinfoil: commandline = [command] if params: commandline.extend(params) -result = self.server_connection.connection.runCommand(commandline) -if result[1]: + +# XXX: Tinfoil commands are run by Cooker in async mode so gives +# some time to get done. +result = None +while True: +result = self.server_connection.connection.runCommand(commandline) +if not result[1]: +break +elif ntries == 0: +break +elif 'Busy' in result[1]: +ntries = ntries - 1 +time.sleep(1) +continue + raise TinfoilCommandFailed(result[1]) + return result[0] def set_event_mask(self, eventlist): @@ -424,7 +439,7 @@ class Tinfoil: def shutdown(self): if self.server_connection: -self.run_command('clientComplete') +self.run_command('clientComplete', ntries=1) _server_connections.remove(self.server_connection) bb.event.ui_queue = [] self.server_connection.terminate() -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/30] selftest/cases/package: Call parent setUpClass method
Since config paths are now passed in Test context the setUpClass method is expected to be call. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/cases/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/package.py b/meta/lib/oeqa/selftest/cases/package.py index 5b9a6d15851..b07d6ed0abe 100644 --- a/meta/lib/oeqa/selftest/cases/package.py +++ b/meta/lib/oeqa/selftest/cases/package.py @@ -17,6 +17,8 @@ class VersionOrdering(OESelftestTestCase): @classmethod def setUpClass(cls): +super(VersionOrdering, cls).setUpClass() + # Build the tools we need and populate a sysroot bitbake("dpkg-native opkg-native rpm-native python3-native") bitbake("build-sysroots -c build_native_sysroot") -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/30] oeqa/core/loader: Switch method definition for _make_failed_test
This was a mistake of me to define wrong what methods needs to be defined by certain python version. See rev d8380d098a290510b442a7abd2dd5a50cabf5844. Signed-off-by: Aníbal Limón--- meta/lib/oeqa/core/loader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py index 80e3d2800cd..3306e85d219 100644 --- a/meta/lib/oeqa/core/loader.py +++ b/meta/lib/oeqa/core/loader.py @@ -13,7 +13,7 @@ from oeqa.core.decorator import decoratorClasses, OETestDecorator, \ OETestFilter, OETestDiscover if sys.version_info >= (3,4,4): -def _make_failed_test(classname, methodname, exception, suiteClass): +def _make_failed_test(classname, exception, suiteClass): """ When loading tests, the unittest framework stores any exceptions and displays them only when the 'run' method is called. @@ -23,7 +23,7 @@ if sys.version_info >= (3,4,4): """ raise exception else: -def _make_failed_test(classname, exception, suiteClass): +def _make_failed_test(classname, methodname, exception, suiteClass): raise exception unittest.loader._make_failed_test = _make_failed_test -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/30] oeqa/selftest/{context, case}: Handle KeyboardInterrupt/SIGINT and SIGTERM
In order to avoid corrupt local.conf and bblayers.conf adds signal handler for SIGTERM and use try/finally (KeyboardIntrrupt) block to restore previously backuped configuration. [YOCTO #11650] Signed-off-by: Aníbal Limón--- meta/lib/oeqa/selftest/case.py| 36 +++-- meta/lib/oeqa/selftest/context.py | 107 +++--- 2 files changed, 97 insertions(+), 46 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index 31a11fddda9..871009c568b 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -13,28 +13,34 @@ from oeqa.utils.commands import runCmd, bitbake, get_bb_var from oeqa.core.case import OETestCase class OESelftestTestCase(OETestCase): -builddir = os.environ.get("BUILDDIR") or "" -localconf_path = os.path.join(builddir, "conf/local.conf") -localconf_backup = os.path.join(builddir, "conf/local.bk") -testinc_path = os.path.join(builddir, "conf/selftest.inc") -local_bblayers_path = os.path.join(builddir, "conf/bblayers.conf") -local_bblayers_backup = os.path.join(builddir, "conf/bblayers.bk") -testinc_bblayers_path = os.path.join(builddir, "conf/bblayers.inc") -machineinc_path = os.path.join(builddir, "conf/machine.inc") - def __init__(self, methodName="runTest"): self._extra_tear_down_commands = [] -self._track_for_cleanup = [ -self.testinc_path, self.testinc_bblayers_path, -self.machineinc_path, self.localconf_backup, -self.local_bblayers_backup] - super(OESelftestTestCase, self).__init__(methodName) @classmethod def setUpClass(cls): super(OESelftestTestCase, cls).setUpClass() -cls.testlayer_path = cls.tc.testlayer_path + +cls.testlayer_path = cls.tc.config_paths['testlayer_path'] +cls.builddir = cls.tc.config_paths['builddir'] + +cls.localconf_path = cls.tc.config_paths['localconf'] +cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] +cls.local_bblayers_path = cls.tc.config_paths['bblayers'] +cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] + +cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], +"conf/selftest.inc") +cls.testinc_bblayers_path = os.path.join(cls.tc.config_paths['builddir'], +"conf/bblayers.inc") +cls.machineinc_path = os.path.join(cls.tc.config_paths['builddir'], +"conf/machine.inc") + +cls._track_for_cleanup = [ +cls.testinc_path, cls.testinc_bblayers_path, +cls.machineinc_path, cls.localconf_backup, +cls.local_bblayers_backup] + cls.add_include() @classmethod diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index ca87398224c..4575a0537fb 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -6,6 +6,8 @@ import time import glob import sys import imp +import signal +from shutil import copyfile from random import choice import oeqa @@ -16,13 +18,12 @@ from oeqa.core.exception import OEQAPreRun from oeqa.utils.commands import runCmd, get_bb_vars, get_test_layer class OESelftestTestContext(OETestContext): -def __init__(self, td=None, logger=None, machines=None, testlayer_path=None): +def __init__(self, td=None, logger=None, machines=None, config_paths=None): super(OESelftestTestContext, self).__init__(td, logger) self.machines = machines self.custommachine = None - -self.testlayer_path = testlayer_path +self.config_paths = config_paths def runTests(self, machine=None): if machine: @@ -108,7 +109,29 @@ class OESelftestTestContextExecutor(OETestContextExecutor): self.tc_kwargs['init']['td'] = get_bb_vars() self.tc_kwargs['init']['machines'] = self._get_available_machines() -self.tc_kwargs['init']['testlayer_path'] = get_test_layer() + +builddir = os.environ.get("BUILDDIR") +self.tc_kwargs['init']['config_paths'] = {} +self.tc_kwargs['init']['config_paths']['testlayer_path'] = \ +get_test_layer() +self.tc_kwargs['init']['config_paths']['builddir'] = builddir +self.tc_kwargs['init']['config_paths']['localconf'] = \ +os.path.join(builddir, "conf/local.conf") +self.tc_kwargs['init']['config_paths']['localconf_backup'] = \ +os.path.join(builddir, "conf/local.conf.orig") +self.tc_kwargs['init']['config_paths']['localconf_class_backup'] = \ +os.path.join(builddir, "conf/local.conf.bk") +self.tc_kwargs['init']['config_paths']['bblayers'] = \ +os.path.join(builddir, "conf/bblayers.conf") +self.tc_kwargs['init']['config_paths']['bblayers_backup'] = \ +
[OE-core] [PATCH 00/30] oeqa core and oe-selftest threaded enablement
This series is to enable oe-selftest threaded runs along some fixes, * Implementation of main/end thread usage in oeqa threaded * Adaptation of oe-selftest cases to be able to run in threaded env, ** Usage of own build directory by Test class. ** Mark the test modules that are enabled to run into a thread. ** Split some test modules because aren't support run into a thread due to bitbake/tinfoil constraints. The oe-selftest script now has an cmdline option (-t) to enable threaded runs, by default is set to 1, this needs to be set manually because depending on HW resources available can cause ran out of cpu/memory. By default the oe-selftest cases runs on the main thread and uses the main build directory for compatibility purposes. The following changes since commit 854c8c2e4c24ea3ddfec6e5b5f6477f0620510e4: oeqa/tinfoil: Improve test_wait_event for race issues (2017-07-08 13:34:46 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib alimon/oe_selftest_threaded http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=alimon/oe_selftest_threaded Aníbal Limón (30): oeqa/core/loader: Switch method definition for _make_failed_test oeqa/selftest/{context,case}: Handle KeyboardInterrupt/SIGINT and SIGTERM selftest/cases/package: Call parent setUpClass method bb/tinfoil: run_command handle busy status in bitbake server oe/copy_buildsystem: check_sstate_task_list also pop BBPATH from env oeqa/core/threaded: Enable support to use the main thread oeqa/core/threaded: Add support to run into a thread at end of execution oeqa/core/threaded: logSummary add skipped tests info oeqa/core/tests: Update test_loader threaded to cover main thread usage oeqa/selftest/{case,context}: Add builddir by test class and context oeqa/selftest/case: Add wrappers to utils.commands modules oeqa/selftest/case: Creates meta-selftest layer per class oeqa/selftest/case: tearDown extra commands print what actually fails oeqa/selftest/case: Support bitbake memres mode in per build directory oeqa/selftest/cases: Use testlayer_path instead of call get_test_layer() oeqa/selftest/cases: Use builddir from class instead of get from environment oeqa/selftest/cases: Use wrapper methods from OESelfTestCase class oeqa/selftest/cases: tinfoil to run in the main thread oeqa/selftest/cases: imagefeatures enable threaded runs oeqa/selftest/cases: runqemu enable thraded runs oeqa/selftest/cases: runtime enable threaded runs oeqa/selftest/cases: eSDK enable threaded runs oeqa/selftest/cases: devtool enable threaded runs oeqa/selftest/cases: recipetool enable for threaded runs oeqa/selftest/cases: Move devtool deploy test case to own module selftest/cases/devtool{,end}: Move update/finish_modify tests to its own module seltest/cases/devtool: Build dbus on test_devtool_add_git_local argparse_oe: Add int_positive type oeqa/selftest/context: Enable support for threaded runs oeqa/selftest/cases: systemd_boot enable threaded runs bitbake/lib/bb/tinfoil.py | 23 +- .../lib/oeqa/selftest/cases/systemd_boot.py| 26 +- meta/lib/oe/copy_buildsystem.py|1 + meta/lib/oeqa/core/loader.py |4 +- meta/lib/oeqa/core/tests/test_loader.py| 17 +- meta/lib/oeqa/core/threaded.py | 169 +++- meta/lib/oeqa/selftest/case.py | 251 - .../lib/oeqa/selftest/cases/_sstatetests_noauto.py | 23 +- meta/lib/oeqa/selftest/cases/archiver.py | 21 +- meta/lib/oeqa/selftest/cases/bblayers.py | 45 +- meta/lib/oeqa/selftest/cases/bbtests.py| 103 +- meta/lib/oeqa/selftest/cases/buildhistory.py |9 +- meta/lib/oeqa/selftest/cases/buildoptions.py | 51 +- meta/lib/oeqa/selftest/cases/containerimage.py |9 +- meta/lib/oeqa/selftest/cases/devtool.py| 1014 +--- meta/lib/oeqa/selftest/cases/devtool_deploy.py | 93 ++ meta/lib/oeqa/selftest/cases/devtool_end.py| 506 ++ meta/lib/oeqa/selftest/cases/distrodata.py |7 +- meta/lib/oeqa/selftest/cases/eSDK.py | 61 +- meta/lib/oeqa/selftest/cases/image_typedep.py |8 +- meta/lib/oeqa/selftest/cases/imagefeatures.py | 78 +- meta/lib/oeqa/selftest/cases/imagefeatures_boot.py | 63 ++ meta/lib/oeqa/selftest/cases/layerappend.py| 22 +- meta/lib/oeqa/selftest/cases/liboe.py | 13 +- meta/lib/oeqa/selftest/cases/lic_checksum.py |8 +- meta/lib/oeqa/selftest/cases/manifest.py | 13 +- meta/lib/oeqa/selftest/cases/oelib/buildhistory.py |7 +- meta/lib/oeqa/selftest/cases/oescripts.py |5 +- meta/lib/oeqa/selftest/cases/package.py| 12 +- meta/lib/oeqa/selftest/cases/pkgdata.py| 73 +-
Re: [OE-core] [poky][master] [PATCH v4 0/1] initramfs-framework: configuration to boot up live image
On Mon, Jul 10, 2017 at 2:09 PM,wrote: > From: "Ng, Wei Tee" > > Hi, > > This patch is to get initramfs-framework able to boot up live image. > A new scriplet named setup-live module has been created to handle > the removeable media detection and assign the rootfs.img. This is > because the current rootfs module has no support for rootfs images, > only rootfs partitions. > > This version 4 included the changes for squashing 2 commits into > single commit. It involve the creation of initramfs-module-setup-live > in the recipe and added udev-extraconf rdepends on this module because > it is needed for automounting process. As I said on the other patch, it still has indenting issues; please check. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [morty][PATCH 1/1] openssl-native: Compile with -fPIC
On Tue, Jul 11, 2017 at 12:07 PM, Martin Kellywrote: > Hi, > > Is there any issue with backporting this to morty? It would help me fix a > build crash I'm seeing on morty, and I'm currently using the backport in a > separate repo with no issue. > there should be no issues. Let Armin know of your request. > On 06/28/2017 11:06 AM, Martin Kelly wrote: >> >> On 05/26/2017 12:03 AM, Mirza Krak wrote: >>> >>> From: Khem Raj >>> >>> Fixes >>> | /usr/bin/ld: libcrypto.a(sha1-x86_64.o): relocation R_X86_64_PC32 >>> against undefined symbol `OPENSSL_ia32cap_P' can not be used when >>> making a shared object; recompile with -fPIC >>> | /usr/bin/ld: final link failed: Bad value >>> >>> Signed-off-by: Khem Raj >>> (cherry picked from commit 0a19e72081771fca8ed94fb2a2a8996fd3dce00c) >>> Signed-off-by: Mirza Krak >>> --- >>> >>> I hit the same compiler error as in above commit message when running >>> on morty branch. >>> >>> I simply cherry-picked that fix in to morty branch. I looked in the >>> git log of oe-core and it seems to me that it shall be ok to do that? >>> >>> This is a re-send since I messed up Subject the first time around [1] >>> >> >> I want to put in my $0.02 that I have hit the same issue and would also >> like the fix to be cherry-picked into morty. I tested and agree that it >> seems to work with no issue. >> >>> [1]. >>> >>> http://lists.openembedded.org/pipermail/openembedded-core/2017-May/136489.html >>> >>> >>> meta/recipes-connectivity/openssl/openssl_1.0.2j.bb | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb >>> b/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb >>> index 9a7cdedd05..b6fb126349 100644 >>> --- a/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb >>> +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb >>> @@ -5,6 +5,7 @@ require openssl.inc >>> DEPENDS += "cryptodev-linux" >>> >>> CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" >>> +CFLAG_append_class-native = " -fPIC" >>> >>> LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6" >>> >>> -- >>> 2.13.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
Re: [OE-core] [morty][PATCH 1/1] openssl-native: Compile with -fPIC
Hi, Is there any issue with backporting this to morty? It would help me fix a build crash I'm seeing on morty, and I'm currently using the backport in a separate repo with no issue. On 06/28/2017 11:06 AM, Martin Kelly wrote: On 05/26/2017 12:03 AM, Mirza Krak wrote: From: Khem RajFixes | /usr/bin/ld: libcrypto.a(sha1-x86_64.o): relocation R_X86_64_PC32 against undefined symbol `OPENSSL_ia32cap_P' can not be used when making a shared object; recompile with -fPIC | /usr/bin/ld: final link failed: Bad value Signed-off-by: Khem Raj (cherry picked from commit 0a19e72081771fca8ed94fb2a2a8996fd3dce00c) Signed-off-by: Mirza Krak --- I hit the same compiler error as in above commit message when running on morty branch. I simply cherry-picked that fix in to morty branch. I looked in the git log of oe-core and it seems to me that it shall be ok to do that? This is a re-send since I messed up Subject the first time around [1] I want to put in my $0.02 that I have hit the same issue and would also like the fix to be cherry-picked into morty. I tested and agree that it seems to work with no issue. [1]. http://lists.openembedded.org/pipermail/openembedded-core/2017-May/136489.html meta/recipes-connectivity/openssl/openssl_1.0.2j.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb index 9a7cdedd05..b6fb126349 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2j.bb @@ -5,6 +5,7 @@ require openssl.inc DEPENDS += "cryptodev-linux" CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" +CFLAG_append_class-native = " -fPIC" LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6" -- 2.13.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] libepoxy: Upgrade 1.4.2 -> 1.4.3
On Tue, Jul 11, 2017 at 1:34 AM, Jussi Kukkonenwrote: > On 11 July 2017 at 11:27, Jussi Kukkonen wrote: >> >> On 11 July 2017 at 10:42, Jussi Kukkonen wrote: Exception: FileExistsError: [Errno 17] File exists: '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/sysroots-components/raspberrypi3/userland/usr/include/KHR/khrplatform.h' -> '/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/gtk+3/3.22.16-r0/recipe-sysroot/usr/include/KHR/khrplatform.h' >>> >>> >>> /usr/include/KHR/khrplatform.h is the egl platform header file, provided >>> by both mesa and RPI userland. Does mesa end up in your gtk+3 recipe-sysroot >>> somehow? >>> >>> For clarity: this could be a bug but it is unlikely to be related to the >>> libepoxy change (it does not use or ship the actual header file). >>> >> >> >> Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa >> accidentally shipped khrplatform.h even when egl was disabled (which is what >> mesa-gl in oe-core does). >> > > Sorry, I've not had enough coffee. It was the other way round: > khrplatform.h is the platform header that mesa now thinks is needed whether > egl is enabled or not -- so they've started installing it in any case from > 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts > with userland. > > I don't know what the correct fix is yet, just wanted to correct my original > wrong info. > Post an update to sync this header for userland package. > > -- > ___ > 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] slang: add ptest
Hi Robert, Thanks for the report. Could you say how to reproduce the error? What target architecture, config options, oe-core version, etc do you use? I have tried with openembedded-core 643c81af (master), with MACHINE = "qemux86-64", EXTRA_IMAGE_FEATURES ?= "debug-tweaks ptest-pkgs" DISTRO_FEATURES += "ptest" and CORE_IMAGE_EXTRA_INSTALL += "slang" set in local.conf, everything builds fine. -- Stefan On 11/07/17 04:36, Robert Yang wrote: > Hello Stefan, > > There is an error when do_compile_ptest_base: > > | ../objs/libslang.a(sldisply.o): In function `tt_tgetstr': > | /usr/src/debug/slang/2.3.1a-r0/slang-2.3.1a/src/sldisply.c:2576: undefined > reference to `tgetstr' > | ../objs/libslang.a(sldisply.o): In function `SLtt_initialize': > | /usr/src/debug/slang/2.3.1a-r0/slang-2.3.1a/src/sldisply.c:2770: undefined > reference to `tgetent' > | ../objs/libslang.a(sldisply.o): In function `tt_tgetflag': > | /usr/src/debug/slang/2.3.1a-r0/slang-2.3.1a/src/sldisply.c:2635: undefined > reference to `tgetflag' > > > It is because it uses ncurses5-config which is wrong in oe-core, the > log.do_configure shows: > > checking for ncurses5-config... > /buildarea/lyang1/test_m/tmp/work/i586-poky-linux/slang/2.3.1a-r0/recipe-sysroot/usr/bin/crossscripts/ncurses5-config > checking for terminfo... ERROR: /usr/bin/ncurses5-config should not be used, > use > an alternative such as pkg-config > > Would you please fix it? > > // Robert > > On 06/21/2017 12:21 AM, Stefan Strogin wrote: >> This patch adds ptest for slang, it uses `make runtests` to run tests. >> The Makefile runs runtests.sh for each *.sl and *.slc tests. >> runtests.sh is patched for printing test results in a common format, >> Makefile is patched in order not to compile any dependencies. >> >> Changes v2->v3: rebased on the latest master (1d9a88f6). >> >> Signed-off-by: Stefan Strogin>> Cc: xe-linux-exter...@cisco.com >> --- >> meta/recipes-extended/slang/slang/run-ptest| 3 +++ >> ...-add-output-in-the-format-result-testname.patch | 30 >> ++ >> meta/recipes-extended/slang/slang_2.3.1a.bb| 25 +- >> 3 files changed, 57 insertions(+), 1 deletion(-) >> create mode 100644 meta/recipes-extended/slang/slang/run-ptest >> create mode 100644 >> meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch >> >> diff --git a/meta/recipes-extended/slang/slang/run-ptest >> b/meta/recipes-extended/slang/slang/run-ptest >> new file mode 100644 >> index 00..39f474af31 >> --- /dev/null >> +++ b/meta/recipes-extended/slang/slang/run-ptest >> @@ -0,0 +1,3 @@ >> +#!/bin/sh >> + >> +make -C test runtests >> diff --git >> a/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch >> >> b/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch >> new file mode 100644 >> index 00..27a9bb87ea >> --- /dev/null >> +++ >> b/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch >> @@ -0,0 +1,30 @@ >> +From 38688ee2754415cf2a1935dafb8278861b7315e7 Mon Sep 17 00:00:00 2001 >> +From: Stefan Strogin >> +Date: Thu, 2 Mar 2017 00:26:31 +0200 >> +Subject: [PATCH] test: add output in the format "result: testname" >> + >> +Upstream-Status: Inappropriate [oe specific] >> + >> +Signed-off-by: Stefan Strogin >> +--- >> + src/test/runtests.sh | 2 ++ >> + 1 file changed, 2 insertions(+) >> + >> +diff --git a/src/test/runtests.sh b/src/test/runtests.sh >> +index a3eaad0..64f0705 100755 >> +--- a/src/test/runtests.sh >> b/src/test/runtests.sh >> +@@ -34,8 +34,10 @@ do >> + then >> +n_failed=`expr ${n_failed} + 1` >> +tests_failed="$tests_failed $testfile" >> ++ echo "FAIL: $testfile" >> + else >> + touch lastrun/$testfile >> ++ echo "PASS: $testfile" >> + fi >> + done >> + >> +-- >> +2.11.0 >> + >> diff --git a/meta/recipes-extended/slang/slang_2.3.1a.bb >> b/meta/recipes-extended/slang/slang_2.3.1a.bb >> index c71d80481f..b302104ee1 100644 >> --- a/meta/recipes-extended/slang/slang_2.3.1a.bb >> +++ b/meta/recipes-extended/slang/slang_2.3.1a.bb >> @@ -17,6 +17,8 @@ LIC_FILES_CHKSUM = >> "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" >> SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ >> file://no-x.patch \ >> file://dont-link-to-host.patch \ >> + file://test-add-output-in-the-format-result-testname.patch \ >> + file://run-ptest \ >>" >> >> SRC_URI[md5sum] = "c5235313042ed0e71ec708f7b85ec241" >> @@ -25,7 +27,7 @@ SRC_URI[sha256sum] = >> "54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021 >> UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/; >> PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* >> http://www.jedsoft.org/releases/slang/old/ \n" >> >> -inherit autotools-brokensep
Re: [OE-core] [PATCH v3] valgrind: Update 3.12.0 -> 3.13.0
On 07/11/2017 04:43 AM, Burton, Ross wrote: On 9 July 2017 at 08:35, Soren Brinkmann> wrote: Signed-off-by: Soren Brinkmann > --- v3: - rebased onto latest master branch v2: - no change Fails to build on PPC if ptest is enabled: http://errors.yoctoproject.org/Errors/Details/147237/ I find that both valgrind 3.12 and the proposed patch fail to build with ppc64. Valgrind 3.12 builds with ppc64 if I switch GCCVERSION back to 6.3 I suppose the 7.1 compiler is uncovering some issues with some of the assembly language that has gone undetected before. Using 3.12 with master branch / GCCVERSION 7.1 fails in coregrind: powerpc64-poky-linux-gcc -mhard-float -m64 -mcpu=e5500 --sysroot=/build/yocto/build_master/tmp/work/ppc64e5500-poky-linux/valgrind/3.12.0-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../../valgrind-3.12.0/coregrind -I.. -I../../valgrind-3.12.0 -I../../valgrind-3.12.0/include -I../../valgrind-3.12.0/VEX/pub -I../VEX/pub -DVGA_ppc64be=1 -DVGO_linux=1 -DVGP_ppc64be_linux=1 -DVGPV_ppc64be_linux_vanilla=1 -I../../valgrind-3.12.0/coregrind -DVG_LIBDIR="\"/usr/lib64/valgrind"\" -DVG_PLATFORM="\"ppc64be-linux\"" -m64 -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wcast-align -Wcast-qual -Wwrite-strings -Wempty-body -Wformat -Wformat-security -Wignored-qualifiers -Wmissing-parameter-type -Wold-style-declaration -fno-stack-protector -fno-strict-aliasing -fno-builtin -DENABLE_LINUX_TICKET_LOCK -g -feliminate-unused-debug-types -fdebug-prefix-map=/build/yocto/build_master/tmp/work/ppc64e5500-poky-linux/valgrind/3.12.0-r0=/usr/src/debug/valgrind/3.12.0-r0 -fdebug-prefix-map=/build/yocto/build_master/tmp/work/ppc64e5500-poky-linux/valgrind/3.12.0-r0/recipe-sysroot-native= -fdebug-prefix-map=/build/yocto/build_master/tmp/work/ppc64e5500-poky-linux/valgrind/3.12.0-r0/recipe-sysroot= -c -o libcoregrind_ppc64be_linux_a-m_debuglog.o `test -f 'm_debuglog.c' || echo '../../valgrind-3.12.0/coregrind/'`m_debuglog.c | ../../valgrind-3.12.0/coregrind/m_debuglog.c: In function 'local_sys_write_stderr': | ../../valgrind-3.12.0/coregrind/m_debuglog.c:203:4: error: PIC register clobbered by 'r2' in 'asm' | __asm__ volatile ( | ^~~ | ../../valgrind-3.12.0/coregrind/m_debuglog.c: In function 'vgPlain_debugLog': | ../../valgrind-3.12.0/coregrind/m_debuglog.c:228:4: error: PIC register clobbered by 'r2' in 'asm' | __asm__ volatile ( | ^~~ * Using 3.13 patch with master branch / GCCVERSION 7.1 fails in tests/ppc64 powerpc64-poky-linux-gcc -mhard-float -m64 -mcpu=e5500 --sysroot=/build/yocto/build_master/tmp/work/ppc64e5500-poky-linux/valgrind/3.13.0-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../../../../valgrind-3.13.0/none/tests/ppc64 -I../../.. -I../../../../valgrind-3.13.0 -I../../../../valgrind-3.13.0/include -I../../../../valgrind-3.13.0/coregrind -I../../../include -I../../../../valgrind-3.13.0/VEX/pub -I../../../VEX/pub -DVGA_ppc64be=1 -DVGO_linux=1 -DVGP_ppc64be_linux=1 -DVGPV_ppc64be_linux_vanilla=1 -Winline -Wall -Wshadow -Wno-long-long -g -fno-stack-protector -m64 -Winline -Wall -O -g -mregnames -m64 -g -feliminate-unused-debug-types -fdebug-prefix-map=/build/yocto/build_master/tmp/work/ppc64e5500-poky-linux/valgrind/3.13.0-r0=/usr/src/debug/valgrind/3.13.0-r0 -fdebug-prefix-map=/build/yocto/build_master/tmp/work/ppc64e5500-poky-linux/valgrind/3.13.0-r0/recipe-sysroot-native= -fdebug-prefix-map=/build/yocto/build_master/tmp/work/ppc64e5500-poky-linux/valgrind/3.13.0-r0/recipe-sysroot= -c -o test_isa_2_06_part2-test_isa_2_06_part2.o `test -f 'test_isa_2_06_part2.c' || echo '../../../../valgrind-3.13.0/none/tests/ppc64/'`test_isa_2_06_part2.c | ../../../../valgrind-3.13.0/none/tests/ppc64/test_isa_2_06_part2.c: In function 'usage': | ../../../../valgrind-3.13.0/none/tests/ppc64/test_isa_2_06_part2.c:1778:3: warning: implicit declaration of function 'fprintf' [-Wimplicit-function-declaration] |fprintf(stderr, |^~~ | ../../../../valgrind-3.13.0/none/tests/ppc64/test_isa_2_06_part2.c:1778:3: warning: incompatible implicit declaration of built-in function 'fprintf' | ../../../../valgrind-3.13.0/none/tests/ppc64/test_isa_2_06_part2.c:1778:3: note: include '' or provide a declaration of 'fprintf' | ../../../../valgrind-3.13.0/none/tests/ppc64/test_isa_2_06_part2.c:1778:11: error: 'stderr' undeclared (first use in this function) |fprintf(stderr, |^~ | ../../../../valgrind-3.13.0/none/tests/ppc64/test_isa_2_06_part2.c:1778:11: note: each undeclared identifier is reported only once for each function it appears in | At top level: | ../../../../valgrind-3.13.0/none/tests/ppc64/test_isa_2_06_part2.c:1776:13: warning: 'usage' defined but not used
Re: [OE-core] [PATCH] gettext: Enable generation of libasprintf in gettext 0.19
On Tue, 2017-07-11 at 11:57 -0400, Lev Iserovich wrote: > From: Lev Iserovich> next type, in case you need to send a second (or third..) revision, include the 'v2' label after the '[PATCH ' string the subject line. BTW, this time patchtest did not complain :) Leo > Libasprintf was included in gettext 0.16 recipe, but omitted for some reason > in 0.19. This turns it back on. > > Signed-off-by: Lev Iserovich > --- > meta/recipes-core/gettext/gettext_0.19.8.1.bb | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb > b/meta/recipes-core/gettext/gettext_0.19.8.1.bb > index c2059e6..c7c81ee 100644 > --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb > +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb > @@ -28,7 +28,6 @@ inherit autotools texinfo > > EXTRA_OECONF += "--without-lispdir \ > --disable-csharp \ > - --disable-libasprintf \ > --disable-java \ > --disable-native-java \ > --disable-openmp \ > @@ -81,7 +80,7 @@ FILES_gettext-runtime = "${bindir}/gettext \ > ${bindir}/ngettext \ > ${bindir}/envsubst \ > ${bindir}/gettext.sh \ > - ${libdir}/libasprintf.so* \ > + ${libdir}/libasprintf${SODEV} \ > ${libdir}/GNU.Gettext.dll \ > " > FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ > -- > 2.7.1 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/2] mesa: Upgrade to 17.1.4 release
On Tue, Jul 11, 2017 at 6:00 AM, Jussi Kukkonenwrote: > On 3 July 2017 at 23:02, Otavio Salvador wrote: >> >> This includes following upstream bug fixes: >> >> Bug 77240 - khrplatform.h not installed if EGL is disabled > > > Saying this here as well for visibility: > > This conflicts with userland from meta-raspberrypi because both mesa-gl and > userland now have khrplatform.h > > Since mesa-gl provides no GLES or EGL, it shouldn't really need to ship > khrplatform.h. I am not sure I follow you, could you explain it more? or if possible, send a patch and add me on Cc so we can discuss it. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] pkgconf: consider pkgconf as a replacement for pkg-config
On 11 July 2017 at 17:17, Khem Rajwrote: > Is this going to be the case permanently? > I would suggest to make pkgconf default and dump pkgconfig recipes at same > time > Or do we plan to wait for one release > For testing this is good, if it merges I think we should dump pkgconfig and have appropriate provides. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for gettext: Enable generation of libasprintf in gettext 0.19
On 07/11/2017 11:35 AM, Denys Dmytriyenko wrote: Your patch is simply corrupted - please use git to send it, not a regular MUA. Thank you, resending with git worked. Lev -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] pkgconf: consider pkgconf as a replacement for pkg-config
On Tue, Jul 11, 2017 at 5:58 AM Maxin B. Johnwrote: > pkgconf is a better replacement for pkg-config. Fedora 26 replaces the > system pkg-config implementation with pkgconf because it "provides better > support for handling .pc files and a stable library ABI/API for integrating > into applications." and is actively maintained, unlike pkg-config. > > pkgconf aims to offer many improvements over pkg-config such as faster/more > efficient dependency resolver which "allows for the user to more > conservatively > link their binaries -- which may be helpful in some environments, such as > when > prelink(1) is being used. > > pkgconf also aims to provide a more complete implementation of pkg-config. > The features most likely to benefit the Yocto Project build system are the > faster/more efficient dependency resolution and linker flag optimisation. > > To test this, after applying these patches, update "local.conf" as below: > > PREFERRED_PROVIDER_pkgconfig = "pkgconf" > PREFERRED_PROVIDER_pkgconfig-native = "pkgconf-native" > PREFERRED_PROVIDER_nativesdk-pkgconfig = "nativesdk-pkgconf" Is this going to be the case permanently? I would suggest to make pkgconf default and dump pkgconfig recipes at same time Or do we plan to wait for one release > > > Links: > 1. http://pkgconf.org > 2. > https://fedoraproject.org/wiki/Changes/pkgconf_as_system_pkg-config_implementation > 3. https://bugzilla.yoctoproject.org/show_bug.cgi?id=11308 > > Maxin B. John (3): > pkgconf: add recipe > libx11: fix build error > libxt: fix build failure > > meta/files/common-licenses/pkgconf | 10 > .../pkgconf/pkgconf/pkg-config-native.in | 6 +++ > .../pkgconf/pkgconf/pkg-config-wrapper | 16 +++ > meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb | 55 > ++ > meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb | 3 ++ > ...il-don-t-link-makestrs-with-target-cflags.patch | 33 + > meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb | 4 +- > 7 files changed, 126 insertions(+), 1 deletion(-) > create mode 100644 meta/files/common-licenses/pkgconf > create mode 100644 meta/recipes-devtools/pkgconf/pkgconf/ > pkg-config-native.in > create mode 100755 > meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper > create mode 100644 meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb > create mode 100644 > meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch > > -- > 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] [PATCH] gettext: Enable generation of libasprintf in gettext 0.19
From: Lev IserovichLibasprintf was included in gettext 0.16 recipe, but omitted for some reason in 0.19. This turns it back on. Signed-off-by: Lev Iserovich --- meta/recipes-core/gettext/gettext_0.19.8.1.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb index c2059e6..c7c81ee 100644 --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb @@ -28,7 +28,6 @@ inherit autotools texinfo EXTRA_OECONF += "--without-lispdir \ --disable-csharp \ - --disable-libasprintf \ --disable-java \ --disable-native-java \ --disable-openmp \ @@ -81,7 +80,7 @@ FILES_gettext-runtime = "${bindir}/gettext \ ${bindir}/ngettext \ ${bindir}/envsubst \ ${bindir}/gettext.sh \ - ${libdir}/libasprintf.so* \ + ${libdir}/libasprintf${SODEV} \ ${libdir}/GNU.Gettext.dll \ " FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ -- 2.7.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for gettext: Enable generation of libasprintf in gettext 0.19
On Tue, 2017-07-11 at 11:35 -0400, Denys Dmytriyenko wrote: > Your patch is simply corrupted - please use git to send it, not a regular MUA. Lev, I just tried locally and patch can not be merged on top of master's HEAD. One easy way to try is using patchwork's git plugin and from the command line: > git pw mbox 7657 | git apply --check --verbose Checking patch meta/recipes-core/gettext/gettext_0.19.8.1.bb... error: while searching for: EXTRA_OECONF += "--without-lispdir \ --disable-csharp \ --disable-libasprintf \ --disable-java \ --disable-native-java \ --disable-openmp \ So, as the message suggests, update your master and rebase your branch against the latter. > > On Tue, Jul 11, 2017 at 11:10:11AM -0400, Lev Iserovich wrote: > > Can anyone help me with undestanding this - I'm confused by this > > patchwork failure. > > The patch applies just fine on top of master - my patch was based on > > top of the commit with the hash referenced by patchwork below. > > > > Thanks, > > > > Lev Iserovich > > > > On 07/10/2017 05:31 PM, Patchwork wrote: > > >== Series Details == > > > > > >Series: gettext: Enable generation of libasprintf in gettext 0.19 > > >Revision: 1 > > >URL : https://patchwork.openembedded.org/series/7657/ > > >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 7dd5dfc4d5) > > > > > > > > > > > >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 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-7.1: Update the libsanitize stack_t patch to upstreamed version
Signed-off-by: Khem Raj--- ...r-Use-stack_t-instead-of-struct-sigaltsta.patch | 135 + 1 file changed, 28 insertions(+), 107 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch b/meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch index ee15c6cac8..165258b5d3 100644 --- a/meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch +++ b/meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch @@ -3,6 +3,8 @@ From: Khem Raj Date: Sun, 11 Jun 2017 10:09:13 -0700 Subject: [PATCH] libsanitizer: Use stack_t instead of struct sigaltstack +https://reviews.llvm.org/D35246 + Upstream-Status: Submitted Signed-off-by: Khem Raj @@ -12,83 +14,49 @@ Signed-off-by: Khem Raj .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc| 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) -Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc -=== gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_linux.cc -+++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc -@@ -14,6 +14,10 @@ - - #if SANITIZER_FREEBSD || SANITIZER_LINUX - -+#if !SANITIZER_ANDROID -+#include -+#endif -+ - #include "sanitizer_common.h" - #include "sanitizer_flags.h" - #include "sanitizer_internal_defs.h" -@@ -71,10 +75,6 @@ extern "C" { - extern char **environ; // provided by crt1 - #endif // SANITIZER_FREEBSD - --#if !SANITIZER_ANDROID --#include --#endif -- - #if SANITIZER_LINUX - // - struct kernel_timeval { -@@ -605,8 +605,8 @@ uptr internal_prctl(int option, uptr arg - } - #endif - --uptr internal_sigaltstack(const struct sigaltstack *ss, -- struct sigaltstack *oss) { -+uptr internal_sigaltstack(const stack_t *ss, -+ stack_t *oss) { - return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); - } - + Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.h === gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_linux.h +--- gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.h +++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.h -@@ -19,7 +19,10 @@ +@@ -21,17 +21,15 @@ #include "sanitizer_platform_limits_posix.h" struct link_map; // Opaque type returned by dlopen(). -struct sigaltstack; -+ -+#ifndef __stack_t_defined -+struct stack_t; -+#endif namespace __sanitizer { // Dirent structure for getdents(). Note that this structure is different from -@@ -28,8 +31,8 @@ struct linux_dirent; + // the one in , which is used by readdir(). + struct linux_dirent; // Syscall wrappers. uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); -uptr internal_sigaltstack(const struct sigaltstack* ss, - struct sigaltstack* oss); -+uptr internal_sigaltstack(const stack_t* ss, -+ stack_t* oss); ++uptr internal_sigaltstack(const void* ss, void* oss); uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, __sanitizer_sigset_t *oldset); -Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc === gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -+++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -@@ -16,6 +16,7 @@ - defined(__aarch64__) || defined(__powerpc64__) || \ - defined(__s390__)) +--- gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc +@@ -631,8 +631,7 @@ + } + #endif -+#include - #include "sanitizer_stoptheworld.h" +-uptr internal_sigaltstack(const struct sigaltstack *ss, +- struct sigaltstack *oss) { ++uptr internal_sigaltstack(const void *ss, void *oss) { + return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); + } - #include "sanitizer_platform_limits_posix.h" -@@ -273,7 +274,7 @@ static int TracerThread(void* argument) +Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +=== +--- gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +@@ -287,7 +287,7 @@ // Alternate stack for signal handling. InternalScopedBuffer
Re: [OE-core] ✗ patchtest: failure for gettext: Enable generation of libasprintf in gettext 0.19
Your patch is simply corrupted - please use git to send it, not a regular MUA. On Tue, Jul 11, 2017 at 11:10:11AM -0400, Lev Iserovich wrote: > Can anyone help me with undestanding this - I'm confused by this > patchwork failure. > The patch applies just fine on top of master - my patch was based on > top of the commit with the hash referenced by patchwork below. > > Thanks, > > Lev Iserovich > > On 07/10/2017 05:31 PM, Patchwork wrote: > >== Series Details == > > > >Series: gettext: Enable generation of libasprintf in gettext 0.19 > >Revision: 1 > >URL : https://patchwork.openembedded.org/series/7657/ > >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 7dd5dfc4d5) > > > > > > > >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 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] wayland-protocols: upgrade to 1.9
From: Denys DmytriyenkoSigned-off-by: Denys Dmytriyenko --- .../wayland/{wayland-protocols_1.8.bb => wayland-protocols_1.9.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/wayland/{wayland-protocols_1.8.bb => wayland-protocols_1.9.bb} (85%) diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.8.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.9.bb similarity index 85% rename from meta/recipes-graphics/wayland/wayland-protocols_1.8.bb rename to meta/recipes-graphics/wayland/wayland-protocols_1.9.bb index 264af21..bcb5095 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.8.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.9.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "769f93b312b1323a8012565c3973cf7d" -SRC_URI[sha256sum] = "e3fa5f2812cfec3c1c2573bd34adfe37d4d8950dba572d9ec6c52adcc5fe4b9a" +SRC_URI[md5sum] = "d9a3c93aac1f423501a33e7a9804b3b3" +SRC_URI[sha256sum] = "666b72de30ca3b70c2b54ccc9e8114cb520e76db224c816b5e23501099174f75" inherit allarch autotools pkgconfig -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][pyro] mkefidsk: fix bash/dash shell quoting problem
mkefidsk currently writes a startup.nsh with embedded control characters. This happens because \b etc are control sequences to the shell echo command when using dash. The resulting startup.nsh causes the bootup to fail, and the user is dropped into the EFI shell to manually run startup.nsh. Patch originally provided by Troy D. Hanson[YOCTO #9665] Signed-off-by: Saul Wold Signed-off-by: Richard Purdie (cherry picked from commit 008d6cb5bb4969f53a228893c502be8c9420ecb0) --- Backport REQUEST scripts/contrib/mkefidisk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 800733f..ac4ec9c 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -444,7 +444,7 @@ if [ -d $ROOTFS_MNT/etc/udev/ ] ; then fi # Add startup.nsh script for automated boot -echo "fs0:\EFI\BOOT\bootx64.efi" > $BOOTFS_MNT/startup.nsh +printf "fs0:\%s\BOOT\%s\n" "EFI" "bootx64.efi" > $BOOTFS_MNT/startup.nsh # Call cleanup to unmount devices and images and remove the TMPDIR -- 2.7.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for gettext: Enable generation of libasprintf in gettext 0.19
Can anyone help me with undestanding this - I'm confused by this patchwork failure. The patch applies just fine on top of master - my patch was based on top of the commit with the hash referenced by patchwork below. Thanks, Lev Iserovich On 07/10/2017 05:31 PM, Patchwork wrote: == Series Details == Series: gettext: Enable generation of libasprintf in gettext 0.19 Revision: 1 URL : https://patchwork.openembedded.org/series/7657/ 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 7dd5dfc4d5) 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] libarchive: Upgrade to 3.3.2 release
Signed-off-by: Otavio Salvador--- .../libarchive/{libarchive_3.3.1.bb => libarchive_3.3.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/libarchive/{libarchive_3.3.1.bb => libarchive_3.3.2.bb} (93%) diff --git a/meta/recipes-extended/libarchive/libarchive_3.3.1.bb b/meta/recipes-extended/libarchive/libarchive_3.3.2.bb similarity index 93% rename from meta/recipes-extended/libarchive/libarchive_3.3.1.bb rename to meta/recipes-extended/libarchive/libarchive_3.3.2.bb index 7a7da58b1f..9bf40f2609 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.3.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.3.2.bb @@ -34,8 +34,8 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ " -SRC_URI[md5sum] = "d2af45480aa5b0db5b5f3919cd0ea65e" -SRC_URI[sha256sum] = "29ca5bd1624ca5a007aa57e16080262ab4379dbf8797f5c52f7ea74a3b0424e7" +SRC_URI[md5sum] = "4583bd6b2ebf7e0e8963d90879eb1b27" +SRC_URI[sha256sum] = "ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce" inherit autotools update-alternatives pkgconfig -- 2.13.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] linux-yocto-dev: bump to 4.12+
Signed-off-by: Bruce Ashfield--- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index bf67f81f0772..5852b425d03f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -28,7 +28,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "4.11-rc+" +LINUX_VERSION ?= "4.12-rc+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] linux-yocto/4.4: update to v4.4.76
Integrating the -stable commit with the following changes: 4282d39575bf Linux 4.4.76 be8c39b47061 KVM: nVMX: Fix exception injection 77d977dd78b3 KVM: x86: zero base3 of unusable segments 3b1609f6c436 KVM: x86/vPMU: fix undefined shift in intel_pmu_refresh() b9b3eb5c774e KVM: x86: fix emulation of RSM and IRET instructions 3491a0b59fcd cpufreq: s3c2416: double free on driver init error path aad7041e721e iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid() 48952c6d517a iommu: Handle default domain attach failure 3de9630abe3b iommu/vt-d: Don't over-free page table directories 404ef3b4bf62 ocfs2: o2hb: revert hb threshold to keep compatible 5d650fcef901 x86/mm: Fix flush_tlb_page() on Xen 6fb3b322307e x86/mpx: Correctly report do_mpx_bt_fault() failures to user-space 7cd8c4903171 ARM: 8685/1: ensure memblock-limit is pmd-aligned d4960d58158b ARM64/ACPI: Fix BAD_MADT_GICC_ENTRY() macro implementation 6ca11db55f62 sched/loadavg: Avoid loadavg spikes caused by delayed NO_HZ accounting f6115ec09225 watchdog: bcm281xx: Fix use of uninitialized spinlock. f99737ce2e56 xfrm: Oops on error in pfkey_msg2xfrm_state() ac78351c96e8 xfrm: NULL dereference on allocation failure 398ac7a19f17 xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY 736b342cc9b4 jump label: fix passing kbuild_cflags when checking for asm goto support 53ae0c2ffef7 ravb: Fix use-after-free on `ifconfig eth0 down` db1323b77c2b sctp: check af before verify address in sctp_addr_id2transport d521e9c384f9 net/mlx4_core: Eliminate warning messages for SRQ_LIMIT under SRIOV 9837392c2b3e perf probe: Fix to show correct locations for events on modules 0593fa8f34a2 be2net: fix status check in be_cmd_pmac_add() 5416a88c2fef s390/ctl_reg: make __ctl_load a full memory barrier 9a536d587246 swiotlb: ensure that page-sized mappings are page-aligned 878f37efac3e coredump: Ensure proper size of sparse core files c20bdc08af9b x86/mpx: Use compatible types in comparison to fix sparse error 14339b018bc2 mac80211: initialize SMPS field in HT capabilities 11dd9e2c4803 spi: davinci: use dma_mapping_error() be91b09750bf scsi: lpfc: avoid double free of resource identifiers 4ac60b20f703 HID: i2c-hid: Add sleep between POWER ON and RESET 70f41003b9d1 kernel/panic.c: add missing \n e4272ebefc83 ibmveth: Add a proper check for the availability of the checksum features 8fa301abb31a vxlan: do not age static remote mac entries 00e83abf8e62 virtio_net: fix PAGE_SIZE > 64k c64f4194a65b vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null d3be5e0471ab drm/amdgpu: check ring being ready before using 58a766c460b1 net: dsa: Check return value of phy_connect_direct() 3d2cbbcbde3d amd-xgbe: Check xgbe_init() return code dac30e3dbd72 platform/x86: ideapad-laptop: handle ACPI event 1 666c821b0ae3 scsi: virtio_scsi: Reject commands when virtqueue is broken 230fe9c7d814 xen-netfront: Fix Rx stall during network stress and OOM 8df98ff6c394 swiotlb-xen: update dev_addr after swapping pages 23c7f01691a1 virtio_console: fix a crash in config_work_handler 6e1116a0b3e2 Btrfs: fix truncate down when no_holes feature is enabled 961efcd54e5b gianfar: Do not reuse pages from emergency reserve 477a2359c881 powerpc/eeh: Enable IO path on permanent error e1db592de735 net: bgmac: Remove superflous netif_carrier_on() e66647f0e1ff net: bgmac: Start transmit queue in bgmac_open f01babed64e6 net: bgmac: Fix SOF bit checking 992048f8ae84 bgmac: Fix reversed test of build_skb() return value. ebfa83ab5a53 mtd: bcm47xxpart: don't fail because of bit-flips 1124701061d8 bgmac: fix a missing check for build_skb 11e4bb957f1a mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only e025a30dd8b0 MIPS: ralink: fix MT7628 wled_an pinmux gpio cd1fe5c31e91 MIPS: ralink: fix MT7628 pinmux typos c9336bbdd924 MIPS: ralink: Fix invalid assignment of SoC type ad310161f513 MIPS: ralink: fix USB frequency scaling 9a23a35a4fc6 MIPS: ralink: MT7688 pinmux fixes e1688f1677e6 net: korina: Fix NAPI versus resources freeing ef0cb4c9d496 MIPS: ath79: fix regression in PCI window initialization 753be27f77eb net: mvneta: Fix for_each_present_cpu usage 0012ba253767 ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags 50e18570d8ea qla2xxx: Fix erroneous invalid handle message 8c721e38055a scsi: lpfc: Set elsiocb contexts to NULL after freeing it 5c982bac211c scsi: sd: Fix wrong DPOFUA disable in sd_read_cache_type b92f9f6a2c09 KVM: x86: fix fixing of hypercalls cdbf92675fad mm: numa: avoid waiting on freed migrated pages 21d7c733251a block: fix module reference leak on put_disk() call for cgroups throttle 2449a71eb982 sysctl: enable strict writes 1e0f216195a6 usb: gadget: f_fs: Fix possibe deadlock 04686ab28a35 drm/vmwgfx: Free hash table allocated by cmdbuf managed
[OE-core] [PATCH 1/6] kernel-yocto: propagate configuration errors to bbclass
As pointed out by klapperichp...@johndeere.com, missing configuration fragments were being picked up twice, once by the tools and once by the bbclass. Unfortunately, the tools error message was being detected as configs, and hence no error was reported at all. Rather than catching the output of the tools, we can instead check the return code and propagate the error message from the tools directly to the user. [YOCTO #11649] Signed-off-by: Bruce Ashfield--- meta/classes/kernel-yocto.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 50226f6d492e..1ca0756c4959 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -281,7 +281,8 @@ do_kernel_configme() { meta_dir=$(kgit --meta) configs="$(scc --configs -o ${meta_dir})" - if [ -z "${configs}" ]; then + if [ $? -ne 0 ]; then + bberror "${configs}" bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] linux-yocto/4.9: update to v4.9.36
Integrating the -stable release with the following commits: 9f86f302ec0e Linux 4.9.36 a29fd27ca268 KVM: nVMX: Fix exception injection d1d3756f07da KVM: x86: zero base3 of unusable segments f3c3ec96e5fb KVM: x86/vPMU: fix undefined shift in intel_pmu_refresh() 1eeb79426332 KVM: x86: fix emulation of RSM and IRET instructions 982d8d92f256 arm64: fix NULL dereference in have_cpu_die() a4bfcab30928 mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program de5862335ed7 i2c: brcmstb: Fix START and STOP conditions 8ee785016d5a brcmfmac: avoid writing channel out of allocated array 65fc82cea84f infiniband: hns: avoid gcc-7.0.1 warning for uninitialized data 3e51ccbadd15 objtool: Fix another GCC jump table detection issue 92e66676523a clk: scpi: don't add cpufreq device if the scpi dvfs node is disabled 8a6f400a374c cpufreq: s3c2416: double free on driver init error path 1781a29b31fa iommu/amd: Fix interrupt remapping when disable guest_mode 0e55856b8f29 iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid() f0c31c674abd iommu/dma: Don't reserve PCI I/O windows d7fcb303d1ee iommu: Handle default domain attach failure c19bfc6765d4 iommu/vt-d: Don't over-free page table directories d5c5e8ba5d9d ocfs2: o2hb: revert hb threshold to keep compatible 8af88a950b42 x86/mm: Fix flush_tlb_page() on Xen 3667dafd6c04 x86/mpx: Correctly report do_mpx_bt_fault() failures to user-space b287ade87c91 x86/boot/KASLR: Fix kexec crash due to 'virt_addr' calculation bug 15541e64163c tools arch: Sync arch/x86/lib/memcpy_64.S with the kernel a2c222bef08f ARM: 8685/1: ensure memblock-limit is pmd-aligned 7661b19687b2 ARM64/ACPI: Fix BAD_MADT_GICC_ENTRY() macro implementation 4efe34b500a7 ARM: dts: OMAP3: Fix MFG ID EEPROM 07bb2c7e7ea3 ARM: OMAP2+: omap_device: Sync omap_device and pm_runtime after probe defer e57aa416ca4c regulator: tps65086: Fix DT node referencing in of_parse_cb 88baad2e7159 regulator: tps65086: Fix expected switch DT node names 9846c67974d6 spi: fix device-node leaks c52829f60f5f spi: When no dma_chan map buffers with spi_master's parent 478273e11521 sched/loadavg: Avoid loadavg spikes caused by delayed NO_HZ accounting eea0261db8ef watchdog: bcm281xx: Fix use of uninitialized spinlock. 4211442b2088 netfilter: use skb_to_full_sk in ip_route_me_harder ac2730234cc1 xfrm: Oops on error in pfkey_msg2xfrm_state() c460f2beb6f0 xfrm: NULL dereference on allocation failure 1e1666257cb6 xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY 647f605276c0 mm/vmalloc.c: huge-vmap: fail gracefully on unexpected huge vmap mappings f9f73c58feef ravb: Fix use-after-free on `ifconfig eth0 down` adfe95fe5b42 ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets 168bd51ec5ef sctp: check af before verify address in sctp_addr_id2transport 399566f8a4fb net/mlx4_core: Eliminate warning messages for SRQ_LIMIT under SRIOV b6f75b986a7f perf probe: Fix to probe on gcc generated functions in modules 9f8ffe4e0952 tipc: allocate user memory with GFP_KERNEL flag 18b200e0c8ee net: phy: dp83867: allow RGMII_TXID/RGMII_RXID interface types e1eac347d971 perf probe: Fix to show correct locations for events on modules cc439964fab1 be2net: fix MAC addr setting on privileged BE3 VFs 02434def6fd0 be2net: don't delete MAC on close on unprivileged BE3 VFs fa1dbf505aef be2net: fix status check in be_cmd_pmac_add() 5f54c4e1e2af usb: dwc2: gadget: Fix GUSBCFG.USBTRDTIM value 0e9867b7113c s390/ctl_reg: make __ctl_load a full memory barrier 9d00195bc0af swiotlb: ensure that page-sized mappings are page-aligned 68a5dc385735 coredump: Ensure proper size of sparse core files d21816c24591 aio: fix lock dep warning 82835fb33ce5 perf/x86: Reject non sampling events with precise_ip 1c68633329d2 perf/core: Fix sys_perf_event_open() vs. hotplug 48131dd0f2b1 x86/mpx: Use compatible types in comparison to fix sparse error 283994074501 x86/tsc: Add the Intel Denverton Processor to native_calibrate_tsc() 6baa8c92dab9 mac80211: initialize SMPS field in HT capabilities 8eaaf66d41ad pmem: return EIO on read_pmem() failure 25319ae8e8a7 drm/amd/powerplay: refine vce dpm update code on Cz. f275ac7fc5d2 drm/amd/powerplay: fix vce cg logic error on CZ/St. 77e82094a3c9 drm/radeon/si: load special ucode for certain MC configs 4ae8dc6acb71 net: thunderx: acpi: fix LMAC initialization f88f06e18318 arm64: assembler: make adr_l work in modules under KASLR aabb797b4c12 spi: davinci: use dma_mapping_error() c32462d0b523 scsi: lpfc: avoid double free of resource identifiers 582c1ca0ea1d HID: i2c-hid: Add sleep between POWER ON and RESET c78b8de5c05c perf/x86/intel: Use ULL constant to prevent undefined shift behaviour 6130fac99481 mac80211: recalculate min channel width on VHT opmode changes d48cb21fd50b net: phy: marvell: fix
[OE-core] [PATCH 3/6] linux-yocto/4.1: update to v4.1.41
Integrating the korg -stable update that comprises the following commits: 4bd4cfc5210e Linux 4.1.41 c1dd3f51ad77 mm/huge_memory.c: respect FOLL_FORCE/FOLL_COW for thp afeb39160249 xc2028: Fix use-after-free bug properly 5eef36af5974 iio: proximity: as3935: fix as3935_write e8701e0f6768 ipx: call ipxitf_put() in ioctl error path 709dcf11a353 sched/fair: Initialize throttle_count for new task-groups lazily 0f665ed5581f sched/fair: Do not announce throttled next buddy in dequeue_task_fair() 953334de0819 iio: dac: ad7303: fix channel description 60e2e499e37d mwifiex: pcie: fix cmd_buf use-after-free in remove/reset 036ab4111761 rtlwifi: rtl8821ae: setup 8812ae RFE according to device type df8198865a0f ARM: tegra: paz00: Mark panel regulator as enabled on boot fda7c899dd76 fs/xattr.c: zero out memory copied to userspace in getxattr 273225634fef vfio/type1: Remove locked page accounting workqueue 358fa411ba9a crypto: algif_aead - Require setkey before accept(2) e0b7d5eae185 staging: gdm724x: gdm_mux: fix use-after-free on module unload 47655216cdf4 drm/ttm: fix use-after-free races in vm fault handling 46527f8d11fa f2fs: sanity check segment count 2b674f4ecce8 ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf 4aaeda7f5c4f ipv6: initialize route null entry in addrconf_init() 1d9afaa5c0a8 rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string 226d200531f4 ipv4, ipv6: ensure raw socket message is big enough to hold an IP header 14e82f4ce5bb tcp: fix wraparound issue in tcp_lp 38853e5c3775 tcp: do not underestimate skb->truesize in tcp_trim_head() 918d8536e126 ALSA: hda - Fix deadlock of controller device lock at unbinding 1c370084c6f3 staging: emxx_udc: remove incorrect __init annotations 8602853345b7 staging: wlan-ng: add missing byte order conversion bd253cf63929 brcmfmac: Make skb header writable before use c4efbc9ce69d brcmfmac: Ensure pointer correctly set if skb data location changes 62494116045e MIPS: R2-on-R6 MULTU/MADDU/MSUBU emulation bugfix 48ea252abd40 scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m ddfc6a095d10 serial: 8250_omap: Fix probe and remove for PM runtime 2c7105e86e3d USB: serial: io_edgeport: fix descriptor error handling 00f244650faf USB: serial: mct_u232: fix modem-status error handling 0379d54281fc USB: serial: quatech2: fix control-message error handling e2eaebce9d20 USB: serial: ftdi_sio: fix latency-timer error handling e7ccc604153b USB: serial: ark3116: fix open error handling b5b985c3a0bd USB: serial: ti_usb_3410_5052: fix control-message error handling dc7697bad3f6 USB: serial: io_edgeport: fix epic-descriptor handling 4e78688b4cb3 USB: serial: ssu100: fix control-message error handling 0f5e27457f1a USB: serial: digi_acceleport: fix incomplete rx sanity check 5d7985765271 USB: serial: keyspan_pda: fix receive sanity checks 9de980a19940 usb: host: ohci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths 08fd577b4b0f usb: host: ehci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths 0a9f0af48e3f KVM: nVMX: initialize PML fields in vmcs02 4736ccc83dfc Revert "KVM: nested VMX: disable perf cpuid reporting" 7a07dbb8c25c x86/platform/intel-mid: Correct MSI IRQ line for watchdog device 92e01bd47512 kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed 19d416eaccbb x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0 ae0f7bd8e226 mwifiex: Avoid skipping WEP key deletion for AP 34390bea46f7 mwifiex: remove redundant dma padding in AMSDU a5a09b34dab1 mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print 039747b6ef2d power: supply: bq24190_charger: Install irq_handler_thread() at end of probe() f3b0fe6bfcbf power: supply: bq24190_charger: Call set_mode_host() on pm_resume() 0ba15a289c67 power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING ab1b642339b3 powerpc/powernv: Fix opal_exit tracepoint opcode 5d1767ceff1f cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores 16968228efa5 9p: fix a potential acl leak c41e1ba87961 net: tg3: avoid uninitialized variable warning 95660aa2822d mtd: avoid stack overflow in MTD CFI code b9e4b97eb9a0 drbd: avoid redefinition of BITS_PER_PAGE 1de253cbd35b ALSA: ppc/awacs: shut up maybe-uninitialized warning db14464180fa timerfd: Protect the might cancel mechanism proper 11d54db42149 ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram 77ded373242b ipv6: check raw payload size correctly in ioctl 0c8f1722d1d6 ip6mr: fix notification device destruction 7f4ab2ced0a7 netpoll: Check for skb->queue_mapping 74c4460b6482 sctp: listen on the sock only when it's state is listening or closed 7d1a0fdd41f8 net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given 6824dcd302fd l2tp: take reference on sessions being dumped
[OE-core] [PATCH 2/6] kernel-yocto/meta: smp configuration changes
Integrating the following kernel configuration changes to clean up the SMP configuration fragments and fix a configuration audit warning. d0e5ea0e199b smp: Separate smp into 32 and 64 bit versions to avoid kernel warnings f1369c1d817e bsp/mohonpeak: smp gets added by default, remove unnecessary include 6fc22aa1200b bsp/rangeley: smp gets added by default, remove unnecessary include [YOCTO #11743] Signed-off-by: Alejandro HernandezSigned-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb| 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb| 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.9.bb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb index f25974cb6895..e804d8953397 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "6648a34e00c55a0634b39e661dd6ba14dd106473" -SRCREV_meta ?= "4b89f331d4220f6f62d20ef60aa59edcd9b44106" +SRCREV_meta ?= "e92bd55409a6ded89642f5ac22391487364ac798" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index 4ad799058b9a..f423604f663f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "b0b44854bfb7f7ea10890ab8d8fff936be7e37da" -SRCREV_meta ?= "c3f8900923a7b56ea6231d31a1a4e81306156dc5" +SRCREV_meta ?= "d0e5ea0e199b591cc7588dc80b6ec07ea05f74b8" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb index 3bfa24b0c98b..f0e9180ac13c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "ab749ed8fd7beb6c63ec62a808eac8678db83810" -SRCREV_meta ?= "60dd89e2423aaa2e7be680db09be43d1f47471e0" +SRCREV_meta ?= "299f12a06ca1d6fd90b24450dae3b9f257a536be" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb index 2e98914abb7b..f58799be9139 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "6648a34e00c55a0634b39e661dd6ba14dd106473" -SRCREV_meta ?= "4b89f331d4220f6f62d20ef60aa59edcd9b44106" +SRCREV_meta ?= "e92bd55409a6ded89642f5ac22391487364ac798" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index 3f987a905173..868e70edc45a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "268676407913f5d496cde6cbf4052eb5acaf6237" -SRCREV_meta ?= "c3f8900923a7b56ea6231d31a1a4e81306156dc5" +SRCREV_meta ?= "d0e5ea0e199b591cc7588dc80b6ec07ea05f74b8" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb index 8041c5f77130..482e38c8ce8e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "d2de43e42bb8a270e680aab1c8f2447bff0b3552" -SRCREV_meta ?= "60dd89e2423aaa2e7be680db09be43d1f47471e0" +SRCREV_meta ?= "299f12a06ca1d6fd90b24450dae3b9f257a536be" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.10.bb b/meta/recipes-kernel/linux/linux-yocto_4.10.bb
[OE-core] [PATCH 0/6] kernel-yocto: consolidated pull request
Hi all, There are a couple of repeated patches in this series, but I'm sending them along just to make sure that all my pending patches are grouped together. In this series, we have a configuratiion tweak (that fixes a build warning), -stable updates for all the active kernels, a bug fix for error propagation .. and finally a bump of linux-yocto-dev to 4.12+. The next LTS kernel was picked to be 4.14, so once again, we are going to be in an awkward timing window for the release. To make sure that we are ready for whatever the timing is, I've bumped this to 4.12 and integrated the pre-rc1 changes into the tree .. so this puts -dev at somewhere between 4.12 and 4.13 with this update. cheers, Bruce The following changes since commit 854c8c2e4c24ea3ddfec6e5b5f6477f0620510e4: oeqa/tinfoil: Improve test_wait_event for race issues (2017-07-08 13:34:46 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (6): kernel-yocto: propagate configuration errors to bbclass kernel-yocto/meta: smp configuration changes linux-yocto/4.1: update to v4.1.41 linux-yocto/4.4: update to v4.4.76 linux-yocto/4.9: update to v4.9.36 linux-yocto-dev: bump to 4.12+ meta/classes/kernel-yocto.bbclass | 3 ++- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb| 6 +++--- meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb| 6 +++--- meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb| 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 20 ++-- meta/recipes-kernel/linux/linux-yocto_4.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 20 ++-- meta/recipes-kernel/linux/linux-yocto_4.9.bb | 20 ++-- 14 files changed, 54 insertions(+), 53 deletions(-) -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] runqemu: check exit code of 'ls -t'
Used check_output instead of Popen as it raises CalledProcessError exception when command exits with non-zero exit code. Catched the exception to produce user-friendly output. [YOCTO #11719] Signed-off-by: Ed Bartosh--- scripts/runqemu | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index c33741d..d44afc7 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -676,7 +676,10 @@ class BaseConfig(object): else: cmd = 'ls -t %s/*.qemuboot.conf' % deploy_dir_image logger.info('Running %s...' % cmd) -qbs = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') +try: +qbs = subprocess.check_output(cmd, shell=True).decode('utf-8') +except subprocess.CalledProcessError as err: +raise RunQemuError(err) if qbs: for qb in qbs.split(): # Don't use initramfs when other choices unless fstype is ramfs -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] runqemu: reworked exception handling
Introduced custom RunQemuException that script raises on known errors. This exception is handled in one place and prints error output without printing Python traceback. This shoud make error output less scary for the end user. Handling of unknown errors has not been changed - both error and traceback will be printed. Reimplemented OEPathError exception code to handle it similarly to RunQemuException. Moved exception handling code into main() to keep it in one place. [YOCTO #11719] Signed-off-by: Ed Bartosh--- scripts/runqemu | 113 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 41b870c..c33741d 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -28,14 +28,18 @@ import shutil import glob import configparser -class OEPathError(Exception): +class RunQemuError(Exception): +"""Custom exception to raise on known errors.""" +pass + +class OEPathError(RunQemuError): """Custom Exception to give better guidance on missing binaries""" def __init__(self, message): -self.message = "In order for this script to dynamically infer paths\n \ +super().__init__("In order for this script to dynamically infer paths\n \ kernels or filesystem images, you either need bitbake in your PATH\n \ or to source oe-init-build-env before running this script.\n\n \ Dynamic path inference can be avoided by passing a *.qemuboot.conf to\n \ -runqemu, i.e. `runqemu /path/to/my-image-name.qemuboot.conf`\n\n %s" % message +runqemu, i.e. `runqemu /path/to/my-image-name.qemuboot.conf`\n\n %s" % message) def create_logger(): @@ -101,10 +105,10 @@ def check_tun(): """Check /dev/net/tun""" dev_tun = '/dev/net/tun' if not os.path.exists(dev_tun): -raise Exception("TUN control device %s is unavailable; you may need to enable TUN (e.g. sudo modprobe tun)" % dev_tun) +raise RunQemuError("TUN control device %s is unavailable; you may need to enable TUN (e.g. sudo modprobe tun)" % dev_tun) if not os.access(dev_tun, os.W_OK): -raise Exception("TUN control device %s is not writable, please fix (e.g. sudo chmod 666 %s)" % (dev_tun, dev_tun)) +raise RunQemuError("TUN control device %s is not writable, please fix (e.g. sudo chmod 666 %s)" % (dev_tun, dev_tun)) def check_libgl(qemu_bin): cmd = 'ldd %s' % qemu_bin @@ -137,7 +141,7 @@ def check_libgl(qemu_bin): logger.error("You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.") logger.error("Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev.") logger.error("Fedora package names are: mesa-libGL-devel mesa-libGLU-devel.") -raise Exception('%s requires libGLU, but not found' % qemu_bin) +raise RunQemuError('%s requires libGLU, but not found' % qemu_bin) def get_first_file(cmds): """Return first file found in wildcard cmds""" @@ -273,7 +277,7 @@ class BaseConfig(object): fst = 'cpio.gz' self.fstype = fst else: -raise Exception("Conflicting: FSTYPE %s and %s" % (self.fstype, fst)) +raise RunQemuError("Conflicting: FSTYPE %s and %s" % (self.fstype, fst)) def set_machine_deploy_dir(self, machine, deploy_dir_image): """Set MACHINE and DEPLOY_DIR_IMAGE""" @@ -329,7 +333,7 @@ class BaseConfig(object): else: logger.warn("%s doesn't exist" % qb) else: -raise Exception("Can't find FSTYPE from: %s" % p) +raise RunQemuError("Can't find FSTYPE from: %s" % p) elif os.path.isdir(p) or re.search(':', p) and re.search('/', p): if self.is_deploy_dir_image(p): @@ -341,16 +345,16 @@ class BaseConfig(object): elif os.path.basename(p).startswith('ovmf'): self.ovmf_bios.append(p) else: -raise Exception("Unknown path arg %s" % p) +raise RunQemuError("Unknown path arg %s" % p) def check_arg_machine(self, arg): """Check whether it is a machine""" if self.get('MACHINE') == arg: return elif self.get('MACHINE') and self.get('MACHINE') != arg: -raise Exception("Maybe conflicted MACHINE: %s vs %s" % (self.get('MACHINE'), arg)) +raise RunQemuError("Maybe conflicted MACHINE: %s vs %s" % (self.get('MACHINE'), arg)) elif re.search('/', arg): -raise Exception("Unknown arg: %s" % arg) +raise RunQemuError("Unknown arg: %s" % arg) logger.info('Assuming MACHINE = %s' % arg) @@ -381,7 +385,7 @@ class BaseConfig(object): if s: deploy_dir_image = s.group(1) else: -raise Exception("bitbake -e %s" % self.bitbake_e) +raise RunQemuError("bitbake -e %s" % self.bitbake_e)
[OE-core] [PATCH 0/2] runqemu: rework of exception handling
Hi, Reorganized exception handling code in a way that script raises RunQemuError for all known errors. runqemu will not produce tracebacks for known errors. It will only print error messages, which is hopefully more user friendly than current approach. Fixed 11719 - Unneeded stack trace is printed when ruunqemu fails The following changes since commit 05e28a9c3462c8987a44e534bc6d08d26b4c41fb: imagefutures: add test_image_fstypes test case (2017-07-10 14:14:37 +0300) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wip http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip Ed Bartosh (2): runqemu: reworked exception handling runqemu: check exit code of 'ls -t' scripts/runqemu | 118 1 file changed, 60 insertions(+), 58 deletions(-) -- Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-cross: Fix linker and fortran symlinks
On Tue, Jul 11, 2017 at 7:16 AM, Martin Jansawrote: > Shouldn't the symlink be created in ${D}${STAGING_DIR_NATIVE} as suggested > in: > http://lists.openembedded.org/pipermail/openembedded-core/2014-April/091480.html unrelated to this change but I agree, probably we can get by creating relative symlink in ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin > > On Tue, Jul 11, 2017 at 3:05 PM, Khem Raj wrote: >> >> If we used -fuse-ld gcc option, then it does not work >> ending in >> >> collect2: fatal error: cannot find 'ld' >> compilation terminated. >> >> This is because we are not creating proper symlinks for BFD >> and Gold linker in gcc installation >> >> Secondly, we end up with dangling fortran compiler symlinks >> if fortran is not enabled when confguring gcc, therefore >> create these symlinks only when fortran support is enabled >> in gcc >> >> Signed-off-by: Khem Raj >> --- >> meta/recipes-devtools/gcc/gcc-cross.inc | 10 ++ >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc >> b/meta/recipes-devtools/gcc/gcc-cross.inc >> index b08bc197ba..1e184a60db 100644 >> --- a/meta/recipes-devtools/gcc/gcc-cross.inc >> +++ b/meta/recipes-devtools/gcc/gcc-cross.inc >> @@ -161,17 +161,19 @@ do_install () { >> >> install -d ${D}${target_base_libdir} >> install -d ${D}${target_libdir} >> - >> + >> # Link gfortran to g77 to satisfy not-so-smart configure or hard >> coded g77 >> # gfortran is fully backwards compatible. This is a safe and >> practical solution. >> - ln -sf >> ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran >> ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true >> + if [ -n "${@d.getVar('FORTRAN')}" ]; then >> + ln -sf >> ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran >> ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true >> + fortsymlinks="g77 gfortran" >> + fi >> >> - >> # Insert symlinks into libexec so when tools without a prefix are >> searched for, the correct ones are >> # found. These need to be relative paths so they work in different >> locations. >> dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ >> install -d $dest >> - for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp >> gfortran; do >> + for t in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip >> gcc cpp $fortsymlinks; do >> ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t >> ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t >> ${dest}${TARGET_PREFIX}$t >> done >> -- >> 2.13.2 >> >> -- >> ___ >> 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] gcc-cross: Fix linker and fortran symlinks
Shouldn't the symlink be created in ${D}${STAGING_DIR_NATIVE} as suggested in: http://lists.openembedded.org/pipermail/openembedded-core/2014-April/091480.html On Tue, Jul 11, 2017 at 3:05 PM, Khem Rajwrote: > If we used -fuse-ld gcc option, then it does not work > ending in > > collect2: fatal error: cannot find 'ld' > > >compilation terminated. > > This is because we are not creating proper symlinks for BFD > and Gold linker in gcc installation > > Secondly, we end up with dangling fortran compiler symlinks > if fortran is not enabled when confguring gcc, therefore > create these symlinks only when fortran support is enabled > in gcc > > Signed-off-by: Khem Raj > --- > meta/recipes-devtools/gcc/gcc-cross.inc | 10 ++ > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc > b/meta/recipes-devtools/gcc/gcc-cross.inc > index b08bc197ba..1e184a60db 100644 > --- a/meta/recipes-devtools/gcc/gcc-cross.inc > +++ b/meta/recipes-devtools/gcc/gcc-cross.inc > @@ -161,17 +161,19 @@ do_install () { > > install -d ${D}${target_base_libdir} > install -d ${D}${target_libdir} > - > + > # Link gfortran to g77 to satisfy not-so-smart configure or hard > coded g77 > # gfortran is fully backwards compatible. This is a safe and > practical solution. > - ln -sf > ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran > ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true > + if [ -n "${@d.getVar('FORTRAN')}" ]; then > + ln -sf ${STAGING_DIR_NATIVE}${prefix_ > native}/bin/${TARGET_PREFIX}gfortran ${STAGING_DIR_NATIVE}${prefix_ > native}/bin/${TARGET_PREFIX}g77 || true > + fortsymlinks="g77 gfortran" > + fi > > - > # Insert symlinks into libexec so when tools without a prefix are > searched for, the correct ones are > # found. These need to be relative paths so they work in different > locations. > dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ > install -d $dest > - for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp > gfortran; do > + for t in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip > gcc cpp $fortsymlinks; do > ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t > ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t > ${dest}${TARGET_PREFIX}$t > done > -- > 2.13.2 > > -- > ___ > 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] [PATCH] gcc-cross: Fix linker and fortran symlinks
If we used -fuse-ld gcc option, then it does not work ending in collect2: fatal error: cannot find 'ld' compilation terminated. This is because we are not creating proper symlinks for BFD and Gold linker in gcc installation Secondly, we end up with dangling fortran compiler symlinks if fortran is not enabled when confguring gcc, therefore create these symlinks only when fortran support is enabled in gcc Signed-off-by: Khem Raj--- meta/recipes-devtools/gcc/gcc-cross.inc | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index b08bc197ba..1e184a60db 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -161,17 +161,19 @@ do_install () { install -d ${D}${target_base_libdir} install -d ${D}${target_libdir} - + # Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77 # gfortran is fully backwards compatible. This is a safe and practical solution. - ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true + if [ -n "${@d.getVar('FORTRAN')}" ]; then + ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true + fortsymlinks="g77 gfortran" + fi - # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are # found. These need to be relative paths so they work in different locations. dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ install -d $dest - for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do + for t in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip gcc cpp $fortsymlinks; do ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t done -- 2.13.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/2] initramfs-framwork: module to support boot live image
On Tue, Jul 11, 2017 at 2:36 AM, Ng, Wei Teewrote: > Yes, I had squash the changes into a single commit and corrected the typo > also. The changes is being submitted to the mailing list. > Thanks a lot! There are bad indents yet; please double check it all. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] libx11: fix build error
libx11 build fails with this error: fatal error: bits/long-double-64.h: No such file or directory | compilation terminated. This is due to the fact that "makekeys" should be compiled for the host since it is executed at build time to generate ks_tables.h. Since we have the X11 include files in the standard path of oe-core, we can remove the X11_CFLAGS from Makefile. Signed-off-by: Maxin B. John--- meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb index 71cbf67..50e8837 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb @@ -5,6 +5,9 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI += "file://disable_tests.patch \ " +do_configure_append () { +sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile +} SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] pkgconf: add recipe
Move pkgconf recipe to oe-core from meta-pkgconf: https://github.com/kergoth/meta-kergoth-wip/tree/master/meta-pkgconf Signed-off-by: Christopher LarsonSigned-off-by: Maxin B. John --- meta/files/common-licenses/pkgconf | 10 .../pkgconf/pkgconf/pkg-config-native.in | 6 +++ .../pkgconf/pkgconf/pkg-config-wrapper | 16 +++ meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb | 55 ++ 4 files changed, 87 insertions(+) create mode 100644 meta/files/common-licenses/pkgconf create mode 100644 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in create mode 100755 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper create mode 100644 meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb diff --git a/meta/files/common-licenses/pkgconf b/meta/files/common-licenses/pkgconf new file mode 100644 index 000..81a5221 --- /dev/null +++ b/meta/files/common-licenses/pkgconf @@ -0,0 +1,10 @@ +Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 +pkgconf authors (see AUTHORS file in source directory). + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +This software is provided 'as is' and without any warranty, express or +implied. In no event shall the authors be liable for any damages arising +from the use of this software. diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in new file mode 100644 index 000..9ed30a0 --- /dev/null +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in @@ -0,0 +1,6 @@ +#! /bin/sh + +PKG_CONFIG_PATH="@PATH_NATIVE@" +unset PKG_CONFIG_SYSROOT_DIR + +pkg-config "$@" diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper new file mode 100755 index 000..695f349 --- /dev/null +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper @@ -0,0 +1,16 @@ +#!/bin/sh +# pkgconf wrapper to deal with pkg-config/pkgconf compatibility issues +# +# Copyright (C) 2015 Christopher Larson +# License: MIT (see COPYING.MIT at the root of the repository for terms) + +for arg; do +case "$arg" in +--variable|--variable=*) +# pkg-config doesn't sysroot-prefix user variables +unset PKG_CONFIG_SYSROOT_DIR +;; +esac +done + +exec pkgconf "$@" diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb new file mode 100644 index 000..dd2a012 --- /dev/null +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb @@ -0,0 +1,55 @@ +SUMMARY = "pkgconf provides compiler and linker configuration for development frameworks." +DESCRIPTION = "pkgconf is a program which helps to configure compiler and linker \ +flags for development frameworks. It is similar to pkg-config from \ +freedesktop.org, providing additional functionality while also maintaining \ +compatibility." +HOMEPAGE = "http://pkgconf.org; +BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues; +SECTION = "devel" +PROVIDES += "pkgconfig" +RPROVIDES_${PN} += "pkgconfig" +DEFAULT_PREFERENCE = "-1" + +# The pkgconf license seems to be functionally equivalent to BSD-2-Clause or +# ISC, but has different wording, so needs its own name. +LICENSE = "pkgconf" +LIC_FILES_CHKSUM = "file://COPYING;md5=548a9d1db10cc0a84810c313a0e9266f" + +SRC_URI = "\ +https://distfiles.dereferenced.org/pkgconf/pkgconf-${PV}.tar.xz \ +file://pkg-config-wrapper \ +file://pkg-config-native.in \ +" +SRC_URI[md5sum] = "ac35c34d84eeb6a03d4d61b8555d6197" +SRC_URI[sha256sum] = "1be7e40900c7467893c65f810211b1e68da3f8d5e70fddb883fc24839cad0339" + +inherit autotools update-alternatives + +EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig'" + +do_install_append () { +# Install a wrapper which deals, as much as possible with pkgconf vs +# pkg-config compatibility issues. +install -m 0755 "${WORKDIR}/pkg-config-wrapper" "${D}${bindir}/pkg-config" +} + +do_install_append_class-native () { +# Install a pkg-config-native wrapper that will use the native sysroot instead +# of the MACHINE sysroot, for using pkg-config when building native tools. +sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ +< ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native +install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native +} + +ALTERNATIVE_${PN} = "pkg-config" + +# When using the RPM generated automatic package dependencies, some packages +# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by +# specifying an appropriate provide. +RPROVIDES_${PN} += "pkgconfig(pkg-config)" + +# Include pkg.m4 in the main
[OE-core] [PATCH 3/3] libxt: fix build failure
libxt build fails with this error: /home/maxin/poky/build/tmp/work/i586-poky-linux/libxt/1_1.1.5-r0/recipe-sysroot/usr/include/bits/long-double.h:57:33: fatal error: bits/long-double-64.h: No such file or directory | compilation terminated. | Makefile:408: recipe for target 'makestrs.o' failed Fix the makestrs build. Signed-off-by: Maxin B. John--- ...il-don-t-link-makestrs-with-target-cflags.patch | 33 ++ meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb | 4 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch diff --git a/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch b/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch new file mode 100644 index 000..1a691a3 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch @@ -0,0 +1,33 @@ +From b0c0e6d90bd99a699701c9542640adb218f5d536 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 10 Jul 2017 16:51:13 +0300 +Subject: [PATCH] libXt: util: don't link makestrs with target cflags + +The line: AM_CFLAGS = $(XT_CFLAGS) +in util/Makefile.am is wrong because it adds target cflags to the +compilation of makestrs, which is built for the build machine, which +leads to build failures when cross-compiling. + +Upstream-Status: Pending + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Maxin B. John +--- + util/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/util/Makefile.am b/util/Makefile.am +index 800b35b..f2dd1f9 100644 +--- a/util/Makefile.am b/util/Makefile.am +@@ -11,7 +11,6 @@ EXTRA_DIST = \ + StrDefs.ht \ + string.list + +-AM_CFLAGS = $(XT_CFLAGS) + makestrs_SOURCES = makestrs.c + + +-- +2.4.0 + diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb index c1ed0bb..180d00d 100644 --- a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb +++ b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb @@ -23,7 +23,9 @@ PE = "1" XORG_PN = "libXt" -SRC_URI += "file://libxt_fix_for_x32.patch" +SRC_URI += "file://libxt_fix_for_x32.patch \ + file://0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch \ +" BBCLASSEXTEND = "native" -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] pkgconf: consider pkgconf as a replacement for pkg-config
pkgconf is a better replacement for pkg-config. Fedora 26 replaces the system pkg-config implementation with pkgconf because it "provides better support for handling .pc files and a stable library ABI/API for integrating into applications." and is actively maintained, unlike pkg-config. pkgconf aims to offer many improvements over pkg-config such as faster/more efficient dependency resolver which "allows for the user to more conservatively link their binaries -- which may be helpful in some environments, such as when prelink(1) is being used. pkgconf also aims to provide a more complete implementation of pkg-config. The features most likely to benefit the Yocto Project build system are the faster/more efficient dependency resolution and linker flag optimisation. To test this, after applying these patches, update "local.conf" as below: PREFERRED_PROVIDER_pkgconfig = "pkgconf" PREFERRED_PROVIDER_pkgconfig-native = "pkgconf-native" PREFERRED_PROVIDER_nativesdk-pkgconfig = "nativesdk-pkgconf" Links: 1. http://pkgconf.org 2. https://fedoraproject.org/wiki/Changes/pkgconf_as_system_pkg-config_implementation 3. https://bugzilla.yoctoproject.org/show_bug.cgi?id=11308 Maxin B. John (3): pkgconf: add recipe libx11: fix build error libxt: fix build failure meta/files/common-licenses/pkgconf | 10 .../pkgconf/pkgconf/pkg-config-native.in | 6 +++ .../pkgconf/pkgconf/pkg-config-wrapper | 16 +++ meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb | 55 ++ meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb | 3 ++ ...il-don-t-link-makestrs-with-target-cflags.patch | 33 + meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb | 4 +- 7 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 meta/files/common-licenses/pkgconf create mode 100644 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in create mode 100755 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper create mode 100644 meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] valgrind: Update 3.12.0 -> 3.13.0
On 11 July 2017 at 12:42, Martin Jansawrote: > I guess it's gold again, https://gcc.gnu.org/ml/ > gcc-patches/2014-05/msg01860.html > I just replicated this and yes your failure is gold specific. The upgrade failure is unrelated. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3] vulkan-demos: Add recipe
Sascha Willems collection of Vulkan demos is useful as a smoke testing tool. * Add patch to install binaries and data. * Add patch to fix build on X86 * Use a combination of patch and do_install_append to avoid some 3D models with unclear licensing. Signed-off-by: Jussi Kukkonen--- Changes since v2: * Add a fake UPSTREAM_CHECK_GITTAGREGEX to silence the relevant oe-selftest: The tags in upstream git are not releases. Changes since v1: * Add patch to fix build on x86 ...ild-demos-with-questionably-licensed-data.patch | 91 ++ .../vulkan-demos/0001-Fix-build-on-x86.patch | 41 ++ ...stalling-demos-support-out-of-tree-builds.patch | 85 meta/recipes-graphics/vulkan/vulkan-demos_git.bb | 36 + 4 files changed, 253 insertions(+) create mode 100644 meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch create mode 100644 meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch create mode 100644 meta/recipes-graphics/vulkan/vulkan-demos/0001-Support-installing-demos-support-out-of-tree-builds.patch create mode 100644 meta/recipes-graphics/vulkan/vulkan-demos_git.bb diff --git a/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch new file mode 100644 index 000..d32c8f2 --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch @@ -0,0 +1,91 @@ +From 55770fb07c42fe410cf8d09f8f5976babc89b9ef Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Tue, 4 Jul 2017 17:13:45 +0300 +Subject: [PATCH] Don't build demos with questionably licensed data + +Some of the models don't have open source compatible licenses: +don't build demos using those. Also don't build demos that need +resources that are not included. + +ssao: +scenerendering: + Sibenik model, no license found + +deferred: +deferredmultisampling: +deferredshadows: + armor model, CC-BY-3.0 + +vulkanscene: +imgui: +shadowmapping: + vulkanscene model, no license found + +indirectdraw: + plant model, no license found + +hdr: +pbribl: +pbrtexture: + Require external Vulkan Asset Pack + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Jussi Kukkonen +--- + CMakeLists.txt | 13 - + 1 file changed, 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4958fff..0f9d3e4 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -150,17 +150,11 @@ set(EXAMPLES + computeparticles + computeshader + debugmarker +- deferred +- deferredmultisampling +- deferredshadows + displacement + distancefieldfonts + dynamicuniformbuffer + gears + geometryshader +- hdr +- imgui +- indirectdraw + instancing + mesh + multisampling +@@ -170,20 +164,14 @@ set(EXAMPLES + parallaxmapping + particlefire + pbrbasic +- pbribl +- pbrtexture + pipelines + pushconstants + radialblur + raytracing +- scenerendering + screenshot +- shadowmapping +- shadowmappingomni + skeletalanimation + specializationconstants + sphericalenvmapping +- ssao + subpasses + terraintessellation + tessellation +@@ -196,7 +184,6 @@ set(EXAMPLES + texturesparseresidency + triangle + viewportarray +- vulkanscene + ) + + buildExamples() +-- +2.13.2 + diff --git a/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch new file mode 100644 index 000..681b342 --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch @@ -0,0 +1,41 @@ +From b0495efb6c3ea3a530fcbaddac86da57ecce5a66 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Mon, 10 Jul 2017 13:11:12 +0300 +Subject: [PATCH] Fix build on x86 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| func_common.inl:193:51: error: wrong number of template arguments +| (5, should be 6) struct compute_sign + +The fix is backported from the upstream glm project. + +Upstream-Status: Pending [https://github.com/SaschaWillems/Vulkan/issues/356] +Signed-off-by: Jussi Kukkonen +--- + external/glm/glm/detail/func_common.inl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/external/glm/glm/detail/func_common.inl b/external/glm/glm/detail/func_common.inl +index cafaed5..2dd94e1 100644 +--- a/external/glm/glm/detail/func_common.inl
[OE-core] [PATCH 1/1] acpitests: Remove as unmaintained
This recipe was last upgraded about ~30 releases or three years ago, it seems to only be touched when something breaks. It also has an 'interesting' license that maybe is open source... Signed-off-by: Jussi Kukkonen--- .../acpica/acpitests/aapits-linux.patch| 336 - .../acpica/acpitests/aapits-makefile.patch | 34 --- meta/recipes-extended/acpica/acpitests_20140828.bb | 36 --- 3 files changed, 406 deletions(-) delete mode 100644 meta/recipes-extended/acpica/acpitests/aapits-linux.patch delete mode 100644 meta/recipes-extended/acpica/acpitests/aapits-makefile.patch delete mode 100644 meta/recipes-extended/acpica/acpitests_20140828.bb diff --git a/meta/recipes-extended/acpica/acpitests/aapits-linux.patch b/meta/recipes-extended/acpica/acpitests/aapits-linux.patch deleted file mode 100644 index 5601046..000 --- a/meta/recipes-extended/acpica/acpitests/aapits-linux.patch +++ /dev/null @@ -1,336 +0,0 @@ -From: Al Stone -Date: Mon, 7 Apr 2014 19:09:37 + -Subject: [PATCH 1/2] Fixup aapits build - -From http://git.linaro.org/people/al.stone/acpica-tools.git -Upstream-Status: Pending - -diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapits/tests/aapits/atexec.c acpica-unix2-20130626/tests/aapits/atexec.c2013-01-17 12:48:28.0 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atexec.c 2013-07-25 13:44:23.023894441 -0600 -@@ -639,6 +639,7 @@ - } - - -+#if ACPI_MACHINE_WIDTH == 32 - /*** - * - * FUNCTION:AtBuildLocalRSDT -@@ -757,8 +758,9 @@ - LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum; - } - } -+#endif - - - /*** - * - * FUNCTION:AtBuildLocalXSDT -@@ -1424,7 +1426,7 @@ - ACPI_WARNING ((AE_INFO, - "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n", - (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address, --ByteWidth, (UINT32) BufferAddress, Length)); -+ByteWidth, (UINT32) BufferAddress, (UINT32) Length)); - - return (AE_AML_REGION_LIMIT); - } -@@ -1792,7 +1796,9 @@ - Path, Obj.Integer.Value, Value); - #else - printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", --Path, Obj.Integer.Value, Value); -+Path, -+ (long long unsigned int) Obj.Integer.Value, -+ (long long unsigned int) Value); - #endif - Status = AE_ERROR; - } -@@ -1871,7 +1877,7 @@ - { - TestErrors++; - printf ("Test Error: cannot allocate buffer of %d bytes\n", --Results.Length); -+(int) Results.Length); - return (AE_NO_MEMORY); - } - Results.Pointer = Object; -@@ -1952,7 +1956,8 @@ - { - printf ("AtCheckBuffer: unexpected length %d of Buffer vs" - " calculated %d bytes\n", --Results.Length, ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length)); -+(int)Results.Length, -+ (int)(ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length))); - } - - /* Initialize the return buffer structure */ -@@ -1961,7 +1968,7 @@ - { - TestErrors++; - printf ("Test Error: cannot allocate buffer of %d bytes\n", --Results.Length); -+(int) Results.Length); - return (AE_NO_MEMORY); - } - Results.Pointer = Object; -diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapits/tests/aapits/atinit.c acpica-unix2-20130626/tests/aapits/atinit.c2013-01-17 12:48:28.0 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atinit.c 2013-07-25 13:20:19.706705960 -0600 -@@ -3024,7 +3024,7 @@ - AapiErrors++; - printf ("API Error: AcpiGetSystemInfo() returned" - " Length %d, expected %d\n", --OutBuffer.Length, sizeof (Info)); -+(int) OutBuffer.Length, (int) sizeof (Info)); - return (AE_ERROR); - } - -@@ -3046,7 +3046,7 @@ - AapiErrors++; - printf ("API Error: AcpiGetSystemInfo() returned" - " Length %d, expected %d\n", --OutBuffer.Length, sizeof (Info)); -+(int) OutBuffer.Length, (int) sizeof (Info)); - return (AE_ERROR); - } - -@@ -3066,7 +3066,7 @@ - AapiErrors++; - printf ("API Error: AcpiGetSystemInfo() returned" - " Length %d, expected %d\n", --OutBuffer.Length, sizeof (Info)); -+(int) OutBuffer.Length, (int) sizeof (Info)); - return (AE_ERROR); - } - else if (OutBuffer.Pointer != ) -@@ -3149,7 +3149,7 @@ -
[OE-core] [PATCH 0/1] acpitests: Remove as unmaintained
Without meta-oe in bblayers this recipe warns: do_populate_lic: acpitests: No generic license file exists for: Intel in any provider The license may actually be open source, hard to tell -- but the "Intel" license that's in meta-oe is definitely not the correct one. The recipe also seems unloved and untested... currently it seems to be a test suite for a release we haven't shipped in a long time. I'm sending a removal patch in the hopes of maybe finding an interested maintainer who would fix the license issue and maybe upgrade the recipe (it's a two-birds-one-stone situation since the new versions seem to be BSD-licensed). CCing people from git log. Cheers, Jussi The following changes since commit 854c8c2e4c24ea3ddfec6e5b5f6477f0620510e4: oeqa/tinfoil: Improve test_wait_event for race issues (2017-07-08 13:34:46 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib jku/acpitests http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/acpitests Jussi Kukkonen (1): acpitests: Remove as unmaintained .../acpica/acpitests/aapits-linux.patch| 336 - .../acpica/acpitests/aapits-makefile.patch | 34 --- meta/recipes-extended/acpica/acpitests_20140828.bb | 36 --- 3 files changed, 406 deletions(-) delete mode 100644 meta/recipes-extended/acpica/acpitests/aapits-linux.patch delete mode 100644 meta/recipes-extended/acpica/acpitests/aapits-makefile.patch delete mode 100644 meta/recipes-extended/acpica/acpitests_20140828.bb -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] valgrind: Update 3.12.0 -> 3.13.0
I guess it's gold again, https://gcc.gnu.org/ml/gcc-patches/2014-05/msg01860.html On Tue, Jul 11, 2017 at 12:11 PM, Burton, Rosswrote: > > On 11 July 2017 at 11:12, Martin Jansa wrote: > >> ptest was broken for all architectures even before 3.13.0 upgrade, wasn't >> it? >> > > Works for me, and the autobuilder, before the upgrade. Curious what the > difference is. > > Ross > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dhcp: fix genetle shutdown not work while bind9 compile with --enable-threads
On 11 July 2017 at 09:13, Hongxu Jiawrote: > +Upstream-Status: Inappropriate [OE specific] > This is not OE specific. We enable a specific build combination, and it breaks. Have you reported this upstream? Should we disable gentle shutdown as it's clearly not being tested that much? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] valgrind: Update 3.12.0 -> 3.13.0
On 11 July 2017 at 11:12, Martin Jansawrote: > ptest was broken for all architectures even before 3.13.0 upgrade, wasn't > it? > Works for me, and the autobuilder, before the upgrade. Curious what the difference is. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] valgrind: Update 3.12.0 -> 3.13.0
On Tue, Jul 11, 2017 at 09:43:24AM +0100, Burton, Ross wrote: > On 9 July 2017 at 08:35, Soren Brinkmannwrote: > > > Signed-off-by: Soren Brinkmann > > --- > > v3: > > - rebased onto latest master branch > > v2: > > - no change > > > > Fails to build on PPC if ptest is enabled: > http://errors.yoctoproject.org/Errors/Details/147237/ ptest was broken for all architectures even before 3.13.0 upgrade, wasn't it? http://lists.openembedded.org/pipermail/openembedded-core/2017-July/139357.html http://www.openembedded.org/wiki/Bitbake_World_Status_Rocko shows it's broken since 2017-06-16 -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] update distro_alias to include unmap packages on other distro
Hi Shen Joon, The commit message doesn't match the expected format of "primary item changed: short summary Long description" as documented at: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines If in doubt about how to describe the primary item changed git log is invaluable, in this case we can see from a `git log meta/conf/distro/include/distro_alias.inc` that commit messages for changes to this file use "distro_alias.inc:" to describe the file. On Tue, 2017-07-11 at 09:30 +0800, Tan Shen Joon wrote: > From: Shen Joon TanYou should update your git config to use a real email address. Thanks, Joshua > Added packages with different names or based on sources that > generates multiple binaries eg: python-pycurl source generates > python3-pycurl as well. Currently, some of these packages are not > displayed as part of other distro due to naming differences on > the source rather than the binaries as a single source could > produce multiple binaries with different names. > > Signed-off-by: Shen Joon Tan > --- > meta/conf/distro/include/distro_alias.inc | 7 +++ > 1 file changed, 7 insertions(+) > > diff --git a/meta/conf/distro/include/distro_alias.inc > b/meta/conf/distro/include/distro_alias.inc > index ba47f90..f7c8b4a 100644 > --- a/meta/conf/distro/include/distro_alias.inc > +++ b/meta/conf/distro/include/distro_alias.inc > @@ -62,6 +62,7 @@ DISTRO_PN_ALIAS_pn-core-image-testmaster = "OE- > Core" > DISTRO_PN_ALIAS_pn-core-image-testmaster-initramfs = "OE-Core" > DISTRO_PN_ALIAS_pn-core-image-weston = "OE-Core" > DISTRO_PN_ALIAS_pn-core-image-x11 = "OE-Core" > +DISTRO_PN_ALIAS_pn-createrepo-c = "Fedora=createrepo_c > Clear=createrepo_c" > DISTRO_PN_ALIAS_pn-cross-localedef = "OSPDT" > DISTRO_PN_ALIAS_pn-cryptodev-linux = "OE-Core" > DISTRO_PN_ALIAS_pn-cryptodev-module = "OE-Core" > @@ -128,6 +129,7 @@ DISTRO_PN_ALIAS_pn-gstreamer1.0-plugins-bad = > "Debian=gstreamer1.0-plugins-bad U > DISTRO_PN_ALIAS_pn-gstreamer1.0-plugins-base = "Debian=gstreamer1.0- > plugins-base Ubuntu=gstreamer1.0-plugins-base" > DISTRO_PN_ALIAS_pn-gstreamer1.0-plugins-good = "Debian=gstreamer1.0- > plugins-good Ubuntu=gstreamer1.0-plugins-bad" > DISTRO_PN_ALIAS_pn-gstreamer1.0-rtsp-server = "Ubuntu=gstreamer0.10- > rtsp Fedora=gstreamer-rtsp" > +DISTRO_PN_ALIAS_pn-gstreamer1.0-vaapi = "Fedora=gstreamer1-vaapi > Debian=gstreamer-vaapi Clear=gstreamer-vaapi" > DISTRO_PN_ALIAS_pn-gtk+ = "Meego=gtk2 Fedora=gtk2 OpenSuSE=gtk2 > Ubuntu=gtk+2.0 Mandriva=gtk+2.0 Debian=gtk+2.0" > DISTRO_PN_ALIAS_pn-gtk+3 = "Ubuntu=gtk+3.0 Debian=gtk+3.0 > Fedora=gtk3" > DISTRO_PN_ALIAS_pn-gtk-doc = "Fedora=gtk-doc Ubuntu=gtk-doc" > @@ -193,6 +195,7 @@ DISTRO_PN_ALIAS_pn-libomxil = "OSPDT upstream=htt > p://omxil.sourceforge.net/" > DISTRO_PN_ALIAS_pn-libowl = "Debian=owl OpenedHand" > DISTRO_PN_ALIAS_pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam > Ubuntu=pam Mandriva=pam Debian=pam" > DISTRO_PN_ALIAS_pn-libpcre = "Mandriva=libpcre0 Fedora=pcre" > +DISTRO_PN_ALIAS_pn-libpcre2 = "Fedora=pcre2 Debian=pcre2 > Clear=pcre2" > DISTRO_PN_ALIAS_pn-libpng12 = "Debian=libpng12-0 Fedora=libpng" > DISTRO_PN_ALIAS_pn-libpod-plainer-perl = "OSPDT" > DISTRO_PN_ALIAS_pn-libsamplerate0 = "Meego=libsamplerate > Fedora=libsamplerate OpenSuSE=libsamplerate Ubuntu=libsamplerate > Mandriva=libsamplerate Debian=libsamplerate" > @@ -207,6 +210,7 @@ DISTRO_PN_ALIAS_pn-libusb1 = "Debian=libusb-1.0-0 > Fedora=libusb1" > DISTRO_PN_ALIAS_pn-libusb-compat = "OSPDT" > DISTRO_PN_ALIAS_pn-libx11 = "Debian=libx11-6 Fedora=libX11 > Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11" > DISTRO_PN_ALIAS_pn-libxcalibrate = "OSPDT upstream=http://cgit.freed > esktop.org/xorg/lib/libXCalibrate/" > +DISTRO_PN_ALIAS_pn-libxfont2 = "Fedora=libXfont2 Clear=libXfont2" > DISTRO_PN_ALIAS_pn-libxft = "Mandriva=libxft Debian=libxft2 > Ubuntu=libxft2" > DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi" > DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon > Debian=libxkbcommon" > @@ -323,7 +327,10 @@ DISTRO_PN_ALIAS_pn-pulseaudio-client-conf-sato = > "OE-Core" > DISTRO_PN_ALIAS_pn-puzzles = "Debian=sgt-puzzles Fedora=puzzles" > DISTRO_PN_ALIAS_pn-python3 = "Fedora=python3 Debian=python3.2" > DISTRO_PN_ALIAS_pn-python3-distribute = "Debian=python3-setuptools > Fedora=python3-setuptools" > +DISTRO_PN_ALIAS_pn-python3-iniparse = "Fedora=python-iniparse > Debian=python-iniparse" > DISTRO_PN_ALIAS_pn-python3-pip = "OpenSuSE=python3-pip > Debian=python3-pip" > +DISTRO_PN_ALIAS_pn-python3-pycurl = "Fedora=python-pycurl > Debian=pycurl" > +DISTRO_PN_ALIAS_pn-python3-pygpgme = "Fedora=python-pygpgme > Debian=pygpgme" > DISTRO_PN_ALIAS_pn-python3-setuptools = "OpenSuSE=python3-setuptools > Debian=python3-setuptools" > DISTRO_PN_ALIAS_pn-python-dbus = "Ubuntu=python-dbus Debian=python- > dbus Mandriva=python-dbus" > DISTRO_PN_ALIAS_pn-python-distribute = "Opensuse=python-setuptools >
Re: [OE-core] [PATCH v2 2/2] mesa: Upgrade to 17.1.4 release
On 3 July 2017 at 23:02, Otavio Salvadorwrote: > This includes following upstream bug fixes: > > Bug 77240 - khrplatform.h not installed if EGL is disabled > Saying this here as well for visibility: This conflicts with userland from meta-raspberrypi because both mesa-gl and userland now have khrplatform.h Since mesa-gl provides no GLES or EGL, it shouldn't really need to ship khrplatform.h. Jussi > Bug 95530 - Stellaris - colored overlay of sectors doesn't render on i965 > Bug 96958 - [SKL] Improper rendering in Europa Universalis IV > Bug 99467 - [radv] DOOM 2016 + wine. Green screen everywhere (but can be > started) > Bug 101071 - compiling glsl fails with undefined reference to > `pthread_create' > Bug 101252 - eglGetDisplay() is not thread safe > Bug 101294 - radeonsi minecraft forge splash freeze since 17.1 > Bug 101451 - [G33] ES2-CTS.functional.clipping.polygon regression > > Signed-off-by: Otavio Salvador > --- > > Changes in v2: None > > meta/recipes-graphics/mesa/{mesa-gl_17.1.3.bb => mesa-gl_17.1.4.bb} | 0 > meta/recipes-graphics/mesa/{mesa_17.1.3.bb => mesa_17.1.4.bb} | 4 > ++-- > 2 files changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-graphics/mesa/{mesa-gl_17.1.3.bb => mesa-gl_17.1.4.bb} > (100%) > rename meta/recipes-graphics/mesa/{mesa_17.1.3.bb => mesa_17.1.4.bb} > (84%) > > diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb > b/meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb > similarity index 100% > rename from meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb > rename to meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb > diff --git a/meta/recipes-graphics/mesa/mesa_17.1.3.bb > b/meta/recipes-graphics/mesa/mesa_17.1.4.bb > similarity index 84% > rename from meta/recipes-graphics/mesa/mesa_17.1.3.bb > rename to meta/recipes-graphics/mesa/mesa_17.1.4.bb > index d9860213f2..2a1ecd3124 100644 > --- a/meta/recipes-graphics/mesa/mesa_17.1.3.bb > +++ b/meta/recipes-graphics/mesa/mesa_17.1.4.bb > @@ -7,8 +7,8 @@ SRC_URI = "https://mesa.freedesktop.org/ > archive/mesa-${PV}.tar.xz \ > file://0002-hardware-gloat.patch \ > " > > -SRC_URI[md5sum] = "1946a93d543bc219427e2bebe2ac4752" > -SRC_URI[sha256sum] = "5f1ee9a8aea2880f887884df2dea0c > 16dd1b13eb42fd2e52265db0dc1b380e8c" > +SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5" > +SRC_URI[sha256sum] = "06f3b0e6a28f0d20b7f3391cf67fe8 > 9ae98ecd0a686cd545da76557b6cec9cad" > > #because we cannot rely on the fact that all apps will use pkgconfig, > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER > -- > 2.13.2 > > -- > ___ > 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