Hello, Le 28/10/2023 à 10:27, Richard Purdie a écrit : > Hi David, > > On Thu, 2023-10-26 at 15:03 +0200, David Pierret wrote: >> - Modify the setup-auh to use repositories cloned by the auto-builder. >> Manage the case where meta-openembedded is not used. >> >> - Modify the run-auh to manage the optional additional layer. >> Only 1 layer can be provided. >> >> - Add auh-meta-openembedded job with 1 step per layer. >> >> Signed-off-by: David Pierret <david.pier...@smile.fr> >> --- >> config.json | 102 ++++++++++++++++++++++++++++++++++++++++++++-- >> scripts/run-auh | 39 ++++++++++++------ >> scripts/setup-auh | 34 ++++++++++------ >> 3 files changed, 146 insertions(+), 29 deletions(-) > > This took a while to review. Firstly, this really should be written as > a set of commits with incremental changes. > > For example, changing the script to use poky from the autobuilder > checkout instead of the local clone is one logical change. We could > take and review/merge that independently of the other changes. > > Another logical independent change is using auto-upgrade-helper from > the checkout of the autobuilder. That did highlight an issue that the > autobuilder does not provide a checkout of that repository.> > With that and this work in mind I added auh-meta-oe here: > > https://git.yoctoproject.org/yocto-autobuilder2/commit/?id=47c0119b6e87f920566d2176793ef8d982cf31e2 > > and then added the auto-upgrade-helper repo here: > > https://git.yoctoproject.org/yocto-autobuilder2/commit/?id=854a60ce8bf8ce0feec370bc6782cc12aa1e29a5 > > which then means this patch is closer to working. > > I had to make some tweaks on top of the patch to make it work: > > https://git.yoctoproject.org/yocto-autobuilder-helper/commit/?h=master-next&id=673745f473024020ed9efece26462e8c884dc819 > > where I found that: > > * poky in the AB context is $1/.. since it is the top level > container of the layers > * meta-openembedded is located at ${HELPERBUILDDIR}/../meta-openembedded > * we still need to source the build env script. The AB could be > configured to do that for us but currently isn't. > * we need to trim the machine_list down as mentioned > * the naming we're using is auh-meta-oe, not auh-meta-openembedded > * I've temporarily configured to use the test-list so we don't > send lots of mail to all users > * layer dependencies were missing in ADDLAYER. I hate having to do > that but it is is what it is right now I've just sent a reworked version of this patch : https://lists.yoctoproject.org/g/yocto/message/61579 [yocto-autobuilder-helper][PATCH v4 0/2] Extend auto-upgrade helper to meta-openembedded https://lists.yoctoproject.org/g/yocto/message/61580 [yocto-autobuilder-helper][PATCH v4 1/2] config.json: Move AUH from custom scripts to config.json https://lists.yoctoproject.org/g/yocto/message/61581 [yocto-autobuilder-helper][PATCH v4 2/2] config.json: Extend AUH to meta-openembedded layers
While moving stuff from the scripts to config.json, I found the scripts to be mostly redundant and choose to remove them. I've took most of RP's tweaks but not the test-list change. I hope this one will be easier to review. > With that, we get this "successful" build: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/159/builds/5 > > which shows the exit code handling isn't great but probably deliberate > to avoid autobuilder errors. > > This gets us to the point where the code in the upgrade helper itself > needs the layer support changing. > > Since I've now had to look into that code, it seems the layer options > are entirely missing from the commandline options parser. I'd strongly > suggest dropping layer_machines variable and just use the machines > value in all cases. > > "layer-mode" seems pointless as you can determine if we're in "layer > mode" if a layer is specified on the commandline (which needs adding). > > I'm hoping you could use the layer overrides to be able to identify > which recipes to upgrade. I did not find how to use layer overrides here... Maybe once AUH is more integrated into oe-core as RP suggested on IRC? Regards, -- Yoann Congal Smile ECS - Tech Expert
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61582): https://lists.yoctoproject.org/g/yocto/message/61582 Mute This Topic: https://lists.yoctoproject.org/mt/102199062/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
