[yocto] building python3-posix-ipc on pyro
I successfully built python3-posix-ipc_1.0.0 on morty several times without error. When I tried to build it on pyro, using the exact same bb file and source I get warnings which lead to incorrect behavior. (Cross-compile for ARM.) I know this recipe is not part of OE-Core, but I'm wondering if anyone has tried to build it anyway or seen a similar problem. This is my .bb file (loosely based on the recipe in meta-openstack, which is for python2): DESCRIPTION = "POSIX IPC primitives (semaphores, shared memory and message queues) for Python" HOMEPAGE = "http://semanchuk.com/philip/posix_ipc/"; SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=d92bb5439aee694c0a87bfb51579e37b" PR = "r0" PYPI_PACKAGE = "posix_ipc" SRC_URI[md5sum] = "85607a392087715ac3a3c7ded2492d06" SRC_URI[sha256sum] = "9c93070374ca672725575e5c9874930c8cde69367fb90378b2255e048e31efcb" inherit pypi setuptools3 # RDEPENDS_default: RDEPENDS_${PN} += " \ " -- The head of the log.compile file on morty is: DEBUG: Executing shell function do_compile running build running build_ext building 'posix_ipc' extension creating build creating build/temp.linux-x86_64-3.5 -- While the head of log.do_compile on pyro looks like this: DEBUG: Executing shell function do_compile ** * Setup can't determine if it needs to link to the realtime libraries on your * system, so it will default to 'no' which may not be correct. * * Please report this message and your operating system info to the package * maintainer listed in the README file. ** ** * Setup can't determine the value of PAGE_SIZE on your system, so it will * default to 4096 which may not be correct. * * Please report this message and your operating system info to the package * maintainer listed in the README file. ** running build running build_ext building 'posix_ipc' extension creating build creating build/temp.linux-x86_64-3.5 -- Now the output on pyro totally makes sense when I look at setup.py (which uses probe.py) because the probe function is trying to compile a test file to see if librt is required or not. It's not surprising it fails, since I'm building for ARM. I can go in and patch the probe function so it returns Yes to indicate librt is required, but my question why no error when building for morty and what might have changed? As I said, the .bb file and the source package are identical in both cases. -Bill -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] setting up autobuilder on local machine
On Sun, Dec 18, 2016 at 8:25 AM, Paul Barker wrote: > On Sun, 18 Dec 2016 15:46:19 +0100 > Mirza Krak wrote: > >> Hi. >> >> I have been looking in to the possibility to utilize yocto autobuilder >> for one of my own projects. >> >> But I am having some problems setting this up and hopefully someone >> here can provide some pointers. >> >> I did the "quickstart part": >> >> git clone git://git.yoctoproject.org/yocto-autobuilder >> cd yocto-autobuilder >> . ./yocto-autobuilder-setup >> yocto-start-autobuilder both >> >> Above succeeds without any issues. But now what? :) >> >> I went to https://localhost:8010. I tried to login using the >> information that is in the .htpasswd file but that did not work. Where >> are the credentials to login setup? > > You'll need to create the .htpasswd file yourself. I think the > "htpasswd" tool can do this for you, I can't remember the exact > commands I used to make mine though sorry. > >> >> I also made an attempt to remove all un-wanted buildsets and now >> buildset-config contains (all other directories are removed) >> >> nightly-mender-rpi.conf yoctoAB.conf >> >> Above is parsed correctly on start-up but build is never triggered. I >> probably removed to much :). Looking in to nigthly.conf it seem that >> is the one that trigger all other nightly builds? >> >> My fork can be found at [1]. >> >> [1]. https://github.com/mirzak/yocto-autobuilder-mender-rpi > > This looks good, you just need to setup the scheduler with something > like this in nightly-mender-rpi.conf: > > scheduler: > [{'nightly-build':{'type':'Nightly','hour':23,'minute':0}}] > > You should only need a separate nightly.conf when you want that to > trigger multiple builds. > > I've recently setup an autobuilder for meta-raspberrypi which I'll be > publishing once I've got the last bits of setup done. If you're still > struggling to get the nightly triggering working let me know and I'll > put up the configurations I've used as a git repository. There is also additional helpful information on the Yocto Autobuilder wiki page here: https://wiki.yoctoproject.org/wiki/The_Yocto_Autobuilder. Some of the information applies to the Yocto Project build cluster, but is still applicable to local autobuilders. I followed the same instructions to setup a local AB. Be sure to use the htpasswd command that's in the autobuilder git tree (in one of the bin directories, as I recall), rather than a native system one. The AB version defaults to the shorter crypto scheme that buildbot requires. -Bill -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Buildbot / Autobuilder / custom?
Yes, the 2 TB is for everything you might do with an AutoBuilder. The actual space used will be closer to your 35 GB, since you're building only a single image / work product. People have used BuilBot directly for automated builds, but using the AutoBuilder code (which runs BuildBot underneath) gives you added flexibility and capability without much additional overhead. -Bill On Mon, Nov 14, 2016 at 8:13 AM, Alain Achkar wrote: > Thanks for your answers! From reading these links, it is still not clear to > me if this might be overkill for my requirements. AB Cluster Setup talks > about "the worker requires 2+ TB to hold all the build temp files and git > repos. If build artifacts and a local sstate mirror are included, additional > worker space is required." > > Currently, my build only takes 35GB, so I think what these links are talking > about is how to replicate what the Autobuilder project > https://autobuilder.yoctoproject.org/ already does. > > To clarify, I am not interested in running builds and tests for everything > that Yocto already builds and tests (i.e. all the processor architectures, > all the machine types, etc.). I am interested in running one build for one > machine type (the Variscite DART-6UL i.MX6UL arm-based processor, for which > NXP/Freescale and Variscite have provided recipes and layers for). > > I know that autobuilder includes BuildBot (this is why I specified it in > parentheses) but my question remains: do I only install BuildBot and try to > build my machine type with it, or do I install Autobuilder? > > On Mon, Nov 14, 2016 at 10:10 AM, Bill Randle wrote: >> >> Also, be sure to check the Yocto Project wiki pages: >> https://wiki.yoctoproject.org/wiki/The_Yocto_Autobuilder >> in particular, the AB cluster setup and AB maintenance links. Even >> though the one link refers to setting up an entire cluster, I've used >> that procedure to setup a single autobuilder, as well. >> >> -Bill >> >> On Fri, Nov 11, 2016 at 10:37 AM, Beth 'pidge' Flanagan >> wrote: >> > On Fri, 2016-11-11 at 12:35 -0500, Alain Achkar wrote: >> >> Hello Joshua! >> >> >> >> We are using Yocto to build for the Variscite DART-6UL SoM which is >> >> based on Freescale/NXP i.MX6UL (http://variwiki.com/index.php?title=D >> >> ART-6UL_Yocto_Jethro_R1_build). >> >> >> >> Currently, developers run builds manually on their desktops. We are >> >> considering using a continuous integration server. I found out that >> >> The Yocto Project uses Autobuilder which in turn uses BuildBot. I >> >> read most of the introductory documentation. >> >> >> >> Would you recommend that we install only BuildBot and configure it to >> >> build what we need? >> >> >> >> OR >> >> >> >> Would you recommend that we install Autobuilder (and BuildBot) and >> >> configure it to build what we need? >> > >> > Actually, the yocto-autobuilder already contains buildbot so no need >> > for both. >> > >> > If you read: >> > >> > http://git.yoctoproject.org/cgit.cgi/yocto-autobuilder/tree/README-QUIC >> > KSTART >> > >> > and probably some of the other READMEs and the documentation in the >> > docs directory of the yocto-autobuilder directory, it should get you >> > started in the right direction. >> > >> > Feel free to ask questions if you need help. >> > >> > -b >> > >> > Elizabeth 'pidge' Flanagan >> > Founder/CTO Togán Labs >> > www.toganlabs.com >> > >> >> >> >> What is the faster path to get up and running? >> >> >> >> Thanks! >> >> Alain. >> >> >> >> -- >> >> Alain Achkar, M.Eng. | Software Engineer >> >> Triacta Power Solutions >> >> (O) 613.256.2868 (C) 613.406.6520 >> >> www.triacta.com >> > >> > >> > >> > -- >> > ___ >> > yocto mailing list >> > yocto@yoctoproject.org >> > https://lists.yoctoproject.org/listinfo/yocto > > > > > -- > > Alain Achkar, M.Eng. | Software Engineer > > Triacta Power Solutions > > (O) 613.256.2868 (C) 613.406.6520 > > www.triacta.com -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Buildbot / Autobuilder / custom?
Also, be sure to check the Yocto Project wiki pages: https://wiki.yoctoproject.org/wiki/The_Yocto_Autobuilder in particular, the AB cluster setup and AB maintenance links. Even though the one link refers to setting up an entire cluster, I've used that procedure to setup a single autobuilder, as well. -Bill On Fri, Nov 11, 2016 at 10:37 AM, Beth 'pidge' Flanagan wrote: > On Fri, 2016-11-11 at 12:35 -0500, Alain Achkar wrote: >> Hello Joshua! >> >> We are using Yocto to build for the Variscite DART-6UL SoM which is >> based on Freescale/NXP i.MX6UL (http://variwiki.com/index.php?title=D >> ART-6UL_Yocto_Jethro_R1_build). >> >> Currently, developers run builds manually on their desktops. We are >> considering using a continuous integration server. I found out that >> The Yocto Project uses Autobuilder which in turn uses BuildBot. I >> read most of the introductory documentation. >> >> Would you recommend that we install only BuildBot and configure it to >> build what we need? >> >> OR >> >> Would you recommend that we install Autobuilder (and BuildBot) and >> configure it to build what we need? > > Actually, the yocto-autobuilder already contains buildbot so no need > for both. > > If you read: > > http://git.yoctoproject.org/cgit.cgi/yocto-autobuilder/tree/README-QUIC > KSTART > > and probably some of the other READMEs and the documentation in the > docs directory of the yocto-autobuilder directory, it should get you > started in the right direction. > > Feel free to ask questions if you need help. > > -b > > Elizabeth 'pidge' Flanagan > Founder/CTO Togán Labs > www.toganlabs.com > >> >> What is the faster path to get up and running? >> >> Thanks! >> Alain. >> >> -- >> Alain Achkar, M.Eng. | Software Engineer >> Triacta Power Solutions >> (O) 613.256.2868 (C) 613.406.6520 >> www.triacta.com > > > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [yocto-autobuilder][PATCH] PublishArtifacts.py: deal only with built toolchains, cp also md5 and manifests
Hi Robert, Then "normal" method to send patches is via direct insertion into the email, rather than an attachment (see git-send-email). Also, it is missing a commit comment as the first text in the patch file. Otherwise, it looks good to me now. -Bill 2016-10-09 23:44 GMT-07:00 : > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Y-AB PublishArtifacts toolchain wrong dir
On Sun, Oct 9, 2016 at 6:28 AM, wrote: > Hi, > > On 2016-10-08 18:17, Bill Randle wrote: >> >> Hi, >> >> I think I would leave the toolchain artifact as is, but just surround >> the the 'cp' with an 'if' statement. E.g.,: >> if [ -e ]; then >> cp ; >> fi; >> if [ -e ]; then >> cp ; >> fi; >> > > This sounds like a brilliant idea. It looks like now I have the behaviour of > the good old Y-AB plus md5sums and friends and being copied over. > What do you think about this patch? [1] Much better. Now just move the mkdir into the same if block as the copy like this (no point in checking the same thing twice): +command=command+"if [ -e " + os.path.join(deploy_image_dir, "poky-*i686-core-image*.sh ") + " ]; then " + \ +"mkdir -p " + os.path.join(DEST, X86TC_PUBLISH_DIR) + "; " + \ +"cp -R --no-dereference --preserve=links " + \ +os.path.join(deploy_image_dir, "poky-*i686-core-image* ") + \ +os.path.join(DEST, X86TC_PUBLISH_DIR) + pipeline + "; fi;" and the same for the x86_64 case, of course. Then submit to the mailing list in the standard format (look at other patch submissions for examples) Also, include "[yocto-autobuilder]" and file you are patching in the Subject line [1] and Cc: joshua.g.l...@intel.com and pi...@toganlabs.com. Also, add a commit message in the body of the email. -Bill [1] E.g., Subject: [yocto-autobuilder][PATCH] PublishArtifacts.py: deal only with built toolchains, cp also md5 and manifests > > [1] > https://github.com/RobertBerger/autobuilder-patches/blob/master/before-install/0004-deal-only-with-built-toolchains-cp-also-md5-and-mani.patch > > Regards, > > Robert -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Y-AB PublishArtifacts toolchain wrong dir
Hi, I think I would leave the toolchain artifact as is, but just surround the the 'cp' with an 'if' statement. E.g.,: if [ -e ]; then cp ; fi; if [ -e ]; then cp ; fi; -Bill On Sat, Oct 8, 2016 at 2:52 PM, wrote: > Hi, > > On 2016-10-08 09:28, Bill Randle wrote: >> >> >> All the "standard" build configs produce both x86 and x86_64 >> toolchains - which makes sense, since it's not known what build host >> the user is using and the AB needs to show both are buildable. In your >> case, you know you have an x86_64 machine and don't want to bother >> building for x86, so, it's seems like the thing to do is check for the >> existence of a build package (x86 or x86_64) before attempting the >> copy. >> > > That's what I thought as well at first. So I introduced new toolchain > artifacts like toolchain_x86_64 and toolchain_i686 where I did only the > relevant thing in the relevant branch. > It did not solve my problem. > > Regards, > > Robert -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Y-AB PublishArtifacts toolchain wrong dir
On Fri, Oct 7, 2016 at 11:27 PM, wrote: > Hi, > > On 2016-10-07 22:05, Bill Randle wrote: >> >> Hi Robert, >> >> I see a couple of problems with this proposed patch. First, it's not >> clear the existing code is broken. > > > Here[1] is a paste of the error. > > cp: cannot stat > '/tmp/yocto-autobuilder/yocto-autobuilder/yocto-worker/res-custom-morty-multi-v7-core-image-minimal-dev-sato-sdk-toolchain/build/build/tmp/deploy/sdk/poky-*i686-core-image*.sh': > No such file or directory > > That's[2] the .conf file which I used. > > Note that I'm not building a i686 toolchain, but only the 64 bit version. All the "standard" build configs produce both x86 and x86_64 toolchains - which makes sense, since it's not known what build host the user is using and the AB needs to show both are buildable. In your case, you know you have an x86_64 machine and don't want to bother building for x86, so, it's seems like the thing to do is check for the existence of a build package (x86 or x86_64) before attempting the copy. > [1] http://pastebin.com/aLyer2fi > [2] > https://github.com/RobertBerger/meta-mainline/blob/morty-training-v4.4.x/multi-v7-ml/yocto-autobuilder/res-custom-morty-multi-v7-core-image-minimal-dev-sato-sdk-toolchain.conf > > Regards, > > Robert -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Y-AB PublishArtifacts toolchain wrong dir
Hi Robert, I see a couple of problems with this proposed patch. First, it's not clear the existing code is broken. It calls getDeployNames() which should detect the build artifact is "toolchain" and return a deploy path of "deploy/sdk". If that is not working correctly, then that's the code that should be fixed. Second, your patch dropped the "+ pipeline" from the command chain, which is used to set an error flag in the event the copy failed. Third, you also dropped the portion of the command chain that calculates the md5sums of the toolchain files. (The fact that it appears, on the surface, that the md5sum files do not get copied over would be a bug - although it seems like I tested that at one time and it was working.) -Bill On Fri, Oct 7, 2016 at 8:44 AM, wrote: > Hi, > > I use the latest and greatest yocto autobuilder: > f9b4e02730a5e712ee9085e2480f9a3b8b00f56d > > It looks like Publishing Artifacts tries to find the toolchain instead of > build/build/tmp/deploy/sdk (where it is built) here > build/build/tmp/deploy/images/toolchain-x86_64 > > This patch [1] fixes the problem for me. > > Regards, > > Robert > > https://github.com/RobertBerger/autobuilder-patches/blob/master/before-install/0004-PublichArtifacts-searches-toolchain-in-wrong-place.patch > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [[yocto-autobuilder][PATCHv4]] ] Build sets to test new OS distribution in autobuilder
This version appears to ignore Beth's comments from yesterday where she said buildset-config.autobuilder-qa wasn't really the appropriate directory and suggested a different name, plus she said all buildable configs should be present or links to them. If the later is true, then not only should the patch use a different directory, but it should also populate that new directory with links to the other build config files referenced in this file. -Bill On Fri, Oct 7, 2016 at 1:50 PM, Aníbal Limón wrote: > From: Monserrat Sedeno > > As part of the process to set new OS distribution as supported on Yoctoc > Project > a new patch was created with the list of build sets that should be executed. > > Detailed information: > https://wiki.yoctoproject.org/wiki/Distro_Testing_Plan#Execute_Build_Sets > > Fixes [YOCTO #9905] > > Note:In order to add a new distro as supported all the build sets should be > PASS > > Signed-off-by: Monserrat Sedeno > Signed-off-by: Aníbal Limón > --- > .../nightly-qa-distro.conf | 55 > ++ > 1 file changed, 55 insertions(+) > create mode 100644 buildset-config.autobuilder-qa/nightly-qa-distro.conf > > diff --git a/buildset-config.autobuilder-qa/nightly-qa-distro.conf > b/buildset-config.autobuilder-qa/nightly-qa-distro.conf > new file mode 100644 > index 000..def4118 > --- /dev/null > +++ b/buildset-config.autobuilder-qa/nightly-qa-distro.conf > @@ -0,0 +1,55 @@ > +[nightly-qa-distro] > +builders: 'example-worker' > +repos: [{'poky': > +{'repourl':'git://git.yoctoproject.org/poky', > + 'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', > 'yocto':'meta-yocto', 'poky':'meta-poky'}, > + 'branch':'master'}}, > +{'oecore': > +{'repourl':'git://git.openembedded.org/openembedded-core', > + 'layerversion':'core', > + 'checkout':False, > + 'branch':'master'}}, > +{'bitbake': > +{'repourl':'git://git.openembedded.org/bitbake', > + 'checkout':False, > + 'branch':'master'}}, > +{'eclipse-poky-neon': > +{'repourl':'git://git.yoctoproject.org/eclipse-poky', > + 'checkout':False, > + 'branch':'neon-master'}}, > +{'meta-qt4': > +{'repourl':'git://git.yoctoproject.org/meta-qt4', > + 'branch':'master'}}, > +{'meta-qt3': > +{'repourl':'git://git.yoctoproject.org/meta-qt3', > + 'branch':'master'}}] > +props: [{'fp_date':{'prop_type':'StringParameter', > + 'size': 20, > + 'name': 'fp_date', > + 'label':'Full Pass date:'}}] > +steps: [{'SetDest':{}}, > +{'CheckOutLayers': {}}, > +{'RunPreamble': {}}, > +{'TriggerBuilds': {'schedulerName': 'dist-build', > + 'waitForFinish': 'True', > + 'schedulerNames': { > + 'nightly-oe-selftest': {}, > + 'nightly-oecore': {}, > + 'nightly-deb': {}, > + 'nightly-ipk': {}, > + 'nightly-world': {}, > + 'nightly-arm': {}, > + 'nightly-multilib': {}, > + 'nightly-x86-64-lsb': {}, > + 'nightly-x86': {}, > + 'nightly-x32': {}, > + 'poky-tiny': {}, > + 'nightly-qa-systemd': {}, > + 'nightly-qa-extras': {}, > + 'nightly-qa-targetbuilds': {}, > + 'nightly-qa-skeleton': {}, > + 'nightly-qa-logrotate': {}, > + 'nightly-qa-pam': {}, > + 'buildtools': {}}, > + 'eclipse-plugin-neon': {}, > + 'schedulerNames_nowait': {}}},] > -- > 2.1.4 > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [[yocto-autobuilder][PATCHv2]] Build sets to test new OS distribution in autobuilder
On Wed, Oct 5, 2016 at 1:47 PM, Aníbal Limón wrote: > > > On 10/05/2016 03:41 PM, Bill Randle wrote: >> I also wonder if this actually belongs in >> buildset-config.autobuilder-qa (which doesn't have any other configs), >> or in buildset-config.controller where all the others reside. > > I don't know what was the original target for the autobuilder-qa > buildset but the new distro-qa buildset won't run in regular basis and > also is part of the QA process. Make sense to me to put inside that folder. > That's ok with me. Just asking the question. > alimon > >> >> -Bill >> >> On Wed, Oct 5, 2016 at 1:00 PM, Aníbal Limón >> wrote: >>> Oh, I didn't notice that this patch isn't applied to ab master branch. >>> >>> Monse, could you send a new patch over master? >>> >>> Cheers, >>> alimon >>> >>> On 10/05/2016 09:59 AM, Aníbal Limón wrote: >>>> >>>> >>>> On 09/30/2016 03:29 PM, Monserrat Sedeno wrote: >>>>> As part of the process to set new OS distribution as supported on Yoctoc >>>>> Project >>>>> a new patch was created with the list of build sets that should be >>>>> executed. >>>>> >>>>> Detailed information: >>>>> https://wiki.yoctoproject.org/wiki/Distro_Testing_Plan#Execute_Build_Sets >>>>> >>>>> Fixes [YOCTO #9905] >>>>> >>>>> Note:In order to add a new distro as supported all the build sets should >>>>> be PASS >>>>> >>>>> Signed-off-by: Monserrat Sedeno >>>> Acked-by: Aníbal Limón >>>>> --- >>>>> buildset-config.autobuilder-qa/nightly-qa-distro.conf | 4 ++-- >>>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/buildset-config.autobuilder-qa/nightly-qa-distro.conf >>>>> b/buildset-config.autobuilder-qa/nightly-qa-distro.conf >>>>> index 0fcdbef..6c02a91 100644 >>>>> --- a/buildset-config.autobuilder-qa/nightly-qa-distro.conf >>>>> +++ b/buildset-config.autobuilder-qa/nightly-qa-distro.conf >>>>> @@ -25,7 +25,6 @@ steps: [{'SetDest':{}}, >>>>> 'nightly-deb': {}, >>>>> 'nightly-ipk': {}, >>>>> 'nightly-world': {}, >>>>> -'buildtools': {}, >>>>> 'nightly-arm': {}, >>>>> 'nightly-mips': {}, >>>>> 'nightly-wic':{}, >>>>> @@ -37,8 +36,9 @@ steps: [{'SetDest':{}}, >>>>> 'nightly-qa-systemd': {}, >>>>> 'nightly-qa-extras': {}, >>>>> 'nightly-qa-targetbuilds': {}, >>>>> -'nightly-qa-skeleton': {}}, >>>>> +'nightly-qa-skeleton': {}, >>>>> 'nightly-qa-logrotate': {}, >>>>> 'nightly-qa-pam': {}, >>>>> +'buildtools': {}}, >>>>> 'schedulerNames_nowait': {}}},] >>>>> >>>>> >>>> >>>> >>>> >>> >>> >>> -- >>> ___ >>> yocto mailing list >>> yocto@yoctoproject.org >>> https://lists.yoctoproject.org/listinfo/yocto >>> > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [[yocto-autobuilder][PATCHv2]] Build sets to test new OS distribution in autobuilder
I also wonder if this actually belongs in buildset-config.autobuilder-qa (which doesn't have any other configs), or in buildset-config.controller where all the others reside. -Bill On Wed, Oct 5, 2016 at 1:00 PM, Aníbal Limón wrote: > Oh, I didn't notice that this patch isn't applied to ab master branch. > > Monse, could you send a new patch over master? > > Cheers, > alimon > > On 10/05/2016 09:59 AM, Aníbal Limón wrote: >> >> >> On 09/30/2016 03:29 PM, Monserrat Sedeno wrote: >>> As part of the process to set new OS distribution as supported on Yoctoc >>> Project >>> a new patch was created with the list of build sets that should be executed. >>> >>> Detailed information: >>> https://wiki.yoctoproject.org/wiki/Distro_Testing_Plan#Execute_Build_Sets >>> >>> Fixes [YOCTO #9905] >>> >>> Note:In order to add a new distro as supported all the build sets should be >>> PASS >>> >>> Signed-off-by: Monserrat Sedeno >> Acked-by: Aníbal Limón >>> --- >>> buildset-config.autobuilder-qa/nightly-qa-distro.conf | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/buildset-config.autobuilder-qa/nightly-qa-distro.conf >>> b/buildset-config.autobuilder-qa/nightly-qa-distro.conf >>> index 0fcdbef..6c02a91 100644 >>> --- a/buildset-config.autobuilder-qa/nightly-qa-distro.conf >>> +++ b/buildset-config.autobuilder-qa/nightly-qa-distro.conf >>> @@ -25,7 +25,6 @@ steps: [{'SetDest':{}}, >>> 'nightly-deb': {}, >>> 'nightly-ipk': {}, >>> 'nightly-world': {}, >>> -'buildtools': {}, >>> 'nightly-arm': {}, >>> 'nightly-mips': {}, >>> 'nightly-wic':{}, >>> @@ -37,8 +36,9 @@ steps: [{'SetDest':{}}, >>> 'nightly-qa-systemd': {}, >>> 'nightly-qa-extras': {}, >>> 'nightly-qa-targetbuilds': {}, >>> -'nightly-qa-skeleton': {}}, >>> +'nightly-qa-skeleton': {}, >>> 'nightly-qa-logrotate': {}, >>> 'nightly-qa-pam': {}, >>> +'buildtools': {}}, >>> 'schedulerNames_nowait': {}}},] >>> >>> >> >> >> > > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [yocto-autobuilder][PATCH] /buildset-config.controller/eclipse-plugin-*
Also, buildset-config.controller/nightly.conf needs to be edited and the rule for luna removed. -Bill On Fri, Sep 16, 2016 at 5:07 AM, Joshua Lock wrote: > On Thu, 2016-09-15 at 22:08 -0700, Graydon, Tracy wrote: >> We are no longer supporting kepler or luna. Remove the build set for >> those and >> remove luna from yoctoAB.conf. > > Pushed to master, thanks! > >> >> Signed-off-by: Graydon, Tracy >> --- >> buildset-config.controller/eclipse-plugin-kepler.conf | 10 --- >> --- >> buildset-config.controller/eclipse-plugin-luna.conf | 11 --- >> >> buildset-config.controller/yoctoAB.conf | 1 - >> 3 files changed, 22 deletions(-) >> delete mode 100644 buildset-config.controller/eclipse-plugin- >> kepler.conf >> delete mode 100644 buildset-config.controller/eclipse-plugin- >> luna.conf >> >> diff --git a/buildset-config.controller/eclipse-plugin-kepler.conf >> b/buildset-config.controller/eclipse-plugin-kepler.conf >> deleted file mode 100644 >> index 9948852..000 >> --- a/buildset-config.controller/eclipse-plugin-kepler.conf >> +++ /dev/null >> @@ -1,10 +0,0 @@ >> -[eclipse-plugin-kepler] >> -builders: 'example-worker' >> -repos: [{'eclipse-poky-kepler': >> -{'repourl':'git://git.yoctoproject.org/eclipse-poky', >> - 'branch':'kepler-master'}}] >> -steps: [{'SetDest':{}}, >> -{'CheckOutLayers': {}}, >> -{'BuildEclipsePlugin': {'eclipsedir': 'eclipse-poky- >> kepler'}}, >> -{'PublishLayerTarballs':{}}, >> -{'PublishArtifacts': {'artifacts': ['eclipse-plugin- >> kepler']}}] >> diff --git a/buildset-config.controller/eclipse-plugin-luna.conf >> b/buildset-config.controller/eclipse-plugin-luna.conf >> deleted file mode 100644 >> index d745af3..000 >> --- a/buildset-config.controller/eclipse-plugin-luna.conf >> +++ /dev/null >> @@ -1,11 +0,0 @@ >> -[eclipse-plugin-luna] >> -builders: 'example-worker' >> -repos: [{'eclipse-poky-luna': >> -{'repourl':'git://git.yoctoproject.org/eclipse-poky', >> - 'branch':'luna-master' }}] >> -steps: [{'SetDest':{}}, >> -{'CheckOutLayers': {}}, >> -{'BuildEclipsePlugin': {'eclipsedir': 'eclipse-poky-luna'}}, >> -{'PublishLayerTarballs':{}}, >> -{'PublishArtifacts': {'artifacts': ['eclipse-plugin- >> luna']}}] >> - >> diff --git a/buildset-config.controller/yoctoAB.conf b/buildset- >> config.controller/yoctoAB.conf >> index fe9750b..309a5ab 100644 >> --- a/buildset-config.controller/yoctoAB.conf >> +++ b/buildset-config.controller/yoctoAB.conf >> @@ -1,6 +1,5 @@ >> [BuildSets] >> order: ['nightly', 'eclipse-plugin-neon', 'eclipse-plugin-mars', >> -'eclipse-plugin-luna', >> 'nightly-arm', 'nightly-arm64', 'nightly-arm-lsb', >> 'nightly-mips', 'nightly-mips64', 'nightly-mips-lsb', >> 'nightly-ppc', 'nightly-ppc-lsb', 'nightly-no-x11', >> -- >> 2.7.0 >> > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH v4][yocto-autobuilder] RunOeSelftest.py: changed to new oe-selftest syntax
On Sep 2, 2016 8:17 AM, "Humberto Ibarra" wrote: > > oe-selftest is changing syntax with YOCTO #8938. This patch checks the correct syntax version and uses the right command to avoid breaking oe-seltest autobuilder. > > [YOCTO #8938] > > Signed-off-by: Humberto Ibarra Acked-by: Bill Randle > --- > .../autobuilder/buildsteps/RunOeSelftest.py | 16 ++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py > index 84d32fe..18629f0 100644 > --- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py > +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py > @@ -33,9 +33,21 @@ class RunOeSelftest(ShellCommand): > self.command += ". ./oe-init-build-env; " > self.command += "checkvnc; " > if self.tests == None: > -self.command += "if [ -d ../meta-selftest ]; then export DISPLAY=:1; oe-selftest --run-all-tests; else echo 'Skipping step - no meta-selftest layer here'; fi" > +oe_selftest_cmd = ("run","--run-all-tests") > else: > -self.command += "if [ -d ../meta-selftest ]; then export DISPLAY=:1; oe-selftest " + self.tests + "; else echo 'Skipping step - no meta-selftest layer here'; fi" > +oe_selftest_cmd = ("run --tests %s" % self.tests, "--run-tests %s" % self.tests) > +self.command += """ \ > +if [ -d ../meta-selftest ]; then \ > +export DISPLAY=:1; \ > +VERSION=$(oe-selftest --version 2> /dev/null | cut -d' ' -f2); \ > +if [ \"$VERSION\" == '2.0' ]; then \ > +oe-selftest %s; \ > +else \ > +oe-selftest %s; \ > +fi; \ > +else \ > +echo 'Skipping step - no meta-selftest layer here'; > +fi""" % oe_selftest_cmd > ShellCommand.start(self) > > def _createOESelftestErrorReport(self, log): > -- > 2.4.11 > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH v3][yocto-autobuilder] RunOeSelftest.py: changed to new oe-selftest syntax
Humberto, The master branch of yocto-autobuilder has changed since you did this diff. I would suggest you rebase and resubmit this particular patch. -Bill On Thu, Sep 1, 2016 at 12:39 PM, Humberto Ibarra < humberto.ibarra.lo...@intel.com> wrote: > oe-selftest is changing syntax with YOCTO #8938. This patch checks the > correct syntax version and uses the right command to avoid breaking > oe-seltest autobuilder. Should be integrated together with the syntax > changing patch. > > [YOCTO #8938] > > Signed-off-by: Humberto Ibarra > --- > .../autobuilder/buildsteps/RunOeSelftest.py | 16 > ++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git > a/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py > b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py > index 809bcc3..ce0c0f6 100644 > --- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py > +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py > @@ -34,9 +34,21 @@ class RunOeSelftest(ShellCommand): > self.command += "netstat -an | grep -q 5901 ;" > self.command += "if [ $? -ne 0 ]; then echo 'Starting a VNC > server on :1'; vncserver :1; else echo 'Will use a VNC server already > running on :1'; fi;" > if self.tests == None: > -self.command += "if [ -d ../meta-selftest ]; then export > DISPLAY=:1; oe-selftest --run-all-tests; else echo 'Skipping step - no > meta-selftest layer here'; fi" > +oe_selftest_cmd = ('run', '--run-all-tests') > else: > -self.command += "if [ -d ../meta-selftest ]; then export > DISPLAY=:1; oe-selftest " + self.tests + "; else echo 'Skipping step - no > meta-selftest layer here'; fi" > +oe_selftest_cmd = ("run --tests %s" % self.tests, > "--run-tests %s" % self.tests) > +self.command += """ \ > +if [ -d ../meta-selftest ]; then \ > +export DISPLAY=:1; \ > +VERSION=$(oe-selftest --version 2> /dev/null | cut -d' ' -f2); \ > +if [ \"$VERSION\" == '2.0' ]; then \ > +oe-selftest %s; \ > +else \ > +oe-selftest %s; \ > +fi; \ > +else \ > +echo 'Skipping step - no meta-selftest layer here'; > +fi""" % oe_selftest_cmd > ShellCommand.start(self) > > def _createOESelftestErrorReport(self, log): > -- > 2.4.11 > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH][yocto-autobuilder] nightly-qa-systemd.conf: Add create_eventlog property
On Aug 30, 2016 8:46 AM, "Aníbal Limón" wrote: > > This buildset also needs the create_eventlog property for only > enable the toaster event log creation when required. See rev [1]. > > [1] 0b083509beaf7421f1dde4b679a934741ac4a3bc > > Signed-off-by: Aníbal Limón Acked-by: Bill Randle > --- > buildset-config.controller/nightly-qa-systemd.conf | 4 > 1 file changed, 4 insertions(+) > > diff --git a/buildset-config.controller/nightly-qa-systemd.conf b/buildset-config.controller/nightly-qa-systemd.conf > index f95021dc..662caa6 100644 > --- a/buildset-config.controller/nightly-qa-systemd.conf > +++ b/buildset-config.controller/nightly-qa-systemd.conf > @@ -4,6 +4,10 @@ repos: [{'poky': > {'repourl':'git://git.yoctoproject.org/poky', > 'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'}, > 'branch':'master'}}] > +props: [{'create_eventlog':{'prop_type':'ChoiceStringParameter', > + 'choices': ['False', 'True'], > + 'name': 'create_eventlog', > + 'label':'Create Toaster event log as part of image creation?:'}}] > steps: [{'SetDest':{}}, > {'CheckOutLayers': {}}, > {'RunPreamble': {}}, > -- > 2.1.4 > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] nightly-wic.conf: add additional config settings for efi images
Building efi disk images now requires extra config settings, so add IMAGE_FSTYPES and MACHINE_FEATURES appends to the auto.conf file. Signed-off-by: Bill Randle --- buildset-config.controller/nightly-wic.conf | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-config.controller/nightly-wic.conf index 1b91852..14e2411 100644 --- a/buildset-config.controller/nightly-wic.conf +++ b/buildset-config.controller/nightly-wic.conf @@ -9,24 +9,24 @@ steps: [{'SetDest':{}}, {'RunPreamble':{}}, {'GetDistroVersion':{'distro': 'poky'}}, {'CreateBBLayersConf':{'buildprovider':'yocto'}}, -{'CreateAutoConf':{'machine':'qemux86'}}, +{'CreateAutoConf':{'machine':'qemux86', 'atextappend':'\nIMAGE_FSTYPES += " hddimg"\nMACHINE_FEATURES_append = " efi"\n'}}, {'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, {'BuildImages':{'images':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}, -{'CreateAutoConf':{'machine':'genericx86'}}, +{'CreateAutoConf':{'machine':'genericx86', 'atextappend':'\nIMAGE_FSTYPES += " hddimg"\nMACHINE_FEATURES_append = " efi"\n'}}, {'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, {'BuildImages':{'images':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}, -{'CreateAutoConf':{'machine':'qemux86-64'}}, +{'CreateAutoConf':{'machine':'qemux86-64', 'atextappend':'\nIMAGE_FSTYPES += " hddimg"\nMACHINE_FEATURES_append = " efi"\n'}}, {'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, {'BuildImages':{'images':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, -{'CreateAutoConf':{'machine':'genericx86-64'}}, +{'CreateAutoConf':{'machine':'genericx86-64', 'atextappend':'\nIMAGE_FSTYPES += " hddimg"\nMACHINE_FEATURES_append = " efi"\n'}}, {'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, {'BuildImages':{'images':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] nightly-multilib.conf: add mips64/32 build and test
To provide additional testing of multilib configs, build and test a mips64/n32 image. [YOCTO #8083] Signed-off-by: Bill Randle --- buildset-config.controller/nightly-multilib.conf | 8 1 file changed, 8 insertions(+) diff --git a/buildset-config.controller/nightly-multilib.conf b/buildset-config.controller/nightly-multilib.conf index 9dce758..2c842f5 100644 --- a/buildset-config.controller/nightly-multilib.conf +++ b/buildset-config.controller/nightly-multilib.conf @@ -37,5 +37,13 @@ steps: [{'SetDest':{}}, 'buildhistory' : False, 'multilib': 'lib64', 'distro': 'poky'}}, {'BuildImages': {'images': 'lib64-core-image-sato lib64-core-image-sato-sdk'}}, +{'CreateAutoConf': {'machine': 'qemumips64', 'SDKMACHINE' : 'x86_64', +'buildhistory' : False, +'distro': 'poky', +'atextappend' : '\nrequire conf/multilib.conf\nMULTILIBS = "multilib:lib64 multilib:lib32"\nDEFAULTTUNE = "mips64-n32"\nDEFAULTTUNE_virtclass-multilib-lib64 = "mips64"\nDEFAULTTUNE_virtclass-multilib-lib32 = "mips32r2"\n'}}, +{'BuildImages': {'images': 'core-image-minimal'}}, +{'RunSanityTests': {'images': 'core-image-minimal'}}, +{'BuildImages': {'images': '-c populate_sdk core-image-minimal'}}, +{'RunSDKSanityTests': {'images': 'core-image-minimal'}}, {'DownloadErrorReports': {}}, {'SendErrorReport': {}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] nightly-musl.conf: run sanity tests on images
Run the sanity tests on the musl images. Signed-off-by: Bill Randle --- buildset-config.controller/nightly-musl.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/buildset-config.controller/nightly-musl.conf b/buildset-config.controller/nightly-musl.conf index cc2aea0..d8913b1 100644 --- a/buildset-config.controller/nightly-musl.conf +++ b/buildset-config.controller/nightly-musl.conf @@ -13,6 +13,7 @@ steps: [{'SetDest':{}}, 'atextappend' : '\nTCLIBC="musl"\n' }}, {'CreateBBLayersConf': {'buildprovider' : 'yocto'}}, {'BuildImages': {'images': 'core-image-minimal core-image-full-cmdline core-image-sato world'}}, +{'RunSanityTests': {'images': 'core-image-minimal core-image-full-cmdline core-image-sato'}}, {'DownloadErrorReports': {}}, {'SendErrorReport': {}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] nightly-wic.conf: publish qemux86; add missing error reporting steps
Commit 623665a11e added support for building a qemux86 image, but the step to actually publish it did not get included. Also, nightly-wic.conf was missed when the other config files were updated to include the DownloadErrorReports and SendErrorReport steps. Signed-off-by: Bill Randle --- buildset-config.controller/nightly-wic.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-config.controller/nightly-wic.conf index 59ea34c..1b91852 100644 --- a/buildset-config.controller/nightly-wic.conf +++ b/buildset-config.controller/nightly-wic.conf @@ -32,5 +32,7 @@ steps: [{'SetDest':{}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}, -{'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86', 'genericx86-64']}}] +{'DownloadErrorReports': {}}, +{'SendErrorReport': {}}, +{'PublishArtifacts': {'artifacts': ['qemux86', 'qemux86-64', 'genericx86', 'genericx86-64']}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] nightly-no-x11.conf: build and test some actual images
Create sample images and perform a sanity test on them. [YOCTO #7568] Signed-off-by: Bill Randle --- buildset-config.controller/nightly-no-x11.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildset-config.controller/nightly-no-x11.conf b/buildset-config.controller/nightly-no-x11.conf index 063ae89..7092a09 100644 --- a/buildset-config.controller/nightly-no-x11.conf +++ b/buildset-config.controller/nightly-no-x11.conf @@ -18,7 +18,8 @@ steps: [{'SetDest':{}}, {'CreateBBLayersConf': {'buildprovider' : 'yocto'}}, {'SyncPersistDB' : {'distro' : 'poky'}}, {'GetBitbakeVersion': {}}, -{'BuildImages': {'images': 'world'}}, +{'BuildImages': {'images': 'core-image-full-cmdline core-image-weston world'}}, +{'RunSanityTests': {'images': 'core-image-full-cmdline core-image-weston'}}, {'DownloadErrorReports': {}}, {'SendErrorReport': {}}, {'UploadToasterEventlog': {}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH v2] PublishArtifacts.py: fix filecheck to work under dash (or other POSIX shell)
An earlier patch (ed3857990) to check for existing msd5sum files worked fine when tested under bash, but failed with an error message about [[ not found when run under dash. Updated the test to not rely on bashisms. Signed-off-by: Bill Randle --- V2: use POSIX shell expansion for simplified test (thanks Joshua) lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py index d8b554f..e738521 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py @@ -260,7 +260,7 @@ class PublishArtifacts(ShellCommand): cmd = "" if os.environ.get('GEN_IMG_MD5') == "True": cmd += "for x in `find " + deploy_dir + " -maxdepth 5 -type f`;" -cmd += "do if [[ $x != *.md5sum ]]; then md5sum $x >> " + "$x.md5sum; fi; done;" +cmd += "do if [ ${x##*.} != md5sum ]; then md5sum $x >> " + "$x.md5sum; fi; done;" return cmd def getDeployNames(self, artifact, buildername): -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] PublishArtifacts.py: fix file check to work under dash
An earlier patch (ed3857990) to check for existing msd5sum files worked fine when tested under bash, but failed with an error message about [[ not found when run under dash. Updated the test to not rely on bashisms. Signed-off-by: Bill Randle --- lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py index d8b554f..58048f0 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py @@ -259,8 +259,9 @@ class PublishArtifacts(ShellCommand): def generateMD5cmd(self, artifact, deploy_dir): cmd = "" if os.environ.get('GEN_IMG_MD5') == "True": +# crufty test for existing md5sum file required for dash shell cmd += "for x in `find " + deploy_dir + " -maxdepth 5 -type f`;" -cmd += "do if [[ $x != *.md5sum ]]; then md5sum $x >> " + "$x.md5sum; fi; done;" +cmd += "do echo ${x} | grep -q '\.md5sum'; if [ $? -ne 0 ]; then md5sum $x >> " + "$x.md5sum; fi; done;" return cmd def getDeployNames(self, artifact, buildername): -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] add support for building the eclipse-poky-neon plugin
Add configs to build the eclipse poky neon plugin and drop support for the kepler branch. Also, generate md5sums for the eclipse plugin artifacts. (Note: building neon requires java 1.8.0.) [YOCTO #9940] Signed-off-by: Bill Randle --- buildset-config.controller/nightly.conf | 6 +- buildset-config.controller/eclipse-plugin-neon.conf | 11 +++ buildset-config.controller/yoctoAB.conf | 4 ++-- .../site-packages/autobuilder/buildsteps/PublishArtifacts.py | 11 --- 4 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 buildset-config.controller/eclipse-plugin-neon.conf diff --git a/buildset-config.controller/nightly.conf b/buildset-config.controller/nightly.conf index c16c147..0f9dd4e 100644 --- a/buildset-config.controller/nightly.conf +++ b/buildset-config.controller/nightly.conf @@ -23,14 +23,14 @@ {'repourl':'git://git.yoctoproject.org/eclipse-poky', 'checkout':False, 'branch':'luna-master'}}, -{'eclipse-poky-kepler': -{'repourl':'git://git.yoctoproject.org/eclipse-poky', - 'checkout':False, - 'branch':'kepler-master'}}, {'eclipse-poky-mars': {'repourl':'git://git.yoctoproject.org/eclipse-poky', 'checkout':False, 'branch':'mars-master'}}, +{'eclipse-poky-neon': +{'repourl':'git://git.yoctoproject.org/eclipse-poky', + 'checkout':False, + 'branch':'neon-master'}}, {'meta-qt4': {'repourl':'git://git.yoctoproject.org/meta-qt4', 'branch':'master'}}, @@ -103,7 +103,7 @@ 'nightly-mips64': {}, 'nightly-arm64': {}, 'nightly-rpm-non-rpm': {}, 'nightly-deb-non-deb': {}}, 'schedulerNames_nowait' : {'nightly-uclibc':{}, 'build-appliance': {}, - 'eclipse-plugin-kepler': {}, 'eclipse-plugin-mars': {}, + 'eclipse-plugin-neon': {}, 'eclipse-plugin-mars': {}, 'eclipse-plugin-luna': {}, 'nightly-non-gpl3': {}, 'nightly-oecore': {}, 'nightly-world':{},'nightly-wic':{}, 'nightly-world-lsb':{}, 'nightly-intel-gpl': {}, diff --git a/buildset-config.controller/yoctoAB.conf b/buildset-config.controller/yoctoAB.conf index 0f9ba0c..fe9750b 100644 --- a/buildset-config.controller/yoctoAB.conf +++ b/buildset-config.controller/yoctoAB.conf @@ -1,6 +1,6 @@ [BuildSets] -order: ['nightly', 'eclipse-plugin-mars', -'eclipse-plugin-kepler', 'eclipse-plugin-luna', +order: ['nightly', 'eclipse-plugin-neon', 'eclipse-plugin-mars', +'eclipse-plugin-luna', 'nightly-arm', 'nightly-arm64', 'nightly-arm-lsb', 'nightly-mips', 'nightly-mips64', 'nightly-mips-lsb', 'nightly-ppc', 'nightly-ppc-lsb', 'nightly-no-x11', diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py index 1a938fc..d8b554f 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py @@ -96,10 +96,15 @@ class PublishArtifacts(ShellCommand): command=command+"mv " + adt_dev_dest + "/rootfs/qemux86-64 " + adt_dev_dest + "/rootfs/qemux86_64;" elif "eclipse-plugin" in artifact: artifact_base = artifact.replace("eclipse-plugin-", "") +deploy_dir = os.path.join(os.path.join(self.workerdir, buildername), "build/scripts") +# create md5sums only for the zip files +if os.environ.get('GEN_IMG_MD5') == "True": +command += "for x in `ls " + deploy_dir + "/*.zip`;" +command += "do md5sum $x >> " + "$x.md5sum; done;" command=command+"mkdir -p " + DEST + "/eclipse-plugin/"+ artifact_base +";" -command=command+"cp -R
[yocto] [yocto-autobuilder][PATCH] nightly-wic.conf: add build for qemux86
[YOCTO #10166] Signed-off-by: Bill Randle --- buildset-config.controller/nightly-wic.conf | 6 ++ 1 file changed, 6 insertions(+) diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-config.controller/nightly-wic.conf index 47565ba..59ea34c 100644 --- a/buildset-config.controller/nightly-wic.conf +++ b/buildset-config.controller/nightly-wic.conf @@ -9,6 +9,12 @@ steps: [{'SetDest':{}}, {'RunPreamble':{}}, {'GetDistroVersion':{'distro': 'poky'}}, {'CreateBBLayersConf':{'buildprovider':'yocto'}}, +{'CreateAutoConf':{'machine':'qemux86'}}, +{'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, +{'BuildImages':{'images':'core-image-sato'}}, +{'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, +{'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, +{'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}, {'CreateAutoConf':{'machine':'genericx86'}}, {'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, {'BuildImages':{'images':'core-image-sato'}}, -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] SendQAEmail.py: cleanup email formatting
"-e" option is not required and gets inserted into email text if present. Signed-off-by: Bill Randle --- lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py b/lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py index 3691cc6..1bb2893 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py @@ -95,7 +95,7 @@ Please begin QA on this build as soon as possible.''' % (rel_name, self.getPrope email_header += "Subject: " + mailsubject + "\n" -mailcmd = 'echo -e "' + email_header + "\n" + email_base + '\n' + email_body + '\n' + mailsig + ' " | sendmail -t' +mailcmd = 'echo "' + email_header + "\n" + email_base + '\n' + email_body + '\n' + mailsig + ' " | sendmail -t' self.command = mailcmd else: -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH v2] enable use of kvm with qemux86*
When used with corresponding oe-core patch, this will enable the use of kvm when running qemux86* images on a x86* host that supports kvm. On the same build machine, for an x86_64 testimage run, the with and without times are: without kvm: core-image-sato-1.0-r0 do_testimage: Ran 43 tests in 728.726s core-image-sato-sdk-1.0-r0 do_testimage: Ran 52 tests in 1090.838s with kvm: core-image-sato-1.0-r0 do_testimage: Ran 43 tests in 60.255s core-image-sato-sdk-1.0-r0 do_testimage: Ran 52 tests in 71.719s [YOCTO #9298] Signed-off-by: Bill Randle --- Change for v2: propagate the new variable to the workers. config/autobuilder.conf.example | 3 +++ lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/config/autobuilder.conf.example b/config/autobuilder.conf.example index 9179d14..96bc4c6 100644 --- a/config/autobuilder.conf.example +++ b/config/autobuilder.conf.example @@ -60,6 +60,9 @@ RESOLVE_TRIGGERED_HEAD = True DEVKERNEL_MUT_REPO = "{'git://git.yoctoproject.org/poky-contrib':['stage/master_under_test', 'sgw/mut']}" DEVKERNEL = "linux-yocto-dev" +[TestSettings] +QEMU_USE_KVM = "True" + [ADTREPO Settings] ADTREPO_POPULATE = False ADTREPO_DEV_POPULATE = True diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py index 8817d69..2b086e1 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py @@ -264,6 +264,8 @@ class CreateAutoConf(ShellCommand): if self.initmgr == "sysvinit systemd": fout = fout + 'DISTRO_FEATURES_append = " systemd"\n' fout = fout + 'VIRTUAL-RUNTIME_init_manager = "sysvinit"\n' +if os.environ.get("QEMU_USE_KVM") == "True": +fout = fout + 'QEMU_USE_KVM = "True"\n' if self.atextappend: fout = fout + self.atextappend -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] cleanup and restart crashed vnc server
Use a common script to check for a running vnc server, and if not running cleanup dangling lock files and restart the server. [YOCTO #8210] Signed-off-by: Bill Randle --- bin/checkvnc | 10 ++ .../site-packages/autobuilder/buildsteps/RunESDKSanityTests.py | 3 +-- .../site-packages/autobuilder/buildsteps/RunOeSelftest.py | 3 +-- .../site-packages/autobuilder/buildsteps/RunSDKSanityTests.py | 3 +-- .../site-packages/autobuilder/buildsteps/RunSanityTests.py | 3 +-- 5 files changed, 14 insertions(+), 8 deletions(-) create mode 100755 bin/checkvnc diff --git a/bin/checkvnc b/bin/checkvnc new file mode 100755 index 000..574ba48 --- /dev/null +++ b/bin/checkvnc @@ -0,0 +1,10 @@ +#!/bin/sh +# +# check if vnc server is running, and if not, cleanup and restart +# +pid=$(pidof Xvnc) +if [[ $? != 0 ]]; then +echo "Xvnc not running, attempting restart" +vncserver -kill :1 +vncserver +fi diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/RunESDKSanityTests.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunESDKSanityTests.py index 7471d3d..c16c8c2 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunESDKSanityTests.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunESDKSanityTests.py @@ -47,8 +47,7 @@ class RunESDKSanityTests(BitbakeShellCommand): layerversion = self.getProperty("layerversion_core") command = "" command = command + ". ./oe-init-build-env; " -command = command + "netstat -an | grep -q 5901 ;" -command = command + 'if [ $? -ne 0 ]; then echo "Starting a VNC server on :1"; vncserver :1; else echo "Will use a VNC server already running on :1"; fi;' +command = command + "checkvnc; " if layerversion and int(layerversion) >= 7: command = command + "echo 'INHERIT += \"testsdk\"' >> ./conf/auto.conf;" command = command + "echo 'TEST_QEMUBOOT_TIMEOUT = \"1500\"' >> ./conf/auto.conf;" diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py index 809bcc3..84d32fe 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py @@ -31,8 +31,7 @@ class RunOeSelftest(ShellCommand): def start(self): self.command = "" self.command += ". ./oe-init-build-env; " -self.command += "netstat -an | grep -q 5901 ;" -self.command += "if [ $? -ne 0 ]; then echo 'Starting a VNC server on :1'; vncserver :1; else echo 'Will use a VNC server already running on :1'; fi;" +self.command += "checkvnc; " if self.tests == None: self.command += "if [ -d ../meta-selftest ]; then export DISPLAY=:1; oe-selftest --run-all-tests; else echo 'Skipping step - no meta-selftest layer here'; fi" else: diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/RunSDKSanityTests.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunSDKSanityTests.py index 9b6eb5b..6fb3127 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunSDKSanityTests.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunSDKSanityTests.py @@ -47,8 +47,7 @@ class RunSDKSanityTests(BitbakeShellCommand): layerversion = self.getProperty("layerversion_core") command = "" command = command + ". ./oe-init-build-env; " -command = command + "netstat -an | grep -q 5901 ;" -command = command + 'if [ $? -ne 0 ]; then echo "Starting a VNC server on :1"; vncserver :1; else echo "Will use a VNC server already running on :1"; fi;' +command = command + "checkvnc; " if layerversion and int(layerversion) >= 6: command = command + "echo 'INHERIT += \"testimage\"' >> ./conf/auto.conf;" command = command + "echo 'TEST_QEMUBOOT_TIMEOUT = \"1500\"' >> ./conf/auto.conf;" diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py index 4fa6dac..81e20cd 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py @@ -48,8 +48,7 @@ class RunSanityTests(BitbakeShellCommand): distro = self.getProperty("DISTRO") command = "" command = command + ". ./oe-i
[yocto] [yocto-autobuilder][PATCH] enable use of kvm with qemux86*
When used with corresponding oe-core patch, this will enable the use of kvm when running qemux86* images on a x86* host that supports kvm. On the same build machine, for an x86_64 testimage run, the with and without times are: without kvm: core-image-sato-1.0-r0 do_testimage: Ran 43 tests in 728.726s core-image-sato-sdk-1.0-r0 do_testimage: Ran 52 tests in 1090.838s with kvm: core-image-sato-1.0-r0 do_testimage: Ran 43 tests in 60.255s core-image-sato-sdk-1.0-r0 do_testimage: Ran 52 tests in 71.719s [YOCTO #9298] Signed-off-by: Bill Randle --- config/autobuilder.conf.example | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/autobuilder.conf.example b/config/autobuilder.conf.example index 9179d14..96bc4c6 100644 --- a/config/autobuilder.conf.example +++ b/config/autobuilder.conf.example @@ -60,6 +60,9 @@ RESOLVE_TRIGGERED_HEAD = True DEVKERNEL_MUT_REPO = "{'git://git.yoctoproject.org/poky-contrib':['stage/master_under_test', 'sgw/mut']}" DEVKERNEL = "linux-yocto-dev" +[TestSettings] +QEMU_USE_KVM = "True" + [ADTREPO Settings] ADTREPO_POPULATE = False ADTREPO_DEV_POPULATE = True -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] PublishArtifacts.py: generate md5sums for buildtools
Md5sum files were not being generated for the buildtools artifacts. Also, ignore files with a .md5sum extension when doing the sum. Signed-off-by: Bill Randle --- .../autobuilder/buildsteps/PublishArtifacts.py | 27 ++ 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py index f9ff4f6..1a938fc 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py @@ -112,9 +112,11 @@ class PublishArtifacts(ShellCommand): os.path.join(self.tmpdir, "deploy/images/*.zip") + \ " " + DEST + "/" + BA_PUBLISH_DIR + ";" elif artifact == "buildtools-tarball": +artifact_name, deploy_image_dir = self.getDeployNames(artifact, buildername) +command=command+self.generateMD5cmd(artifact, deploy_image_dir) command=command+"mkdir -p " + DEST + "/buildtools;" command=command+"cp -R --no-dereference --preserve=links " + \ -os.path.join(self.tmpdir, "deploy/sdk/*buildtools*") + \ +os.path.join(deploy_image_dir, "*buildtools*") + \ " " + DEST + "/buildtools;" elif artifact == "rpm": command=command+"mkdir -p " + os.path.join(DEST, RPM_PUBLISH_DIR) + ";" @@ -144,22 +146,26 @@ class PublishArtifacts(ShellCommand): else: command=command+"echo 'Skipping copy of sstate, PUBLISH_SSTATE not set.';" elif artifact == "toolchain": +artifact_name, deploy_image_dir = self.getDeployNames(artifact, buildername) +command=command+self.generateMD5cmd(artifact, deploy_image_dir) command=command+"mkdir -p " + os.path.join(DEST, X86TC_PUBLISH_DIR) + ";" command=command+"cp -R --no-dereference --preserve=links " + \ -os.path.join(self.tmpdir, "deploy/sdk/poky-*i686-core-image*.sh ") + \ +os.path.join(deploy_image_dir, "poky-*i686-core-image*.sh ") + \ os.path.join(DEST, X86TC_PUBLISH_DIR) + ";" command=command+"mkdir -p " + os.path.join(DEST, X8664TC_PUBLISH_DIR) + ";" command=command+"cp -R --no-dereference --preserve=links " + \ -os.path.join(self.tmpdir, "deploy/sdk/poky-*x86_64-core-image*.sh ") + \ +os.path.join(deploy_image_dir, "poky-*x86_64-core-image*.sh ") + \ os.path.join(DEST, X8664TC_PUBLISH_DIR) + ";" elif artifact == "uninative": +artifact_name, deploy_image_dir = self.getDeployNames(artifact, buildername) +command=command+self.generateMD5cmd(artifact, deploy_image_dir) command=command+"mkdir -p " + os.path.join(DEST, X86TC_PUBLISH_DIR) + ";" command=command+"cp -R --no-dereference --preserve=links " + \ -os.path.join(self.tmpdir, "deploy/sdk/i686-nativesdk-libc* ") + \ +os.path.join(deploy_image_dir, "i686-nativesdk-libc* ") + \ os.path.join(DEST, X86TC_PUBLISH_DIR) + ";" command=command+"mkdir -p " + os.path.join(DEST, X8664TC_PUBLISH_DIR) + ";" command=command+"cp -R --no-dereference --preserve=links " + \ -os.path.join(self.tmpdir, "deploy/sdk/x86_64-nativesdk-libc* ") + \ +os.path.join(deploy_image_dir, "x86_64-nativesdk-libc* ") + \ os.path.join(DEST, X8664TC_PUBLISH_DIR) + ";" elif artifact == "oe-toolchain": command=command+"mkdir -p " + os.path.join(DEST, X86TC_PUBLISH_DIR) + ";" @@ -209,7 +215,7 @@ class PublishArtifacts(ShellCommand): os.path.join(self.basedir, "conf/") + \
[yocto] [yocto-autobuilder][PATCH] nightly-musl.conf: add world build
Add world build for musl. [YOCTO #10105] Signed-off-by: Bill Randle --- buildset-config.controller/nightly-musl.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildset-config.controller/nightly-musl.conf b/buildset-config.controller/nightly-musl.conf index 1f6aba5..cc2aea0 100644 --- a/buildset-config.controller/nightly-musl.conf +++ b/buildset-config.controller/nightly-musl.conf @@ -12,7 +12,7 @@ steps: [{'SetDest':{}}, 'buildhistory' : False, 'distro': 'poky', 'atextappend' : '\nTCLIBC="musl"\n' }}, {'CreateBBLayersConf': {'buildprovider' : 'yocto'}}, -{'BuildImages': {'images': 'core-image-minimal core-image-full-cmdline core-image-sato'}}, +{'BuildImages': {'images': 'core-image-minimal core-image-full-cmdline core-image-sato world'}}, {'DownloadErrorReports': {}}, {'SendErrorReport': {}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] SendQAEmail.py: use sendmail instead of mail to send QA email
When sending QA emails, the autobuilder uses the 'mail' command (typically installed as /usr/bin/mail or /bin/mail). However, most distributions do not install this program by default. They generally always install the 'sendmail' program, though, so use 'sendmail' as the mail agent, rather than 'mail'. [YOCTO #10082] Signed-off-by: Bill Randle --- .../autobuilder/buildsteps/SendQAEmail.py | 26 -- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py b/lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py index 0cd76d5..3691cc6 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/SendQAEmail.py @@ -47,9 +47,9 @@ class SendQAEmail(ShellCommand): properties = self.build.getProperties().asDict() repoprops = {} mailsubject = "Build available for QA" -email_header = ''' -A build identified as needing QA has finished on the autobuilder. This -build is located at:\n\n +email_base = ''' +A build identified as needing QA has finished on the autobuilder. This +build is located at:\n\n %s''' % (self.getProperty('DEST').replace(web_root, web_url)) if str(self.getProperty("custom_release_me")) == "True": @@ -68,9 +68,9 @@ class SendQAEmail(ShellCommand): poky_number = self.getProperty("custom_poky_number")+prefix yocto_number = self.getProperty("custom_yocto_number")+prefix rel_name = 'yocto-'+ yocto_number -email_header = ''' +email_base = ''' A release candidate build for %s is now available at:\n\n -%s\n\n +%s\n\n Please begin QA on this build as soon as possible.''' % (rel_name, self.getProperty('DEST').replace(web_root, web_url)) mailsubject = "Release Candidate Build for " + rel_name + snapshot + " now available." @@ -85,16 +85,18 @@ Please begin QA on this build as soon as possible.''' % (rel_name, self.getPrope for k, v in repoprops.iteritems(): email_body = email_body + '%s : %s \n' % (k, v[1]) -mailcmd = 'echo -e "' + email_header + '\n' + email_body + '\n' + mailsig + ' " | mail -s \'' + mailsubject + '\'' - +email_header = "" +if mailto is not None and mailto is not "": +email_header += "To: " + mailto + "\n" if mailcc is not None and mailcc is not "": -mailcmd += " -c '" + mailcc + "' " - +email_header += "Cc: " + mailcc + "\n" if mailbcc is not None and mailbcc is not "": -mailcmd += " -b '" + mailbcc + "' " +email_header += "Bcc: " + mailbcc + "\n" + +email_header += "Subject: " + mailsubject + "\n" + +mailcmd = 'echo -e "' + email_header + "\n" + email_base + '\n' + email_body + '\n' + mailsig + ' " | sendmail -t' -if mailto is not None and mailto is not "": -mailcmd += " '" + mailto + "' " self.command = mailcmd else: self.command = 'echo "Not a QA build"' -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] UploadToasterEventlog.py: show better message when step is skipped
When the UploadToasterEventlog is skipped it shows the unfriendly message "'echo 'Skipping ...' in the AB status box. Set the description field so it displays a better message. Signed-off-by: Bill Randle --- .../site-packages/autobuilder/buildsteps/UploadToasterEventlog.py| 1 + 1 file changed, 1 insertion(+) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py b/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py index 0fbb899..4230996 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py @@ -41,6 +41,7 @@ class UploadToasterEventlog(ShellCommand): if int(self.layerversion_core) < 5 or self.create_eventlog == "False": self.command = "echo 'Skipping Step.'" +self.description = ["Uploading toaster data skipped"] else: if os.environ.get('TOASTER_UPLOAD_URL') is not None: self.filepath = os.path.join(os.path.join( -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 2/2] CreateBBLayersConf.py: do not include meta-qt3 when oe-core version is >= 9
Oe-core version 9 upgraded LSB to version 5, so the LSB builds no longer require qt3. [YOCTO #10020] Signed-off-by: Bill Randle --- .../site-packages/autobuilder/buildsteps/CreateBBLayersConf.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py index a00c991..da53efe 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateBBLayersConf.py @@ -89,9 +89,8 @@ class CreateBBLayersConf(ShellCommand): if (layer[layer.iterkeys().next()].has_key('checkout') and layer[layer.iterkeys().next()]['checkout'] is not False) \ or layer[layer.iterkeys().next()].has_key('checkout') is False: if layer.iterkeys().next()=="meta-qt3": -# For now, we want meta-qt3 in, no matter the layerversion -#if layerversioncore is not None and int(layerversioncore) < 7: -fout = fout + workdir + '/build/' + layer.iterkeys().next() + ' \ \n' +if layerversioncore is not None and int(layerversioncore) < 9: +fout = fout + workdir + '/build/' + layer.iterkeys().next() + ' \ \n' elif layer.iterkeys().next()=="meta-qt4": if layerversioncore is not None and int(layerversioncore) > 6: fout = fout + workdir + '/build/' + layer.iterkeys().next() + ' \ \n' -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 1/2] BuildImages.py: skip uclibc with core version >= 9
Starting with oe-core version 9, we don't need to build uclibc anymore. [YOCTO #10020] Signed-off-by: Bill Randle --- lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py b/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py index 9ea350f..cb011ba 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py @@ -120,7 +120,7 @@ class BuildImages(BitbakeShellCommand): self.finished(SUCCESS) self.description = ["Skipping no-x11 Build"] elif self.layerversion_core is not None \ - and int(self.layerversion_core) < 8 \ + and int(self.layerversion_core) != 8 \ and 'uclibc' in self.localconf: self.finished(SUCCESS) self.description = ["Skipping uclibc Build"] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 2/2] yoctogit.py: ensure mirrordir is set before trying to use it
If OPTIMIZED_GIT_CLONE is False, it's possible for self.mirrordir to be unset, which cause the _mirrorExists function to throw an exception. Check that self.mirrordir is actually set before trying to use it. [YOCTO #10010] Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Bill Randle --- .../buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py b/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py index 850746f..5eb6158 100644 --- a/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py +++ b/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py @@ -596,8 +596,11 @@ class YoctoGit(Source): return self.pathExists(self.build.path_module.join(self.workdir, '.git')) def _mirrorExists(self): -mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/" -return self.pathExists(self.build.path_module.join(mirror, '.git')) +if self.mirrordir: +mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/" +return self.pathExists(self.build.path_module.join(mirror, '.git')) +else: +return None def _updateSubmodule(self, _): if self.submodules: -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 1/2] BuildSet.py: allow using local git mirror even if OPTIMIZED_GIT_CLONE is False
OPTIMIZED_GIT_CLONE controls the use of two features: a local git mirror directory and an optimized move/copy of old build directories. Allow the use of the local mirror, even if the optimized move/copy is not used. To disable the local mirror, comment out the setting of OGIT_MIRROR_DIR, as well as setting OPTIMIZED_GIT_CLONE False. [YOCOT #10010] Signed-off-by: Bill Randle --- lib/python2.7/site-packages/autobuilder/BuildSet.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/python2.7/site-packages/autobuilder/BuildSet.py b/lib/python2.7/site-packages/autobuilder/BuildSet.py index 8c2208e..1418a8d 100644 --- a/lib/python2.7/site-packages/autobuilder/BuildSet.py +++ b/lib/python2.7/site-packages/autobuilder/BuildSet.py @@ -82,6 +82,8 @@ class BuildSet(): method='barecopy' storedir=os.environ.get('OGIT_TRASH_DIR') mirrordir=os.environ.get('OGIT_MIRROR_DIR') +elif os.environ.get('OGIT_MIRROR_DIR', None) != None: +mirrordir=os.environ.get('OGIT_MIRROR_DIR') if 'poky' in layername or 'oecore' in layername: workdir = 'build' elif "eclipse-poky" in layername: -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 0/2] Allow OPTIMIZED_GIT_CLONE to be False
The autobuilder code assumes OPTIMIZED_GIT_CLONE is always set True, because things break if it is set to False. I had a case where it needed to be set False because the git trash folder was on a different file system than the build directory. This caused the CheckOutLayers build step to fail. In addition, I still wanted to use the git mirror even with OPTIMIZED_GIT_CLONE set False, so allow that case, too. [YOCTO #10010] Bill Randle (2): BuildSet.py: allow using local git mirror even if OPTIMIZED_GIT_CLONE is False yoctogit.py: ensure mirrordir is set before trying to use it lib/python2.7/site-packages/autobuilder/BuildSet.py| 2 ++ .../buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py | 7 +-- 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] nightly-wic.conf: build genericx86 wic images
QA requested wic images for genericx86, as well as x86-64 so include config and build for them. [YOCTO #10006] Signed-off-by: Bill Randle --- buildset-config.controller/nightly-wic.conf | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-config.controller/nightly-wic.conf index 27584cb..47565ba 100644 --- a/buildset-config.controller/nightly-wic.conf +++ b/buildset-config.controller/nightly-wic.conf @@ -9,6 +9,12 @@ steps: [{'SetDest':{}}, {'RunPreamble':{}}, {'GetDistroVersion':{'distro': 'poky'}}, {'CreateBBLayersConf':{'buildprovider':'yocto'}}, +{'CreateAutoConf':{'machine':'genericx86'}}, +{'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, +{'BuildImages':{'images':'core-image-sato'}}, +{'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, +{'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, +{'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}, {'CreateAutoConf':{'machine':'qemux86-64'}}, {'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, {'BuildImages':{'images':'core-image-sato'}}, @@ -20,5 +26,5 @@ steps: [{'SetDest':{}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}, -{'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86-64']}}] +{'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86', 'genericx86-64']}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 1/4] remote_kick.py: add default entry for new 'create_eventlog' property
Default eventlog creating to False when starting an AB build session from the command line. [YOCTO #9884] Signed-off-by: Bill Randle --- bin/remote_kick.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/remote_kick.py b/bin/remote_kick.py index 20a7b7e..7320162 100644 --- a/bin/remote_kick.py +++ b/bin/remote_kick.py @@ -44,6 +44,7 @@ class RemoteBuild(): kw['branch_eclipse-poky-luna'] = 'luna-master' kw['branch_eclipse-poky-mars'] = 'mars-master' kw['branch_oecore'] = 'master' +kw['custom_create_eventlog'] = 'False' kw['custom_deploy_artifacts'] = 'False' kw['custom_is_milestone'] = 'False' kw['custom_milestone_number'] = '' -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 4/4] buildset-config.controller: add new 'create_eventlog' forced build property
Add a new 'create_eventlog' custom property to the configurations that could potentially create a toaster event log. In the case of "nightly.conf", ensure the property is passed to the Triggered builds. [YOCTO #9884] Signed-off-by: Bill Randle --- buildset-config.controller/nightly-arm-lsb.conf| 4 buildset-config.controller/nightly-arm.conf| 4 buildset-config.controller/nightly-arm64.conf | 4 buildset-config.controller/nightly-mips-lsb.conf | 4 buildset-config.controller/nightly-mips.conf | 4 buildset-config.controller/nightly-mips64.conf | 4 buildset-config.controller/nightly-no-x11.conf | 4 buildset-config.controller/nightly-ppc-lsb.conf| 4 buildset-config.controller/nightly-ppc.conf| 4 buildset-config.controller/nightly-x32.conf| 4 buildset-config.controller/nightly-x86-64-lsb.conf | 4 buildset-config.controller/nightly-x86-64.conf | 4 buildset-config.controller/nightly-x86-lsb.conf| 4 buildset-config.controller/nightly-x86.conf| 4 buildset-config.controller/nightly.conf| 7 ++- 15 files changed, 62 insertions(+), 1 deletion(-) diff --git a/buildset-config.controller/nightly-arm-lsb.conf b/buildset-config.controller/nightly-arm-lsb.conf index eb8d3eb..f94db21 100644 --- a/buildset-config.controller/nightly-arm-lsb.conf +++ b/buildset-config.controller/nightly-arm-lsb.conf @@ -10,6 +10,10 @@ repos: [{'poky': {'meta-qt3': {'repourl':'git://git.yoctoproject.org/meta-qt3', 'branch':'master'}}] +props: [{'create_eventlog':{'prop_type':'ChoiceStringParameter', + 'choices': ['False', 'True'], + 'name': 'create_eventlog', + 'label':'Create Toaster event log as part of image creation?:'}}] steps: [{'SetDest':{}}, {'CheckOutLayers': {}}, {'RunPreamble': {}}, diff --git a/buildset-config.controller/nightly-arm.conf b/buildset-config.controller/nightly-arm.conf index 2e6c829..f4c3fb8 100644 --- a/buildset-config.controller/nightly-arm.conf +++ b/buildset-config.controller/nightly-arm.conf @@ -4,6 +4,10 @@ repos: [{'poky': {'repourl':'git://git.yoctoproject.org/poky', 'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'}, 'branch':'master'}}] +props: [{'create_eventlog':{'prop_type':'ChoiceStringParameter', + 'choices': ['False', 'True'], + 'name': 'create_eventlog', + 'label':'Create Toaster event log as part of image creation?:'}}] steps: [{'SetDest':{}}, {'CheckOutLayers': {}}, {'RunPreamble': {}}, diff --git a/buildset-config.controller/nightly-arm64.conf b/buildset-config.controller/nightly-arm64.conf index 32a5492..3986c93 100644 --- a/buildset-config.controller/nightly-arm64.conf +++ b/buildset-config.controller/nightly-arm64.conf @@ -4,6 +4,10 @@ repos: [{'poky': {'repourl':'git://git.yoctoproject.org/poky', 'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp', 'yocto':'meta-yocto', 'poky':'meta-poky'}, 'branch':'master'}}] +props: [{'create_eventlog':{'prop_type':'ChoiceStringParameter', + 'choices': ['False', 'True'], + 'name': 'create_eventlog', + 'label':'Create Toaster event log as part of image creation?:'}}] steps: [{'SetDest':{}}, {'CheckOutLayers': {}}, {'RunPreamble': {}}, diff --git a/buildset-config.controller/nightly-mips-lsb.conf b/buildset-config.controller/nightly-mips-lsb.conf index 81faaad..65fb4ec 100644 --- a/buildset-config.controller/nightly-mips-lsb.conf +++ b/buildset-config.controller/nightly-mips-lsb.conf @@ -10,6 +10,10 @@ repos: [{'poky': {'meta-qt3': {'repourl':'git://git.yoctoproject.org/meta-qt3', 'branch':'master'}}] +props: [{'create_eventlog':{'prop_type':'ChoiceStringParameter', +
[yocto] [yocto-autobuilder][PATCH 3/4] UploadToasterEventlog.py: handle multiple eventlog files
Now that multiple eventlog files can be generated, upload thyem all. Also, only upload files in user requested an eventlog be generated. [YOCTO #9884] Signed-off-by: Bill Randle --- .../autobuilder/buildsteps/UploadToasterEventlog.py | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py b/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py index ed1cb1c..0fbb899 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/UploadToasterEventlog.py @@ -34,17 +34,23 @@ class UploadToasterEventlog(ShellCommand): self.workerdir=os.path.join(os.path.join(YOCTO_ABBASE, "yocto-worker")) self.buildername=self.getProperty("buildername") self.layerversion_core = self.getProperty("layerversion_core") -self.filepath=os.path.join(os.path.join( -self.workerdir, self.buildername), -"build/build/bitbake_eventlog.json") +try: +self.create_eventlog = self.getProperty("custom_create_eventlog") +except: +self.create_eventlog = "False" -if int(self.layerversion_core) < 5: +if int(self.layerversion_core) < 5 or self.create_eventlog == "False": self.command = "echo 'Skipping Step.'" else: if os.environ.get('TOASTER_UPLOAD_URL') is not None: +self.filepath = os.path.join(os.path.join( +self.workerdir, self.buildername), +"build/build/tmp/log/bitbake_eventlog-*.json") self.toasterserver = str(os.environ.get('TOASTER_UPLOAD_URL')) -self.command = "curl -F eventlog=@" + self.filepath + " " + self.toasterserver +self.command = "for fn in %s; do " % self.filepath +self.command += "curl -F eventlog=@$fn " + self.toasterserver + ";" +self.command += "done" else: self.command = "echo environment var TOASTER_UPLOADURL not set - Step is noop" self.description = ["Uploading toaster data"] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 2/4] BuildImages.py: build toaster eventlog only when requested
Qualify creation of the toaster eventlog based on the setting of the new 'custom_create_eventlog' property. Place the eventlog in build/tmp/log, instead of build and add a timestamp to the eventlog filename since multiple event logs can be generated during a multi-image buildset and otherwise only the last one would otherwise be saved. [YOCTO #9884] Signed-off-by: Bill Randle --- .../autobuilder/buildsteps/BuildImages.py | 24 +- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py b/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py index 7ef8aab..9ea350f 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py @@ -15,7 +15,7 @@ from buildbot.steps.shell import ShellCommand from buildbot.process.buildstep import LogLineObserver from distutils.version import StrictVersion from buildbot.status.results import SUCCESS, SKIPPED -import os +import os, datetime from lib.buildsteps import BitbakeShellCommand @@ -47,8 +47,23 @@ class BuildImages(BitbakeShellCommand): self.deploycheck = self.getProperty('custom_deploy_artifacts') except: self.deploycheck = "True" + +# the eventlog capability exists only in bitbake 1.25 and newer +self.create_eventlog = "False" +if self.getProperty('bitbakeversion') \ + and StrictVersion(self.getProperty('bitbakeversion')) >= StrictVersion("1.25"): +try: +self.create_eventlog = self.getProperty("custom_create_eventlog") +if self.create_eventlog == "True": +timestamp = datetime.datetime.now().strftime("%Y%m%d%H%M%S") +self.eventlog_name = "tmp/log/bitbake_eventlog-%s.json" % timestamp +except: +pass + if self.images == "#TOASTER": -bitbakeflags = "-k -w 'bitbake_eventlog.json' " +bitbakeflags = "-k " +if self.create_eventlog == "True": +bitbakeflags += "-w '" + self.eventlog_name + "' " self.images=self.getProperty("custom_images") self.command = ". ./oe-init-build-env; bitbake " + bitbakeflags + self.images self.description = ["Building " + str(self.images)] @@ -130,9 +145,8 @@ class BuildImages(BitbakeShellCommand): self.description = ["Skipping Build. No Images to be built"] else: bitbakeflags = "-k " -# -w only exists in bitbake 1.25 and newer, use distroversion string and make sure we're on poky >1.7 -if self.getProperty('bitbakeversion') and StrictVersion(self.getProperty('bitbakeversion')) >= StrictVersion("1.25"): -bitbakeflags += "-w 'bitbake_eventlog.json' " +if self.create_eventlog == "True": +bitbakeflags += "-w '" + self.eventlog_name + "' " if self.minnowExists is None or self.minnowExists == "True": self.command = ". ./oe-init-build-env; bitbake " + bitbakeflags + self.images self.description = ["Building " + str(self.images)] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 0/4] autobuilder: make toaster eventlog creation optional
Currently, a toaster eventlog is generated for most all machine specific images (e.g., nightly-arm, nightly-x86, etc.) and placed in the top-level build directory. Having it in the top level dir causes inotify overflow in bitbake, due to the large number of changes to the file. This set of patches (1) make generation of the eventlog optional, by having a user selection in the Forced Build web pages, (2) places the eventlog in build/tmp/log, instead of build and (3) adds a timestamp to the eventlog filename since multiple event logs can be generated during a multi-image buildset and otherwise only the last one would otherwise be saved. [YOCTO #9884] Bill Randle (4): remote_kick.py: add default entry for new 'create_eventlog' property BuildImages.py: build toaster eventlog only when requested UploadToasterEventlog.py: handle multiple eventlog files buildset-config.controller: add new 'create_eventlog' forced build property bin/remote_kick.py | 1 + buildset-config.controller/nightly-arm-lsb.conf| 4 buildset-config.controller/nightly-arm.conf| 4 buildset-config.controller/nightly-arm64.conf | 4 buildset-config.controller/nightly-mips-lsb.conf | 4 buildset-config.controller/nightly-mips.conf | 4 buildset-config.controller/nightly-mips64.conf | 4 buildset-config.controller/nightly-no-x11.conf | 4 buildset-config.controller/nightly-ppc-lsb.conf| 4 buildset-config.controller/nightly-ppc.conf| 4 buildset-config.controller/nightly-x32.conf| 4 buildset-config.controller/nightly-x86-64-lsb.conf | 4 buildset-config.controller/nightly-x86-64.conf | 4 buildset-config.controller/nightly-x86-lsb.conf| 4 buildset-config.controller/nightly-x86.conf| 4 buildset-config.controller/nightly.conf| 7 ++- .../autobuilder/buildsteps/BuildImages.py | 24 +- .../buildsteps/UploadToasterEventlog.py| 16 +++- 18 files changed, 93 insertions(+), 11 deletions(-) -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCHv3] PublishLayerTarballs.py: don't change directories for Eclipse builds
When publishing eclipse tarballs, we are already in the correct directory, so skip the change direction operation (which will generate an error). Signed-off-by: Bill Randle --- V3: fix another Python syntax error (unbelievable!) .../site-packages/autobuilder/buildsteps/PublishLayerTarballs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py index c140725..7c1ce4a 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py @@ -38,7 +38,8 @@ class PublishLayerTarballs(ShellCommand): snapshot = "" self.basedir=os.path.join(os.path.join(os.path.join( self.workerdir, buildername), self.workdir)) -if self.layername is not "poky": +if self.layername is not "poky" \ + and "eclipse" not in self.layername: command = "cd " + self.layername + ";" else: command = "" -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCHv2] PublishLayerTarballs.py: don't change directories for Eclipse builds
When publishing eclipse tarballs, we are already in the correct directory, so skip the change direction operation (which will generate an error). Signed-off-by: Bill Randle --- V2: fix Python syntax error .../site-packages/autobuilder/buildsteps/PublishLayerTarballs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py index c140725..7c1ce4a 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py @@ -38,7 +38,8 @@ class PublishLayerTarballs(ShellCommand): snapshot = "" self.basedir=os.path.join(os.path.join(os.path.join( self.workerdir, buildername), self.workdir)) -if self.layername is not "poky": +if self.layername is not "poky" + and "eclipse" not in self.layername: command = "cd " + self.layername + ";" else: command = "" -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] PublishLayerTarballs.py: don't change directories for Eclipse builds
When publishing eclipse tarballs, we are already in the correct directory, so skip the change direction operation (which will generate an error). Signed-off-by: Bill Randle --- .../site-packages/autobuilder/buildsteps/PublishLayerTarballs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py index c140725..7c1ce4a 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py @@ -38,7 +38,8 @@ class PublishLayerTarballs(ShellCommand): snapshot = "" self.basedir=os.path.join(os.path.join(os.path.join( self.workerdir, buildername), self.workdir)) -if self.layername is not "poky": +if self.layername is not "poky" + and "eclipse" is not in self.layername: command = "cd " + self.layername + ";" else: command = "" -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 2/2] publish build artifacts for wic images
Publish the wic images created by the nightly-wic build so they are available for QA testing. [YOCTO #9397] Signed-off-by: Bill Randle --- buildset-config.controller/nightly-wic.conf| 8 ++--- .../autobuilder/buildsteps/PublishArtifacts.py | 35 -- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-config.controller/nightly-wic.conf index 7d2ae88..27584cb 100644 --- a/buildset-config.controller/nightly-wic.conf +++ b/buildset-config.controller/nightly-wic.conf @@ -19,10 +19,6 @@ steps: [{'SetDest':{}}, {'BuildImages':{'images':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, -{'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}] - - - - - +{'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}, +{'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86-64']}}] diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py index 952a458..f9df16c 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py @@ -174,7 +174,14 @@ class PublishArtifacts(ShellCommand): artifact_name, deploy_image_dir = self.getDeployNames(artifact, buildername) command += self.generateMD5cmd(artifact, deploy_image_dir) command=command+"mkdir -p " + DEST + "/" + QEMU_PUBLISH_DIR + "/" + artifact_name + ";" -command=command+"cp -R --no-dereference --preserve=links " + \ +if "-wic" in buildername: +deploy_image_dir += "/*/*/build"; +command=command+"cp --no-dereference --preserve=links " + \ +deploy_image_dir + "/*\.direct " + \ +deploy_image_dir + "/*\.direct.md5sum " + \ +DEST + "/" + QEMU_PUBLISH_DIR + "/" + artifact_name + ";" +else: +command=command+"cp -R --no-dereference --preserve=links " + \ deploy_image_dir + \ "/*" + artifact + "* " + DEST + "/" + QEMU_PUBLISH_DIR + "/" + artifact_name + ";" elif "mpc8315e" in artifact: @@ -213,18 +220,26 @@ class PublishArtifacts(ShellCommand): "genericx86-64" in artifact: command = command+"echo 'Skipping copy of genericx86-64.'; " else: -command=command+"mkdir -p " + DEST + "/"+ MACHINE_PUBLISH_DIR +"/" + artifact_name + ";" -if "beagle" in artifact: -command=command+"cp -R --no-dereference --preserve=links " + \ +command += self.generateMD5cmd(artifact, deploy_image_dir) +if "-wic" in buildername: +deploy_image_dir += "/*/*/build"; +command=command+"mkdir -p " + DEST + "/" + MACHINE_PUBLISH_DIR + "/" + artifact_name + ";" +command=command+"cp --no-dereference --preserve=links " + \ +deploy_image_dir + "/*\.direct " + \ +deploy_image_dir + "/*\.direct.md5sum " + \ +DEST + "/" + MACHINE_PUBLISH_DIR + "/" + artifact_name + ";" +else: +command=command+"mkdir -p " + DEST + "/"+ MACHINE_PUBLISH_DIR +"/" + artifact_name + ";" +if "beagle" in artifact: +command=command+"cp -R --no-dereference --preserve=links " + \ deploy_ima
[yocto] [yocto-autobuilder][PATCH 1/2] PublishArtifacts.py: create md5sum files in same dir as artifacts
Previously all the md5sum files got put into the top level deploy directory. This patch keeps the md5sum file in the same directory as the file it is hashing. It also limits the traversal depth to five, to avoid hashing the wic components that go into making the wic images. Signed-off-by: Bill Randle --- .../site-packages/autobuilder/buildsteps/PublishArtifacts.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py index 111dad7..952a458 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py @@ -233,9 +233,8 @@ class PublishArtifacts(ShellCommand): def generateMD5cmd(self, artifact, deploy_dir): cmd = "" if os.environ.get('GEN_IMG_MD5') == "True": -cmd += "for x in `find " + deploy_dir + " -type f`;" -cmd += "do fname=`basename $x`;" -cmd += "md5sum $x >> " + deploy_dir + "/$fname.md5sum; done;" +cmd += "for x in `find " + deploy_dir + " -type f -maxdepth 5`;" +cmd += "do md5sum $x >> " + "$x.md5sum; done;" return cmd def getDeployNames(self, artifact, buildername): -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH 0/2] publish wic images
QA started testing wic images in Yocto 2.1, but was building them themselves. Have the autobuilder publish the wic images so they are available for testing. [YOCTO #9397] Bill Randle (2): PublishArtifacts.py: create md5sum files in same dir as artifacts publish build artifacts for wic images buildset-config.controller/nightly-wic.conf| 8 ++--- .../autobuilder/buildsteps/PublishArtifacts.py | 40 +++--- 2 files changed, 30 insertions(+), 18 deletions(-) -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] CreateAutoConf.py: fix default path for auto.conf
Commit 1d67af87fafe89f75041824bfcf00e92163b949f made the destination path configurable, with the default supposed to be "./build/conf/auto.conf". A typo in the patch instead set the default to "./build/auto.conf". In addition, replace hard coded path with configurable value when removing a previous auto.conf file. Signed-off-by: Bill Randle --- lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py index 57726b7..8817d69 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py @@ -43,7 +43,7 @@ class CreateAutoConf(ShellCommand): self.kwargs = kwargs self.devkernel = True self.tmpdir = None -self.autoconfpath = "./build/auto.conf" +self.autoconfpath = "./build/conf/auto.conf" self.rmautoconf = "True" for k, v in argdict.iteritems(): if type(v) is bool: @@ -65,7 +65,7 @@ class CreateAutoConf(ShellCommand): self.command = "" fout = "" if self.rmautoconf == "True": -self.command += "rm -rf ./build/conf/auto.conf;" +self.command += "rm -rf %s;" % self.autoconfpath #check to see if we have a prepend if self.atextprepend: fout = fout +"\n"+ self.atextprepend -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocyo-autobuilder][PATCH v2] add mkefidisk image for easier debugging
Originally-by: Ed Bartosh Signed-off-by: Bill Randle --- v2 fixes typo in image name buildset-config.controller/nightly-wic.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-config.controller/nightly-wic.conf index 680ac16..7d2ae88 100644 --- a/buildset-config.controller/nightly-wic.conf +++ b/buildset-config.controller/nightly-wic.conf @@ -18,7 +18,8 @@ steps: [{'SetDest':{}}, {'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, {'BuildImages':{'images':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, -{'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}] +{'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, +{'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] add mkefdisk image for easier debugging
Originally-by: Ed Bartosh Signed-off-by: Bill Randle --- buildset-config.controller/nightly-wic.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletions(-) diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-config.controller/nightly-wic.conf index 680ac16..12f1c2e 100644 --- a/buildset-config.controller/nightly-wic.conf +++ b/buildset-config.controller/nightly-wic.conf @@ -18,7 +18,8 @@ steps: [{'SetDest':{}}, {'BuildImages':{'images':'syslinux syslinux-native parted-native gptfdisk-native dosfstools-native mtools-native'}}, {'BuildImages':{'images':'core-image-sato'}}, {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}}, -{'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}] +{'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}}, +{'CreateWicImages':{'wic_img_type':'mkefdisk', 'target_img':'core-image-sato'}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] keep platform_extra and default_platform_extra lists ordered
In RpmPM:insert_feeds_uris, the paths are kept in sets, which are unordered, but they are later used to set the priority for the Smart channels, so unexpected results could occur. Change the sets to lists and use the same code as in create_configs() to add items to the list, reather than the set operators. [YOCTO #9717] Signed-off-by: Bill Randle --- meta/lib/oe/package_manager.py | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 717246d..2004a42 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -700,18 +700,19 @@ class RpmPM(PackageManager): arch_list = self.feed_archs.split() else: # List must be prefered to least preferred order -default_platform_extra = set() -platform_extra = set() +default_platform_extra = list() +platform_extra = list() bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or "" for mlib in self.ml_os_list: for arch in self.ml_prefix_list[mlib]: plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib] if mlib == bbextendvariant: -default_platform_extra.add(plt) +if plt not in default_platform_extra: +default_platform_extra.append(plt) else: -platform_extra.add(plt) - -platform_extra = platform_extra.union(default_platform_extra) +if plt not in platform_extra: +platform_extra.append(plt) +platform_extra = default_platform_extra + platform_extra for canonical_arch in platform_extra: arch = canonical_arch.split('-')[0] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [autobuilder][PATCH] nightly-arm.conf: build Cortex-A8 toolchains
Since met-fsl-arm was dropped from the nightly builds, the Cortex-A8 cross- compiler used for beaglebone builds is not created. Include toochain builds as part of nightly-arm now, so compiler is available for users of the beaglebone machine. [YOCTO #9810] Signed-off-by: Bill Randle --- buildset-config.controller/nightly-arm.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildset-config.controller/nightly-arm.conf b/buildset-config.controller/nightly-arm.conf index 76244ed..32920cf 100644 --- a/buildset-config.controller/nightly-arm.conf +++ b/buildset-config.controller/nightly-arm.conf @@ -15,7 +15,11 @@ steps: [{'SetDest':{}}, {'BuildImages': {'images': 'core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev'}}, {'RunSanityTests': {'images': 'core-image-minimal core-image-sato core-image-sato-sdk'}}, {'CreateAutoConf': {'machine': 'beagleboard', 'SDKMACHINE' : 'i686', 'distro': 'poky'}}, +{'BuildToolchainImages': {}}, {'BuildImages': {'images': 'core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev core-image-sato-sdk-ptest'}}, +{'CreateAutoConf': {'machine': 'beagleboard', 'SDKMACHINE' : 'x86_64', 'distro': 'poky'}}, +{'BuildToolchainImages': {}}, +{'BuildImages': {'images': '-c populate_sdk_ext core-image-minimal'}}, {'CreateAutoConf': {'machine': 'qemuarm', 'SDKMACHINE' : 'i686', 'distro': 'poky', 'buildhistory' : False}}, {'BuildToolchainImages': {}}, {'RunSDKSanityTests': {'images': 'core-image-sato'}}, -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [autobuilder][PATCH] CreateAutoConf.py: check for empty env history variables before using
I saw this error on a new AB setup: File "/home/pokybuild/yocto-autobuilder/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py", line 181, in start ta_history_repos=ast.literal_eval(os.environ.get('BUILD_HISTORY_THROWAWAY_WHITELIST').encode('utf-8')) exceptions.AttributeError: 'NoneType' object has no attribute 'encode' Since the code above line 181 checks for either BUILD_HISTORY_THROWAWAY_WHITELIST or BUILD_HISTORY_WHITELIST being set, it's possible one of them could be empty. Signed-off-by: Bill Randle --- .../site-packages/autobuilder/buildsteps/CreateAutoConf.py| 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py index 0845ff1..91607e6 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CreateAutoConf.py @@ -177,9 +177,13 @@ class CreateAutoConf(ShellCommand): if os.environ.get('BUILD_HISTORY_WHITELIST') is not None or \ os.environ.get('BUILD_HISTORY_THROWAWAY_WHITELIST') is not None: +ta_history_repos={} +history_repos={} fout = fout + 'ERROR_QA_remove = "version-going-backwards"\n' - ta_history_repos=ast.literal_eval(os.environ.get('BUILD_HISTORY_THROWAWAY_WHITELIST').encode('utf-8')) - history_repos=ast.literal_eval(os.environ.get('BUILD_HISTORY_WHITELIST').encode('utf-8')) +if os.environ.get('BUILD_HISTORY_THROWAWAY_WHITELIST') is not None: + ta_history_repos=ast.literal_eval(os.environ.get('BUILD_HISTORY_THROWAWAY_WHITELIST').encode('utf-8')) +if os.environ.get('BUILD_HISTORY_WHITELIST') is not None: + history_repos=ast.literal_eval(os.environ.get('BUILD_HISTORY_WHITELIST').encode('utf-8')) if repo in history_repos.keys() and \ self.getProperty("branch") in history_repos[self.getProperty("repository")]: # We keep this build history -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCHv2] nightly-world-lsb.conf: skip Publish step so artifacts don't overwrite nightly-world ones
Signed-off-by: Bill Randle --- v2: delete line, rather than commenting it out buildset-config.controller/nightly-world-lsb.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildset-config.controller/nightly-world-lsb.conf b/buildset-config.controller/nightly-world-lsb.conf index 4c9994c..472a714 100644 --- a/buildset-config.controller/nightly-world-lsb.conf +++ b/buildset-config.controller/nightly-world-lsb.conf @@ -21,6 +21,5 @@ steps: [{'SetDest':{}}, 'distro': 'poky-lsb'}}, {'CreateBBLayersConf': {'buildprovider' : 'yocto'}}, {'BuildImages': {'images': 'world'}}, -{'SendErrorReport': {}}, -{'PublishArtifacts': {'artifacts': ['ipk', 'rpm', 'deb']}}] +{'SendErrorReport': {}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] nightly-world-lsb.conf: skip Publish step so artifacts don't overwrite nightly-world ones
Signed-off-by: Bill Randle --- buildset-config.controller/nightly-world-lsb.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildset-config.controller/nightly-world-lsb.conf b/buildset-config.controller/nightly-world-lsb.conf index 4c9994c..f755920 100644 --- a/buildset-config.controller/nightly-world-lsb.conf +++ b/buildset-config.controller/nightly-world-lsb.conf @@ -21,6 +21,7 @@ steps: [{'SetDest':{}}, 'distro': 'poky-lsb'}}, {'CreateBBLayersConf': {'buildprovider' : 'yocto'}}, {'BuildImages': {'images': 'world'}}, -{'SendErrorReport': {}}, -{'PublishArtifacts': {'artifacts': ['ipk', 'rpm', 'deb']}}] +{'SendErrorReport': {}}] +# skip Publish step so artifacts don't overwrite nightly-world ones +#{'PublishArtifacts': {'artifacts': ['ipk', 'rpm', 'deb']}}] -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-autobuilder][PATCH] GetLayerVersion.py: set new layer version only if cmd was sucessful and not already set
Fixed a bug where GetLayerVersion set the layerversion to -1 when a meta-poky layer.conf was not found. Signed-off-by: Bill Randle --- .../autobuilder/buildsteps/GetLayerVersion.py | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/GetLayerVersion.py b/lib/python2.7/site-packages/autobuilder/buildsteps/GetLayerVersion.py index de5c203..3f167e8 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/GetLayerVersion.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/GetLayerVersion.py @@ -44,15 +44,12 @@ class GetLayerVersion(ShellCommand): ShellCommand.start(self) def commandComplete(self, cmd): -result = cmd.logs['stdio'].getText() -layerv= result.replace("LAYERVERSION_" + self.layerfile, "").replace("=","").replace(' ','').replace('"','').replace("'",'').strip() -if cmd.didFail(): - layerv = "-1" -if self.getProperty('layerversion_' + self.layerfile): -self.finished(SUCCESS) -else: -self.setProperty('layerversion_' + self.layerfile, layerv, "Setting Layer Version") -self.finished(SUCCESS) +if not cmd.didFail(): +result = cmd.logs['stdio'].getText() +layerv = result.replace("LAYERVERSION_" + self.layerfile, "").replace("=","").replace(' ','').replace('"','').replace("'",'').strip() +if not self.getProperty('layerversion_' + self.layerfile): +self.setProperty('layerversion_' + self.layerfile, layerv, "Setting Layer Version") +self.finished(SUCCESS) def getText(self, cmd, results): return ShellCommand.getText(self, cmd, results) -- 2.5.5 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH v2] poky-sanity.bbclass: update conf/templateconf.cfg for existing installations
V2 fixes a typo in the original version where it had POKY_BBLAYERS_CONF_VERS instead of POKY_BBLAYERS_CONF_VERSION in one place and also bumps the version number in the bblayers.conf.sample file. Updates of existing installations for the meta-yocto to meta-poky transition will update the bblayers.conf file, but not the templateconf.cfg file. This patch updates the template file to point to meta-poky/conf, if necessary. Fixes [YOCTO #9278] Signed-off-by: Bill Randle --- meta-poky/classes/poky-sanity.bbclass | 42 +++ meta-poky/conf/bblayers.conf.sample | 2 +- meta-poky/conf/layer.conf | 2 +- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/meta-poky/classes/poky-sanity.bbclass b/meta-poky/classes/poky-sanity.bbclass index 287a9e3..4add57e 100644 --- a/meta-poky/classes/poky-sanity.bbclass +++ b/meta-poky/classes/poky-sanity.bbclass @@ -3,10 +3,44 @@ python poky_update_bblayersconf() { current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION', True) or -1) latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION', True) or -1) +if current_version == -1 or latest_version == -1: +# one or the other missing => malformed configuration +raise NotImplementedError("You need to update bblayers.conf manually for this version transition") -# No version transitions here yet -raise NotImplementedError("You need to update bblayers.conf manually for this version transision") +success = True + +# check for out of date templateconf.cfg file +lines = [] +fn = os.path.join(d.getVar('TOPDIR', True), 'conf/templateconf.cfg') + +lines = sanity_conf_read(fn) +index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines) +if meta_yocto_line: +lines[index] = meta_yocto_line.replace('meta-yocto', 'meta-poky') +with open(fn, "w") as f: +f.write(''.join(lines)) +bb.note("Your conf/templateconf.cfg file was updated from meta-yocto to meta-poky") + +# add any additional layer checks/changes here + +if success: +current_version = latest_version +bblayers_fn = bblayers_conf_file(d) +lines = sanity_conf_read(bblayers_fn) +# sanity_conf_update() will erroneously find a match when the var name +# is used in a comment, so do our own here. The code below can be +# removed when sanity_conf_update() is fixed in OE-Core. +#sanity_conf_update(bblayers_fn, lines, 'POKY_BBLAYERS_CONF_VERSION', current_version) +index, line = sanity_conf_find_line(r'^POKY_BBLAYERS_CONF_VERSION', lines) +lines[index] = 'POKY_BBLAYERS_CONF_VERSION = "%d"\n' % current_version +with open(bblayers_fn, "w") as f: +f.write(''.join(lines)) +bb.note("Your conf/bblayers.conf has been automatically updated.") +if success: +return + +raise NotImplementedError("You need to update bblayers.conf manually for this version transition") } -# Prepend to ensure our function runs before the OE-Core one -BBLAYERS_CONF_UPDATE_FUNCS =+ "conf/bblayers.conf:POKY_BBLAYERS_CONF_VERSION:REQUIRED_POKY_BBLAYERS_CONF_VERSION:poky_update_bblayersconf" +# ensure our function runs after the OE-Core one +BBLAYERS_CONF_UPDATE_FUNCS += "conf/bblayers.conf:POKY_BBLAYERS_CONF_VERSION:REQUIRED_POKY_BBLAYERS_CONF_VERSION:poky_update_bblayersconf" diff --git a/meta-poky/conf/bblayers.conf.sample b/meta-poky/conf/bblayers.conf.sample index a371994..8b1cbdf 100644 --- a/meta-poky/conf/bblayers.conf.sample +++ b/meta-poky/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -POKY_BBLAYERS_CONF_VERSION = "1" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" diff --git a/meta-poky/conf/layer.conf b/meta-poky/conf/layer.conf index b5ffd9e..8b7b33d 100644 --- a/meta-poky/conf/layer.conf +++ b/meta-poky/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_yocto = "3" LAYERDEPENDS_yocto = "core" -REQUIRED_POKY_BBLAYERS_CONF_VERSION = "1" +REQUIRED_POKY_BBLAYERS_CONF_VERSION = "2" -- 2.5.0 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] add !meta-poky to .gitignore file
Another meta-yocto -> meta-poky transition item. Git complained on commit that files in meta-poky could not be committed. Signed-off-by: Bill Randle --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 036ad09..196952e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ hob-image-*.bb *.orig *.rej *~ +!meta-poky !meta-yocto !meta-yocto-bsp !meta-yocto-imported -- 2.5.0 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] poky-sanity.bbclass: update conf/templateconf.cfg for existing installations
Updates of existing installations for the meta-yocto to meta-poky transition will update the bblayers.conf file, but not the templateconf.cfg file. This patch updates the template file to point to meta-poky/conf, if necessary. Fixes [YOCTO #9278] Signed-off-by: Bill Randle --- meta-poky/classes/poky-sanity.bbclass | 42 +++ meta-poky/conf/layer.conf | 2 +- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/meta-poky/classes/poky-sanity.bbclass b/meta-poky/classes/poky-sanity.bbclass index 287a9e3..4add57e 100644 --- a/meta-poky/classes/poky-sanity.bbclass +++ b/meta-poky/classes/poky-sanity.bbclass @@ -3,10 +3,44 @@ python poky_update_bblayersconf() { current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION', True) or -1) latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION', True) or -1) +if current_version == -1 or latest_version == -1: +# one or the other missing => malformed configuration +raise NotImplementedError("You need to update bblayers.conf manually for this version transition") -# No version transitions here yet -raise NotImplementedError("You need to update bblayers.conf manually for this version transision") +success = True + +# check for out of date templateconf.cfg file +lines = [] +fn = os.path.join(d.getVar('TOPDIR', True), 'conf/templateconf.cfg') + +lines = sanity_conf_read(fn) +index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines) +if meta_yocto_line: +lines[index] = meta_yocto_line.replace('meta-yocto', 'meta-poky') +with open(fn, "w") as f: +f.write(''.join(lines)) +bb.note("Your conf/templateconf.cfg file was updated from meta-yocto to meta-poky") + +# add any additional layer checks/changes here + +if success: +current_version = latest_version +bblayers_fn = bblayers_conf_file(d) +lines = sanity_conf_read(bblayers_fn) +# sanity_conf_update() will erroneously find a match when the var name +# is used in a comment, so do our own here. The code below can be +# removed when sanity_conf_update() is fixed in OE-Core. +#sanity_conf_update(bblayers_fn, lines, 'POKY_BBLAYERS_CONF_VERSION', current_version) +index, line = sanity_conf_find_line(r'^POKY_BBLAYERS_CONF_VERSION', lines) +lines[index] = 'POKY_BBLAYERS_CONF_VERS = "%d"\n' % current_version +with open(bblayers_fn, "w") as f: +f.write(''.join(lines)) +bb.note("Your conf/bblayers.conf has been automatically updated.") +if success: +return + +raise NotImplementedError("You need to update bblayers.conf manually for this version transition") } -# Prepend to ensure our function runs before the OE-Core one -BBLAYERS_CONF_UPDATE_FUNCS =+ "conf/bblayers.conf:POKY_BBLAYERS_CONF_VERSION:REQUIRED_POKY_BBLAYERS_CONF_VERSION:poky_update_bblayersconf" +# ensure our function runs after the OE-Core one +BBLAYERS_CONF_UPDATE_FUNCS += "conf/bblayers.conf:POKY_BBLAYERS_CONF_VERSION:REQUIRED_POKY_BBLAYERS_CONF_VERSION:poky_update_bblayersconf" diff --git a/meta-poky/conf/layer.conf b/meta-poky/conf/layer.conf index b5ffd9e..8b7b33d 100644 --- a/meta-poky/conf/layer.conf +++ b/meta-poky/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_yocto = "3" LAYERDEPENDS_yocto = "core" -REQUIRED_POKY_BBLAYERS_CONF_VERSION = "1" +REQUIRED_POKY_BBLAYERS_CONF_VERSION = "2" -- 2.5.0 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto