OE4T update and refactor #18
Conversation
|
@TheYoctoJester I thought I could update our kirkstone branch to match https://github.com/mendersoftware/meta-mender-community/commits/kirkstone but it looks like your branch isn't rebased on the upstream and has different commit history. Do you want to rebase on upstream? I was originally thinking of targeting kirkstone-r35.x for work related to Jetpack 5 but I think given we can support both Jetpack 4 and 5 with your changes we may as well just use kirkstone. |
TheYoctoJester
force-pushed
the
oe4t-kirkstone-refactor
branch
from
327797d to
b043201
Compare
|
@dwalkes the missing rebase was an oversight, sorry. Should be fixed now. |
...a-jetpack5/recipes-bsp/u-boot/patches/0003-Integration-of-Mender-boot-code-into-U-Boot.patch
Outdated
Show resolved
Hide resolved
...mender-tegra/meta-mender-tegra-jetpack5/recipes-core/images/tegra-minimal-initramfs.bbappend
Outdated
Show resolved
Hide resolved
...er-tegra/meta-mender-tegra-jetpack5/recipes-core/initrdscripts/tegra-minimal-init_%.bbappend
Outdated
Show resolved
Hide resolved
meta-mender-tegra/meta-mender-tegra-jetpack5/scripts/manifest-tegra.xml
Outdated
Show resolved
Hide resolved
...gra/meta-mender-tegra-jetpack5/recipes-mender/tegra-state-scripts/tegra-state-scripts_1.0.bb
Show resolved
Hide resolved
meta-mender-tegra/meta-mender-tegra-jetpack5/scripts/test/README.md
Outdated
Show resolved
Hide resolved
meta-mender-tegra/meta-mender-tegra-jetpack5/templates/bblayers.conf.sample
Outdated
Show resolved
Hide resolved
meta-mender-tegra/meta-mender-tegra-jetpack5/templates/local.conf.append
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
@TheYoctoJester I've added some comments here. I'm wondering about whether we should avoid adding files we know won't be useful with Jetpack 5 before this merge or delete after the merge. Will wait for @madisongh to weigh in before I approve.
|
@dwalkes thanks a lot! Will go through those one by one once I'm back the office, presumably Monday or Tuesday. I personally would like to remove as much of the old stuff as possible and not drag it along. |
Remove all leftover u-boot references, as it is not supported anymore on Jetpack 5. See comment: OE4T#18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Remove outdated init scripts, see comment: OE4T#18 (comment) Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
State scripts referring to TX2 and Nano can be removed. See also comment: OE4T#18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
TheYoctoJester
force-pushed
the
oe4t-kirkstone-refactor
branch
from
b043201 to
6076afa
Compare
|
@dwalkes addressed the comments. One thing I also noticed is the |
|
@TheYoctoJester good catch, yes everything cboot should be out of the Jetpack 5 branch. |
...ecipes-bsp/tegra-binaries/mender-custom-flash-layout/jetson-nano-2gb-devkit/flash_mender.xml
Outdated
Show resolved
Hide resolved
...cipes-bsp/tegra-binaries/mender-custom-flash-layout/jetson-nano-devkit-emmc/flash_mender.xml
Outdated
Show resolved
Hide resolved
...k5/recipes-bsp/tegra-binaries/mender-custom-flash-layout/jetson-nano-devkit/flash_mender.xml
Outdated
Show resolved
Hide resolved
...ack5/recipes-bsp/tegra-binaries/mender-custom-flash-layout/jetson-nano-emmc/flash_mender.xml
Outdated
Show resolved
Hide resolved
...5/recipes-bsp/tegra-binaries/mender-custom-flash-layout/jetson-nano-qspi-sd/flash_mender.xml
Outdated
Show resolved
Hide resolved
...gra-jetpack5/recipes-bsp/tegra-binaries/mender-custom-flash-layout/tegra186/flash_mender.xml
Outdated
Show resolved
Hide resolved
This was an unintentional duplication from the mender-base.yml kas include, and did set the revision floating on a release branch. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
The Readme file and repo scripts for meta-mender-tegra still referred to the dunfell and zeus releases. As we now provide kas configurations for all supported boards in this layer, note those in the Readme and remove the outdated information. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
…ne-next meta-mender-tegra: kas related fixes and updates
Remove all leftover u-boot references, as it is not supported anymore on Jetpack 5. See comment: OE4T#18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Remove outdated init scripts, see comment: OE4T#18 (comment) Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
State scripts referring to TX2 and Nano can be removed. See also comment: OE4T#18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
In Jetpack5, cboot is not used anymore. Remove the appends which placed an additional dependency on machine-id. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
The TX2 and Nano platforms are not supported on Jetpack 5 anymore, so the respective flash layouts can be removed. Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
TheYoctoJester
force-pushed
the
oe4t-kirkstone-refactor
branch
from
fc6ada7 to
6f963ae
Compare
|
@dwalkes cleaned up and rebased :-) |
| FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | ||
|
|
||
| SRC_URI += "file://0007-runtime-access-for-KernelCommandLine-efivar.patch;patchdir=.." | ||
| SRC_URI += "file://0008-enable-rootfs-redundancy.patch;patchdir=.." |
There was a problem hiding this comment.
Instead of patch we should use overlays
There was a problem hiding this comment.
Instead of patch we should use overlays
Can you provide the change? This is directly based off the naroj/dev3 branch.
There was a problem hiding this comment.
Yes, I know and I will. I marked this line quickly to not forget to do this. Sorry for confusion
There was a problem hiding this comment.
@maciej-narojczyk if this is working for you the same way it was on your previous branch let's merge and you can propose additional PRs for additional changes.
There was a problem hiding this comment.
Looks good to me, and thanks @TheYoctoJester and @maciej-narojczyk for getting this started.
|
I see that kas build kas/jetson-agx-orin-devkit.yml is building core-image-minimal should we build demo-image-base instead ? |
|
@maciej-narojczyk the default is |
|
@dwalkes as you approved, do you want to take this into the OE4T fork first and then PR back to the Mender one, or should I put that one directly in? |
| # these two classes only work as intended when being inherited in the | ||
| # OE4t setup-env.sh style environment, as they modify bblayers.conf | ||
| # and expect additional information on the host. | ||
| INHERIT:remove = "tegra-support-sanity distro_layer_buildinfo" |
There was a problem hiding this comment.
we should add this line here
EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
without it i couldnt login at all :)
what is login and password then ?
|
I got a working mender update with this PR and my local tweaks so it works. |
I was originally thinking we'd stage all the Jetpack 5 changes, including the refactor to move Jetpack 4 into a subdirectory, in this OE4T repository, and only merge upstream when we've got Jetpack 5 support complete. I'm open to other suggestions though. If we needed to make any changes to Jetpack 4 support this would be another reason to merge now. Perhaps the new kas changes might be a place where we'd want to make changes for Jetpack 4 which also go upstream.
I think demo-image-base probably gets a bit more love and is more functional but there's no reason I know about which means core-image-minimal won't work. |
Remove all leftover u-boot references, as it is not supported anymore on Jetpack 5. See comment: #18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Remove outdated init scripts, see comment: #18 (comment) Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
State scripts referring to TX2 and Nano can be removed. See also comment: #18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
|
Merging here for the time being |
| @@ -0,0 +1,15 @@ | |||
| diff --git edk2-tegra.a/edk2-nvidia/Silicon/NVIDIA/Drivers/BootChainDxe/BootChainDxe.c edk2-tegra.b/edk2-nvidia/Silicon/NVIDIA/Drivers/BootChainDxe/BootChainDxe.c | |||
There was a problem hiding this comment.
@maciej-narojczyk not sure if you are following the progress in #19 (comment) but I'm curious if you could shed any light there on the necessity/purpose of this patch and 0007-runtime-access-for-KernelCommandLine-efivar.patch
Remove all leftover u-boot references, as it is not supported anymore on Jetpack 5. See comment: OE4T#18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Remove outdated init scripts, see comment: OE4T#18 (comment) Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
State scripts referring to TX2 and Nano can be removed. See also comment: OE4T#18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Remove all leftover u-boot references, as it is not supported anymore on Jetpack 5. See comment: OE4T#18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
Remove outdated init scripts, see comment: OE4T#18 (comment) Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
State scripts referring to TX2 and Nano can be removed. See also comment: OE4T#18 (comment) Signed-off-by: Josef Holzmayr <jester@theyoctojester.info>
This PR brings the current state of the layers
kirkstonebranch, which also includes thekasbased configurations. This specific branch contains the refactoring of themeta-mender-tegradirectory from a layer into a directory containing layers for Jetpack 4 and Jetpack 5 based platforms, respectively.The included state of the Jetpack 5 incarnation is directly based on #17 to serve as a base for the ongoing development.