Pyro cleanup

[jandryuk]

This PR cotains two small cleanups after the pyro uprev. Remove needed variables and ensure we reference pyro in our config going forward.

[eric-ch]

@jandryuk Could you PR against stable-8 as well please?

[jandryuk]

For stable-8, you want the commit from the submodule, d855c624f32c5e599bf27e06cb8f5b25b3aae12d ?

Looking at example-config again, for both master and stable-8, there are two entries for META_SELINUX_TAG. One is active and set to master. The second one is commented out and set to jethro. I didn't notice this earlier. Should the second commented out one just be dropped? Should stable-8 set the uncommented tag to the above hash?

[jandryuk]

XENCLIENT_TAG=oe-upgrade-pyro and META_OPENXT_HASKELL_PLATFORM_TAG=oe-upgrade-pyro are set in example-config. I think I didn't notice this on my first pyro build since I just updated the submodules. I'll have to look at all this more on Monday.

[jean-edouard]

Built here: http://openxt-builder.ainfosec.com:8010/builders/openxt/builds/1452

[eric-ch]

@jandryuk Sorry I never replied here...

For stable-8

It match the git submodule revisions from stable-8 branch, I have:

 eddab52a4e7c49bfcdc2c26004d0bc777a1e5c25 build/repos/bitbake
 42072ef80e0a3dfc65188778b471f0db9264520e build/repos/meta-intel
 0c27b120aa508e4bb41394b8dd3645949a611128 build/repos/meta-java
 dfbdd28d206a74bf264c2f7ee0f7b3e5af587796 build/repos/meta-openembedded
 d855c624f32c5e599bf27e06cb8f5b25b3aae12d build/repos/meta-selinux
 45ad257a1e4a6707c376d2f7eb26c3c8bdf03607 build/repos/meta-virtualization
 5e4b4874c4d81b62a32b3836d1c22ecc4c5479c6 build/repos/openembedded-core

XENCLIENT_TAG=oe-upgrade-pyro

That is a silly commit from my part... Sorry it was the name of the dev branch I was using and I must have pushed it without realizing.

[jandryuk]

I'm not particularly familiar with the build system and its configuration. I tend to get it setup once and then just manually change repo revisions, so I have some questions.

We have two build flavors: build-scripts and do_build.sh. build-scripts uses git submodules for repo configuration. do_build.sh uses setup_build-next.sh and .config to checkout repos. .config usually comes from example-config.

Is this right?

Looking in openxt.git, setup_build is unused and can be removed?

setup_build was updated with the pyro uprev, but I'm thinking example-config should change to be closer to the updates in that. Outside the scope of this change, but do we want to standardize on a single option for the repos?

[jandryuk]

I started working on converting setup_build-next.sh to just use git submodules. Is there a reason why meta-openxt-{haskell,ocaml}-platform aren't included in the submodules? Same for xenclient-oe? It would simplify things to have a unified way of specifying branches. My approach would use submodules if nothing is defined, but allow the repo and/or tag to override the checked out version.

[eric-ch]

[...]Is this right?

I think so:

• example-config is a .config example for do_build.sh AFAIK.
• do_build.sh does not use git submodule, but setup_build-next.sh script; which in turn feeds from the <name-of-the-repo>-{_TAG,_REPO} variables presumed to be defined in .config, with the exception of XENCLIENT_REPO/XENCLIENT_TAG, BITBAKE_REPO/BB_BRANCH and OE_BRANCH that will be used by default if <name-of-the-repo>_TAG is not defined (tedious... also BRANCH looks entirely cosmetic which is very misleading...).
• setup_build seems to be dead indeed. There is quite a lot of bitrot all around do_build.sh...

Is there a reason why meta-openxt-{haskell,ocaml}-platform aren't included in the submodules

The OpenXT based repos are not included in the submodules, but configured through the .layer files (oe/build.sh will iterate over ${openxt_layers}). @jean-edouard correct?

[jean-edouard]

Built here: http://openxt-builder.ainfosec.com:8010/builders/openxt/builds/1474

[eric-ch]

@jandryuk Do you have a stable-8 version of this?

Will merge soon.

[jandryuk]

I'll make a stable-8 version. I PR for master first, so it can be reviewed and changed as necessary. Then once it's finalized, I can backport, cherry-pick or make a new version as necessary for stable-8.

[eric-ch]

@jandryuk Ack, thanks again for fixing this!