Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build issues for Scarthgap with Jetpack 6 on Nvidia Orin Devices #424

Open
wants to merge 19 commits into
base: scarthgap
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kas/demos/qemuarm64-client-only.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
header:
version: 11
version: 14
includes:
- kas/include/mender-base.yml

Expand Down
2 changes: 1 addition & 1 deletion kas/demos/raspberrypi4-64-app-updates.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
header:
version: 11
version: 14
includes:
- kas/raspberrypi4-64.yml

Expand Down
2 changes: 1 addition & 1 deletion kas/include/mender-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repos:

meta-mender:
url: https://github.com/mendersoftware/meta-mender.git
commit: 61b6f2298bad965cf6be41ebf11e62e4c314512f
commit: 2f70dbad1441055c299332b7ef33dfe1e4f50c1c
layers:
meta-mender-core:

Expand Down
2 changes: 1 addition & 1 deletion kas/include/tegra-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ local_conf_header:
# 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"
INHERIT:remove = "tegra-support-sanity distro_layer_buildinfo"
INHERIT += "tegra-mender-setup"
MENDER_FEATURES_ENABLE:append = " mender-growfs-data"
MENDER_FEATURES_DISABLE:append = " mender-uboot"
Expand Down
6 changes: 3 additions & 3 deletions kas/include/tegra-jetpack6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ header:
repos:
meta-tegra:
# refers to the scarthgap branch
commit: b20cff753ff0ffc24121cb35d2e2d218c2d26cf3
commit: 20f761d3e072441ba1ee252e0b30d821395c4d7c
meta-tegra-community:
# refers to the scarthgap branch
commit: 68f0520b73312ecc6767252de569679c374afc73
commit: 1ec483599ebd16967468e71012f653ad2fa045cc
meta-tegrademo:
# refers to the scarthgap branch
commit: 7d54c8f932b9527255e9b871b662beaafca7fa7b
commit: 1457cc45939f72aef097cb5799a7fd9120bab332

meta-mender-community:
layers:
Expand Down
11 changes: 11 additions & 0 deletions kas/jetson-agx-orin-devkit-64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
header:
version: 14
includes:
- kas/include/mender-full.yml
- kas/include/tegra-jetpack6.yml

machine: p3737-0000-p3701-0005

local_conf_header:
AB-upgrades: |
USE_REDUNDANT_FLASH_LAYOUT_DEFAULT = "1"
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ CAPTARGET="/boot/efi/EFI/UpdateCapsule/TEGRA_BL.Cap"

if [ -f "$CAPTARGET" ]; then
rm "$CAPTARGET"
fi
fi