Merge upstream branch kirkstone #21
Conversation
pyc and pyo files have no relevance for this repository, so they can be removed from the gitignore file. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
kas builds are best done in a subdirectory of the repository holding the configuration. To provide an easy way for leaving those out of git, add a catch-all my-* prefix to the gitignore file. Properly using this will be documented in an upcoming addition to the Readme. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
The build setups for board integrations are being moved from the Google repo tool to the kas tool, which is a solutions specifically tailored to the requirements of Yocto-based builds. This adds instructions to both use and submit kas-based build configurations, as well as documents the repo deprecation. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
The wiki section of this Github repository holds a page on community maintainers. As it is outdated and technically irrelevant, remove it. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
The layer names given in the Readme were outdated and referencing layers that did mostly not exist anymore. Replace them with currently active layers. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
…herry-picks sync kirkstone repo status with master
Add build configurations for the following board (types): - intel-corei7-64 - intel-corei7-64-sdcard - intel-nuc-ssd Those differ only in their default setting for the MENDER_STORAGE_DEVICE variable, and should be easy to adapt for other UEFI-based x86 boards. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
After repeated passing builds, move the following boards out of experimental state: - cubox-i - rock-pi-e - apalis-im8, - apalis-imx8-boot2qt Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
After repeated failed builds, move the colibri-imx6ull board to experimental state. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Update the base layers - openembedded-core - bitbake - meta-openembedded - meta-mender to their latest kirkstone commits. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
kas: updates and maintenance
The machine type was a copy error from the raspberrypi4.yml file. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
fix: kas: machine type for raspberrypi4-64
Changelog: Title Ticket: None Signed-off-by: TheYoctoJester <jester@theyoctojester.info>
kas: add caching for metadata layers from git
kas: fixes for caching
The meta-mender-client-only layer enables the Mender client to be installed and operated without the full integration in place. Changelog: Title Ticket: None Signed-off-by: mender <mender@shai-hulud.ct.mender>
client-only: add layer
Signed-off-by: Sebastian Saueressig <S.Saueressig@sotec.eu>
Update README.md
The x86-virtual machine shows how to build a vmdk image which can be booted on desktop virtualizations such as VirtualBox. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
feat: kas: add x86-virtual machine
Remove 3g_defconfig patch as defconfig no longer exists. Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com>
u-boot-boundary: update nitrogen8m Mender support
Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info> (cherry picked from commit ef58a16)
chore: bump github action checkout to v4
This allows for kas configuration files to be located in subdirectories of the main kas directory. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info> (cherry picked from commit ba27503) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Included layers: - openembedded-core - bitbake - meta-openembeddeA - meta-menderd - meta-raspberrypi Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Reduce storage usage by the Github Action. Keeping the work directories is helpful for debugging, but this isn't done in the GH Action runner. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
kas: version bump of base layers and build optimisations
Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
fix: kas: use poky as base distribution for all builds
Signed-off-by: Drew Moseley <drew@moseleynet.net>
toradex: Fix incorrect override syntax with mender-grub.
Signed-off-by: Markus Heß <hess@3dvisionlabs.com>
…nder4 tegra: add bbappend for mender 4
root bootarg was duplicated, causing issues in the update process. Fixed with updated patch. Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com>
Details on the Nitrogen8M Mini SMARC and Nitrogen8M Plus SMARC found here: https://www.ezurio.com/product/nitrogen8m-mini-smarc https://www.ezurio.com/system-on-module/nxp-imx8/nitrogen8m-plus-smarc Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com>
u-boot-boundary: add Nitrogen8M Mini SMARC and Nitrogen8M Plus SMARC support and fix bootscript
The SWU Update Module provides a simple wrapper around the SWUpdate client for artifact installation. This commit add the recipe providing the canonical Update Module and artifact generation scripts. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Add a kas configuration file and demo layer to build an image for the qemuarm64 target to showcase the SWU Update Module. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Build the qemuarm64-swupdate demo as part of the default build workflow. Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Add SWU Update Module and demo image
|
Thanks @TheYoctoJester - so is the idea that I should just hard reset the OE4T:kirkstone branch to this branch and then we'll rebase #19 on top of this one? |
|
Hi @dwalkes, if a hard branch reset is an acceptable option, then I actually have a different proposal. Didn't consider it first hand because I assumed breaking existing checkouts is out of bounds. In such a case, I would prefer to take the current state of meta-mender-tegra-jetpack4 and meta-mender-tegra-jetpack5, and rebase it on top of the current state of meta-mender-tegra. This can either be your reset-to target and then sent upstream, or I put it into upstream and you reset to that. Then we can rebase the Orin PR on top of it, and can create a clear line of development. Such a strategy could definitely clean up the history and avoid ugly merges, but at the cost of said hard reset and broken checkout on the branch name. Thoughts? Should I prepare such a branch? |
The only purpose of the oe4t:kirkstone branch is to stage changes upstream which aren't ready to go upstream so I think it's fine to rebase.
I'd prefer reset of OE4T to target since my thought is there's no need to upstream until we have Jetpack 5 changes at #19 ready to merge.
I don't think we need to worry about others basing on oe4t:kirkstone in it's previous state - I think we've consistently said this is just for staging changes upstream. So having said that would you like me to hard-reset OE4T:kirkstone to https://github.com/mendersoftware/meta-mender-community/tree/kirkstone now? |
|
Hi @dwalkes, nice, that's the perfect way forward. I have already bumped https://github.com/mendersoftware/meta-mender-community/tree/kirkstone with the current state of OE4T, so yeah, please hard-reset to that one. |
|
@TheYoctoJester done, thanks! |
As the OE4T state with Jetpack4/Jetpack5-split have diverged from the upstream state at https://github.com/mendersoftware/meta-mender-community, do a merge this way first to prepare for contributing back.