From c05b6fd774aef2dc0665787a86d4fb099f9b7943 Mon Sep 17 00:00:00 2001 From: Josef Holzmayr Date: Tue, 30 Jul 2024 16:52:20 +0200 Subject: [PATCH 01/17] chore: kas: add tegra-jetpack5 based builds Port over the kas includes as well as the boards from kirkstone: - jetson-agx-orin-devkit.yml - jetson-agx-xavier-devkit.yml - jetson-orin-nano-devkit.yml Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr Signed-off-by: Zachary T Welch --- .github/workflows/build.yml | 5 ++++- kas/include/mender-base.yml | 2 +- kas/include/tegra-base.yml | 32 ++++++++++++++++++++++++++++++++ kas/include/tegra-jetpack5.yml | 28 ++++++++++++++++++++++++++++ kas/jetson-agx-orin-devkit.yml | 11 +++++++++++ kas/jetson-agx-xavier-devkit.yml | 11 +++++++++++ kas/jetson-orin-nano-devkit.yml | 12 ++++++++++++ 7 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 kas/include/tegra-base.yml create mode 100644 kas/include/tegra-jetpack5.yml create mode 100644 kas/jetson-agx-orin-devkit.yml create mode 100644 kas/jetson-agx-xavier-devkit.yml create mode 100644 kas/jetson-orin-nano-devkit.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3edb65d..d639bd7d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,10 @@ jobs: vexpress-qemu-flash, x86-virtual, beaglebone-uboot, - olimex-imx8mp-evb + olimex-imx8mp-evb, + jetson-agx-orin-devkit, + jetson-agx-xavier-devkit, + jetson-orin-nano-devkit ] experimental: [false] subpath: [.] diff --git a/kas/include/mender-base.yml b/kas/include/mender-base.yml index 35f99613..35e7f700 100644 --- a/kas/include/mender-base.yml +++ b/kas/include/mender-base.yml @@ -20,7 +20,7 @@ repos: meta-mender: url: https://github.com/mendersoftware/meta-mender.git - commit: 4302cb71a7f8a0ffb09f47e41f4ce1df3e812419 + commit: 21b8bd76e92391665ad2cf52fa1def65ba97c7a2 layers: meta-mender-core: diff --git a/kas/include/tegra-base.yml b/kas/include/tegra-base.yml new file mode 100644 index 00000000..ccea9d73 --- /dev/null +++ b/kas/include/tegra-base.yml @@ -0,0 +1,32 @@ +header: + version: 11 + +repos: + meta-tegra: + url: https://github.com/OE4T/meta-tegra.git + meta-tegra-community: + url: https://github.com/OE4T/meta-tegra-community.git + meta-tegrademo: + url: https://github.com/OE4T/tegra-demo-distro.git + layers: + layers/meta-tegra-support: + layers/meta-demo-ci: + layers/meta-tegrademo: + + meta-openembedded: + layers: + meta-filesystems: + meta-networking: + meta-python: + + meta-virtualization: + url: https://git.yoctoproject.org/meta-virtualization.git + +distro: tegrademo + +local_conf_header: + tegra: | + # 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" \ No newline at end of file diff --git a/kas/include/tegra-jetpack5.yml b/kas/include/tegra-jetpack5.yml new file mode 100644 index 00000000..5cb6bb37 --- /dev/null +++ b/kas/include/tegra-jetpack5.yml @@ -0,0 +1,28 @@ +header: + version: 11 + includes: + - kas/include/tegra-base.yml + +repos: + meta-tegra: + refspec: 972488415a80afebbd652a983a46c2641eed99ad + meta-tegra-community: + refspec: 865561b6d3ba6607a814354c122c91422df720d5 + meta-tegrademo: + refspec: 2d9319ba0c24fb46937a742d78fc046983edb325 + + meta-virtualization: + refspec: 6a80f140e387621f62964209a2e07d3bcfb125ce + + meta-mender-community: + layers: + meta-mender-tegra/meta-mender-tegra-jetpack5: + +local_conf_header: + tegra-jetpack5: | + INHERIT += "tegra-mender-setup" + MENDER_FEATURES_ENABLE:append = " mender-growfs-data" + MENDER_FEATURES_DISABLE:append = " mender-uboot" + IMAGE_FSTYPES:tegra = "tegraflash mender dataimg" + IMAGE_FSTYPES:pn-tegra-minimal-initramfs:tegra = "${INITRAMFS_FSTYPES}" + IMAGE_FSTYPES:pn-tegra-initrd-flash-initramfs:tegra = "${TEGRA_INITRD_FLASH_INITRAMFS_FSTYPES}" \ No newline at end of file diff --git a/kas/jetson-agx-orin-devkit.yml b/kas/jetson-agx-orin-devkit.yml new file mode 100644 index 00000000..ae8a16a6 --- /dev/null +++ b/kas/jetson-agx-orin-devkit.yml @@ -0,0 +1,11 @@ +header: + version: 11 + includes: + - kas/include/mender-full.yml + - kas/include/tegra-jetpack5.yml + +machine: jetson-agx-orin-devkit + +local_conf_header: + AB-upgrades: | + USE_REDUNDANT_FLASH_LAYOUT_DEFAULT = "1" \ No newline at end of file diff --git a/kas/jetson-agx-xavier-devkit.yml b/kas/jetson-agx-xavier-devkit.yml new file mode 100644 index 00000000..9d7408c1 --- /dev/null +++ b/kas/jetson-agx-xavier-devkit.yml @@ -0,0 +1,11 @@ +header: + version: 11 + includes: + - kas/include/mender-full.yml + - kas/include/tegra-jetpack5.yml + +machine: jetson-agx-xavier-devkit + +local_conf_header: + AB-upgrades: | + USE_REDUNDANT_FLASH_LAYOUT_DEFAULT = "1" diff --git a/kas/jetson-orin-nano-devkit.yml b/kas/jetson-orin-nano-devkit.yml new file mode 100644 index 00000000..9fe14707 --- /dev/null +++ b/kas/jetson-orin-nano-devkit.yml @@ -0,0 +1,12 @@ +header: + version: 11 + includes: + - kas/include/mender-full.yml + - kas/include/tegra-jetpack5.yml + +machine: jetson-orin-nano-devkit + +local_conf_header: + AB-upgrades: | + UBOOT_EXTLINUX = "1" + USE_REDUNDANT_FLASH_LAYOUT_DEFAULT = "1" From 5f54f4e30756319ae0de424e8ed5febabdbb6a86 Mon Sep 17 00:00:00 2001 From: Josef Holzmayr Date: Thu, 1 Aug 2024 14:30:32 +0200 Subject: [PATCH 02/17] chore: kas: clean up tegra-{jetpack5/jetpack6} Changelog: Title Ticket: None Signed-off-by: Josef Holzmayr Signed-off-by: Zachary T Welch --- kas/demos/qemuarm64-client-only.yml | 2 +- kas/demos/raspberrypi4-64-app-updates.yml | 2 +- kas/include/tegra-base.yml | 14 ++++++++++++-- kas/include/tegra-jetpack5.yml | 23 +++++++---------------- kas/include/tegra-jetpack6.yml | 19 +++++++++++++++++++ kas/jetson-agx-orin-devkit.yml | 4 ++-- kas/jetson-agx-xavier-devkit.yml | 2 +- kas/jetson-orin-nano-devkit.yml | 4 ++-- 8 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 kas/include/tegra-jetpack6.yml diff --git a/kas/demos/qemuarm64-client-only.yml b/kas/demos/qemuarm64-client-only.yml index 37b3b38b..21c3fb0a 100644 --- a/kas/demos/qemuarm64-client-only.yml +++ b/kas/demos/qemuarm64-client-only.yml @@ -1,5 +1,5 @@ header: - version: 11 + version: 14 includes: - kas/include/mender-base.yml diff --git a/kas/demos/raspberrypi4-64-app-updates.yml b/kas/demos/raspberrypi4-64-app-updates.yml index 48cbde83..84e71cb2 100644 --- a/kas/demos/raspberrypi4-64-app-updates.yml +++ b/kas/demos/raspberrypi4-64-app-updates.yml @@ -1,5 +1,5 @@ header: - version: 11 + version: 14 includes: - kas/raspberrypi4-64.yml diff --git a/kas/include/tegra-base.yml b/kas/include/tegra-base.yml index ccea9d73..a2c536cf 100644 --- a/kas/include/tegra-base.yml +++ b/kas/include/tegra-base.yml @@ -1,7 +1,10 @@ header: - version: 11 + version: 14 repos: + meta-mender: + commit: 872219dfd87113345073160367edc33471795a3b # this one fixes the persistent-id for now! + meta-tegra: url: https://github.com/OE4T/meta-tegra.git meta-tegra-community: @@ -21,6 +24,7 @@ repos: meta-virtualization: url: https://git.yoctoproject.org/meta-virtualization.git + commit: 6a80f140e387621f62964209a2e07d3bcfb125ce distro: tegrademo @@ -29,4 +33,10 @@ 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" \ No newline at end of file + 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" + IMAGE_FSTYPES:tegra = "tegraflash mender dataimg" + IMAGE_FSTYPES:pn-tegra-minimal-initramfs:tegra = "${INITRAMFS_FSTYPES}" + IMAGE_FSTYPES:pn-tegra-initrd-flash-initramfs:tegra = "${TEGRA_INITRD_FLASH_INITRAMFS_FSTYPES}" \ No newline at end of file diff --git a/kas/include/tegra-jetpack5.yml b/kas/include/tegra-jetpack5.yml index 5cb6bb37..b33e215d 100644 --- a/kas/include/tegra-jetpack5.yml +++ b/kas/include/tegra-jetpack5.yml @@ -1,28 +1,19 @@ header: - version: 11 + version: 14 includes: - kas/include/tegra-base.yml repos: meta-tegra: - refspec: 972488415a80afebbd652a983a46c2641eed99ad + # refers to the scarthgap-l4t-r35.x branch + commit: 972488415a80afebbd652a983a46c2641eed99ad meta-tegra-community: - refspec: 865561b6d3ba6607a814354c122c91422df720d5 + # refers to the scarthgap-l4t-r35.x branch + commit: 865561b6d3ba6607a814354c122c91422df720d5 meta-tegrademo: - refspec: 2d9319ba0c24fb46937a742d78fc046983edb325 - - meta-virtualization: - refspec: 6a80f140e387621f62964209a2e07d3bcfb125ce + # refers to the scarthgap-l4t-r35.x branch + commit: 2d9319ba0c24fb46937a742d78fc046983edb325 meta-mender-community: layers: meta-mender-tegra/meta-mender-tegra-jetpack5: - -local_conf_header: - tegra-jetpack5: | - INHERIT += "tegra-mender-setup" - MENDER_FEATURES_ENABLE:append = " mender-growfs-data" - MENDER_FEATURES_DISABLE:append = " mender-uboot" - IMAGE_FSTYPES:tegra = "tegraflash mender dataimg" - IMAGE_FSTYPES:pn-tegra-minimal-initramfs:tegra = "${INITRAMFS_FSTYPES}" - IMAGE_FSTYPES:pn-tegra-initrd-flash-initramfs:tegra = "${TEGRA_INITRD_FLASH_INITRAMFS_FSTYPES}" \ No newline at end of file diff --git a/kas/include/tegra-jetpack6.yml b/kas/include/tegra-jetpack6.yml new file mode 100644 index 00000000..392353a6 --- /dev/null +++ b/kas/include/tegra-jetpack6.yml @@ -0,0 +1,19 @@ +header: + version: 14 + includes: + - kas/include/tegra-base.yml + +repos: + meta-tegra: + # refers to the scarthgap branch + commit: b20cff753ff0ffc24121cb35d2e2d218c2d26cf3 + meta-tegra-community: + # refers to the scarthgap branch + commit: 68f0520b73312ecc6767252de569679c374afc73 + meta-tegrademo: + # refers to the scarthgap branch + commit: 7d54c8f932b9527255e9b871b662beaafca7fa7b + + meta-mender-community: + layers: + meta-mender-tegra/meta-mender-tegra-jetpack5: diff --git a/kas/jetson-agx-orin-devkit.yml b/kas/jetson-agx-orin-devkit.yml index ae8a16a6..33247cfe 100644 --- a/kas/jetson-agx-orin-devkit.yml +++ b/kas/jetson-agx-orin-devkit.yml @@ -1,8 +1,8 @@ header: - version: 11 + version: 14 includes: - kas/include/mender-full.yml - - kas/include/tegra-jetpack5.yml + - kas/include/tegra-jetpack6.yml machine: jetson-agx-orin-devkit diff --git a/kas/jetson-agx-xavier-devkit.yml b/kas/jetson-agx-xavier-devkit.yml index 9d7408c1..99a3c95c 100644 --- a/kas/jetson-agx-xavier-devkit.yml +++ b/kas/jetson-agx-xavier-devkit.yml @@ -1,5 +1,5 @@ header: - version: 11 + version: 14 includes: - kas/include/mender-full.yml - kas/include/tegra-jetpack5.yml diff --git a/kas/jetson-orin-nano-devkit.yml b/kas/jetson-orin-nano-devkit.yml index 9fe14707..ee099808 100644 --- a/kas/jetson-orin-nano-devkit.yml +++ b/kas/jetson-orin-nano-devkit.yml @@ -1,8 +1,8 @@ header: - version: 11 + version: 14 includes: - kas/include/mender-full.yml - - kas/include/tegra-jetpack5.yml + - kas/include/tegra-jetpack6.yml machine: jetson-orin-nano-devkit From 93a9dd9effa5c71306f13bbad8e5838f6af00743 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Wed, 14 Aug 2024 14:26:56 -0700 Subject: [PATCH 03/17] tegra-mender-setup: make a global class Signed-off-by: Zachary T Welch --- .../{classes => classes-global}/tegra-mender-setup.bbclass | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-mender-tegra/{classes => classes-global}/tegra-mender-setup.bbclass (100%) diff --git a/meta-mender-tegra/classes/tegra-mender-setup.bbclass b/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass similarity index 100% rename from meta-mender-tegra/classes/tegra-mender-setup.bbclass rename to meta-mender-tegra/classes-global/tegra-mender-setup.bbclass From 5bf350c53e030cc48de9140adebd17af97b51fba Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 9 Aug 2024 10:57:15 -0700 Subject: [PATCH 04/17] tegra-mender-setup: use l4t_version instead of l4t_bsp l4t_bsp.bbclass became recipe-scoped for scarthgap, so l4t_version.bbclass was created to provide the L4T_VERSION variable at global scope. Changelog: Title Issue: None Signed-off-by: Zachary T Welch --- meta-mender-tegra/classes-global/tegra-mender-setup.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass b/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass index 7dbbaba7..fbec7e39 100644 --- a/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass +++ b/meta-mender-tegra/classes-global/tegra-mender-setup.bbclass @@ -1,4 +1,4 @@ -inherit l4t_bsp +inherit l4t_version python () { # insert l4t-mender- as a machine-specific override for tegra platforms From 55a58b1d141e2f1ff7aeaf2c5e51fb146a3733e6 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Thu, 18 Jul 2024 11:08:03 -0700 Subject: [PATCH 05/17] feat: meta-mender-tegra: add scarthgap compatibility Changelog: Title Issue: None Signed-off-by: Zachary T Welch --- meta-mender-tegra/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-mender-tegra/conf/layer.conf b/meta-mender-tegra/conf/layer.conf index 9dcdc774..467fc0f8 100644 --- a/meta-mender-tegra/conf/layer.conf +++ b/meta-mender-tegra/conf/layer.conf @@ -8,5 +8,5 @@ BBFILE_COLLECTIONS += "meta-mender-tegra-jetpack5" BBFILE_PATTERN_meta-mender-tegra-jetpack5 = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-mender-tegra-jetpack5 = "10" LAYERVERSION_meta-mender-tegra-jetpack5 = "1" -LAYERSERIES_COMPAT_meta-mender-tegra-jetpack5 = "kirkstone" +LAYERSERIES_COMPAT_meta-mender-tegra-jetpack5 = "scarthgap" LAYERDEPENDS_meta-mender-tegra-jetpack5 = "tegra" From bf12ea5c90bb6fa37ff34726fa9d90bf62dd2de9 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Thu, 15 Aug 2024 11:05:40 -0700 Subject: [PATCH 06/17] fix: drop vestigial jetpack5 layer suffix Changelog: Title Issue: None Signed-off-by: Zachary T Welch --- meta-mender-tegra/conf/layer.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-mender-tegra/conf/layer.conf b/meta-mender-tegra/conf/layer.conf index 467fc0f8..0f5196e5 100644 --- a/meta-mender-tegra/conf/layer.conf +++ b/meta-mender-tegra/conf/layer.conf @@ -4,9 +4,9 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "meta-mender-tegra-jetpack5" -BBFILE_PATTERN_meta-mender-tegra-jetpack5 = "^${LAYERDIR}/" -BBFILE_PRIORITY_meta-mender-tegra-jetpack5 = "10" -LAYERVERSION_meta-mender-tegra-jetpack5 = "1" -LAYERSERIES_COMPAT_meta-mender-tegra-jetpack5 = "scarthgap" -LAYERDEPENDS_meta-mender-tegra-jetpack5 = "tegra" +BBFILE_COLLECTIONS += "meta-mender-tegra" +BBFILE_PATTERN_meta-mender-tegra = "^${LAYERDIR}/" +BBFILE_PRIORITY_meta-mender-tegra = "10" +LAYERVERSION_meta-mender-tegra = "1" +LAYERSERIES_COMPAT_meta-mender-tegra = "scarthgap" +LAYERDEPENDS_meta-mender-tegra = "tegra" From 58c06b89cb15ace8c6e3eea1b81795664fedf69e Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Thu, 15 Aug 2024 11:14:04 -0700 Subject: [PATCH 07/17] fix: kas: drop vestigial sublayer name Changelog: Title Issue: None Signed-off-by: Zachary T Welch --- kas/include/tegra-jetpack5.yml | 2 +- kas/include/tegra-jetpack6.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kas/include/tegra-jetpack5.yml b/kas/include/tegra-jetpack5.yml index b33e215d..b3a0314c 100644 --- a/kas/include/tegra-jetpack5.yml +++ b/kas/include/tegra-jetpack5.yml @@ -16,4 +16,4 @@ repos: meta-mender-community: layers: - meta-mender-tegra/meta-mender-tegra-jetpack5: + meta-mender-tegra: diff --git a/kas/include/tegra-jetpack6.yml b/kas/include/tegra-jetpack6.yml index 392353a6..81a0cada 100644 --- a/kas/include/tegra-jetpack6.yml +++ b/kas/include/tegra-jetpack6.yml @@ -16,4 +16,4 @@ repos: meta-mender-community: layers: - meta-mender-tegra/meta-mender-tegra-jetpack5: + meta-mender-tegra: From ec229d6d58e0eeae461eb5322febe72fc6637f7e Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 16 Aug 2024 09:28:57 -0700 Subject: [PATCH 08/17] chore: tegra-nv-boot-control-config: drop obsolete overlay The upstream recipe now handles this. Changelog: Title Issue: None Signed-off-by: Zachary T Welch --- .../tegra-binaries/tegra-nv-boot-control-config_%.bbappend | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-nv-boot-control-config_%.bbappend diff --git a/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-nv-boot-control-config_%.bbappend b/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-nv-boot-control-config_%.bbappend deleted file mode 100644 index 058cd57f..00000000 --- a/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-nv-boot-control-config_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -do_install:append() { - ln -sf /run/nv_boot_control/nv_boot_control.conf ${D}${sysconfdir}/ -} From c4948cd150100c7a071520670c668dd7c0b8b24d Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 16 Aug 2024 13:12:39 -0700 Subject: [PATCH 09/17] redundant-boot-overrides: drop obsolete recipe This recipe is no longer relevant with Jetpack 5.x, as it only supports tegra194 and tegra234. Changelog: Title Issue: None Signed-off-by: Zachary T Welch --- .../update-nvbootctrl.service.in | 14 ------- .../update-nvbootctrl.sh.in | 10 ----- .../redundant-boot-overrides_%.bbappend | 1 - .../redundant-boot-overrides_1.0.bb | 39 ------------------- .../tegra-redundant-boot_%.bbappend | 6 --- 5 files changed, 70 deletions(-) delete mode 100644 meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides/update-nvbootctrl.service.in delete mode 100644 meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides/update-nvbootctrl.sh.in delete mode 100644 meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides_%.bbappend delete mode 100644 meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides_1.0.bb diff --git a/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides/update-nvbootctrl.service.in b/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides/update-nvbootctrl.service.in deleted file mode 100644 index 8e704cb0..00000000 --- a/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides/update-nvbootctrl.service.in +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Update bootloader on successful boot -ConditionPathExists=!@LOCALSTATEDIR@/lib/mender/dont-mark-next-boot-successful -Requires=setup-nv-boot-control.service -After=setup-nv-boot-control.service -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=@SBINDIR@/update-nvbootctrl - -[Install] -WantedBy=multi-user.target diff --git a/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides/update-nvbootctrl.sh.in b/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides/update-nvbootctrl.sh.in deleted file mode 100644 index e8e64127..00000000 --- a/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides/update-nvbootctrl.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -NVBC=@SBINDIR@/nvbootctrl -curslot=$($NVBC get-current-slot) -if [ -n "$curslot" ]; then - if $NVBC set-active-boot-slot $curslot && $NVBC mark-boot-successful; then - exit 0 - fi -fi -echo "ERR: could not update NV boot slots" >&2 -exit 1 diff --git a/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides_%.bbappend b/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides_%.bbappend deleted file mode 100644 index 9accc57e..00000000 --- a/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides_1.0.bb b/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides_1.0.bb deleted file mode 100644 index b467f5e0..00000000 --- a/meta-mender-tegra/recipes-bsp/tegra-binaries/redundant-boot-overrides_1.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Configuration override to disable nv_update_verifier when using Mender" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -COMPATIBLE_MACHINE = "(tegra)" -COMPATIBLE_MACHINE:tegra210 = "(-)" - -SRC_URI = "\ - file://update-nvbootctrl.service.in \ - file://update-nvbootctrl.sh.in \ -" - -inherit systemd - -S = "${WORKDIR}" -B = "${WORKDIR}/build" - -run_sed() { - outfile=$(basename "$1" .in) - sed -e's,@SBINDIR@,${sbindir},g' \ - -e's,@LOCALSTATEDIR@,${localstatedir},g' "$1" > ${B}/$outfile -} - -do_configure() { - run_sed ${S}/update-nvbootctrl.service.in - run_sed ${S}/update-nvbootctrl.sh.in -} - -do_compile[noexec] = "1" - -do_install() { - install -d ${D}${sysconfdir}/systemd/system/ - ln -sf /dev/null ${D}${sysconfdir}/systemd/system/nv_update_verifier.service - install -d ${D}${systemd_system_unitdir} ${D}${sbindir} - install -m 0755 ${B}/update-nvbootctrl.sh ${D}${sbindir}/update-nvbootctrl - install -m 0644 ${B}/update-nvbootctrl.service ${D}${systemd_system_unitdir}/ -} - -SYSTEMD_SERVICE:${PN} = "update-nvbootctrl.service" diff --git a/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-redundant-boot_%.bbappend b/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-redundant-boot_%.bbappend index 0f93cd84..26dce89d 100644 --- a/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-redundant-boot_%.bbappend +++ b/meta-mender-tegra/recipes-bsp/tegra-binaries/tegra-redundant-boot_%.bbappend @@ -1,9 +1,3 @@ -EXTRADEPS = "redundant-boot-overrides" -EXTRADEPS:tegra194 = "" -EXTRADEPS:tegra210 = "" -EXTRADEPS:tegra234 = "" -RDEPENDS:${PN} += "${EXTRADEPS}" - FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append = "\ From 41f08460c88dbdd483f27341ee8a3683b9a36e49 Mon Sep 17 00:00:00 2001 From: Jonathan Schnitzler Date: Mon, 19 Aug 2024 13:13:02 +0200 Subject: [PATCH 10/17] Adjust path to EFI partition /opt/nvidia/esp/ does not exist anymore with JP6. --- .../recipes-mender/tegra-state-scripts/files/abort-blupdate | 4 ++-- .../recipes-mender/tegra-state-scripts/files/switch-rootfs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/abort-blupdate b/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/abort-blupdate index 6d5d5bbf..b29e6541 100644 --- a/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/abort-blupdate +++ b/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/abort-blupdate @@ -1,7 +1,7 @@ #!/bin/bash -CAPTARGET="/opt/nvidia/esp/EFI/UpdateCapsule/TEGRA_BL.Cap" +CAPTARGET="/boot/efi/EFI/UpdateCapsule/TEGRA_BL.Cap" if [ -f "$CAPTARGET" ]; then rm "$CAPTARGET" -fi \ No newline at end of file +fi diff --git a/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/switch-rootfs b/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/switch-rootfs index f9eaf79f..8f41c53c 100644 --- a/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/switch-rootfs +++ b/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/switch-rootfs @@ -37,9 +37,9 @@ fi tmp_mount=`mktemp -d` reset_unbootable_status $next_slot -mkdir -p /opt/nvidia/esp/EFI/UpdateCapsule +mkdir -p /boot/efi/EFI/UpdateCapsule mount -o ro $next_rootfs_dev $tmp_mount -cp ${tmp_mount}/opt/nvidia/UpdateCapsule/tegra-bl.cap /opt/nvidia/esp/EFI/UpdateCapsule/TEGRA_BL.Cap +cp ${tmp_mount}/opt/nvidia/UpdateCapsule/tegra-bl.cap /boot/efi/EFI/UpdateCapsule/TEGRA_BL.Cap umount $tmp_mount oe4t-set-uefi-OSIndications From 27248984b23dcf4f3bbf6ec12e00b052ee7cd398 Mon Sep 17 00:00:00 2001 From: Jonathan Schnitzler Date: Mon, 19 Aug 2024 13:13:56 +0200 Subject: [PATCH 11/17] Call mender by mender-update --- .../recipes-mender/tegra-state-scripts/files/switch-rootfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/switch-rootfs b/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/switch-rootfs index 8f41c53c..301a7bce 100644 --- a/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/switch-rootfs +++ b/meta-mender-tegra/recipes-mender/tegra-state-scripts/files/switch-rootfs @@ -1,6 +1,6 @@ #!/bin/sh set -e -echo "$(mender show-artifact): $(basename "$0") was called!" >&2 +echo "$(mender-update show-artifact): $(basename "$0") was called!" >&2 get_bootpart() { local current_slot=`nvbootctrl get-current-slot 2>/dev/null` From 874b12045eaa23d4902ff6ed4f86a229ee4a7628 Mon Sep 17 00:00:00 2001 From: Jonathan Schnitzler Date: Mon, 19 Aug 2024 10:17:52 +0200 Subject: [PATCH 12/17] JP 6 only: Fix name of kernel bbappend --- ...x-tegra_%.bbappend => linux-jammy-nvidia-tegra_5.15%.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-mender-tegra/recipes-kernel/linux/{linux-tegra_%.bbappend => linux-jammy-nvidia-tegra_5.15%.bbappend} (100%) diff --git a/meta-mender-tegra/recipes-kernel/linux/linux-tegra_%.bbappend b/meta-mender-tegra/recipes-kernel/linux/linux-jammy-nvidia-tegra_5.15%.bbappend similarity index 100% rename from meta-mender-tegra/recipes-kernel/linux/linux-tegra_%.bbappend rename to meta-mender-tegra/recipes-kernel/linux/linux-jammy-nvidia-tegra_5.15%.bbappend From 27bd6f9f55503bd2eefa030879d294e659d9af3c Mon Sep 17 00:00:00 2001 From: Jonathan Schnitzler Date: Mon, 19 Aug 2024 13:14:57 +0200 Subject: [PATCH 13/17] JP 6 only: Use new recipe for uefi config The uefi rootfs ab config was moved to a separate recipe. --- ...-tegra_%.bbappend => l4t-launcher-rootfs-ab-config_%.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-mender-tegra/recipes-bsp/uefi/{edk2-firmware-tegra_%.bbappend => l4t-launcher-rootfs-ab-config_%.bbappend} (100%) diff --git a/meta-mender-tegra/recipes-bsp/uefi/edk2-firmware-tegra_%.bbappend b/meta-mender-tegra/recipes-bsp/uefi/l4t-launcher-rootfs-ab-config_%.bbappend similarity index 100% rename from meta-mender-tegra/recipes-bsp/uefi/edk2-firmware-tegra_%.bbappend rename to meta-mender-tegra/recipes-bsp/uefi/l4t-launcher-rootfs-ab-config_%.bbappend From 6ae0b7aae78f0756e8771a81d1b9841e189f2b20 Mon Sep 17 00:00:00 2001 From: Patrick Oetken Date: Thu, 21 Nov 2024 17:51:43 +0100 Subject: [PATCH 14/17] Add config for Jetson AGX Orin Developer Kit 64GB --- kas/jetson-agx-orin-devkit-64.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 kas/jetson-agx-orin-devkit-64.yml diff --git a/kas/jetson-agx-orin-devkit-64.yml b/kas/jetson-agx-orin-devkit-64.yml new file mode 100644 index 00000000..23342681 --- /dev/null +++ b/kas/jetson-agx-orin-devkit-64.yml @@ -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" From 9282f0ab5735b9e9ae3954f6f8d94fa61cb3ec31 Mon Sep 17 00:00:00 2001 From: Patrick Oetken Date: Thu, 21 Nov 2024 17:52:18 +0100 Subject: [PATCH 15/17] update meta-mender layer --- kas/include/mender-base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas/include/mender-base.yml b/kas/include/mender-base.yml index 35e7f700..6c21d68d 100644 --- a/kas/include/mender-base.yml +++ b/kas/include/mender-base.yml @@ -20,7 +20,7 @@ repos: meta-mender: url: https://github.com/mendersoftware/meta-mender.git - commit: 21b8bd76e92391665ad2cf52fa1def65ba97c7a2 + commit: 2f70dbad1441055c299332b7ef33dfe1e4f50c1c layers: meta-mender-core: From 7c48e78bd66271a31fb6c33e51c2fe9d807d05aa Mon Sep 17 00:00:00 2001 From: Patrick Oetken Date: Thu, 21 Nov 2024 17:53:03 +0100 Subject: [PATCH 16/17] FIX: use poky github mirror since yocto server is very slow --- kas/include/mender-base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas/include/mender-base.yml b/kas/include/mender-base.yml index 6c21d68d..de1cf63e 100644 --- a/kas/include/mender-base.yml +++ b/kas/include/mender-base.yml @@ -5,7 +5,7 @@ distro: poky repos: poky: - url: git://git.yoctoproject.org/poky + url: https://github.com/yoctoproject/poky.git commit: 7fb368604c5c7295a910ffd2d8dba7b9f00b8462 layers: meta: From b5eefa142af5f29253283cbf6afb6f59e1315406 Mon Sep 17 00:00:00 2001 From: Patrick Oetken Date: Thu, 21 Nov 2024 17:54:07 +0100 Subject: [PATCH 17/17] update meta-mender and oe4t commit hashes --- kas/include/tegra-base.yml | 2 +- kas/include/tegra-jetpack6.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kas/include/tegra-base.yml b/kas/include/tegra-base.yml index a2c536cf..e51c0c76 100644 --- a/kas/include/tegra-base.yml +++ b/kas/include/tegra-base.yml @@ -3,7 +3,7 @@ header: repos: meta-mender: - commit: 872219dfd87113345073160367edc33471795a3b # this one fixes the persistent-id for now! + commit: 2f70dbad1441055c299332b7ef33dfe1e4f50c1c # this one fixes the persistent-id for now! meta-tegra: url: https://github.com/OE4T/meta-tegra.git diff --git a/kas/include/tegra-jetpack6.yml b/kas/include/tegra-jetpack6.yml index 81a0cada..5ce1a7b9 100644 --- a/kas/include/tegra-jetpack6.yml +++ b/kas/include/tegra-jetpack6.yml @@ -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: