hostapp-update-hooks: Remove hardcoded internal devices

... and determine the internal device during HUP, as this would allow to boot the flasher Orins from multiple targets, depending on the flasher config.json settings. Signed-off-by: Alexandru Costache <alexandru@balena.io>
balena-os · Dec 2, 2024 · 5230b92 · 5230b92
1 parent 4290aa3
commit 5230b92
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...lena-jetson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-agx-orin-devkit b/...lena-jetson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-agx-orin-devkit
@@ -12,7 +12,7 @@ source /usr/bin/uefi_common.func
 DURING_UPDATE=${DURING_UPDATE:-0}
 bootloader_blob="/opt/tegra-binaries/TEGRA_BL_3701.Cap.gz"
 bootloader_device="/dev/mtdblock0"
-internal_storage="/dev/mmcblk0"
+internal_storage="/dev/$(findmnt --noheadings --canonicalize --output SOURCE "/mnt/sysroot/active/" | xargs lsblk -no pkname)"
 use_capsule=1
 efivars_dir="/sys/firmware/efi/efivars/"
 # See https://github.com/OE4T/meta-tegra/blob/master/recipes-bsp/tools/setup-nv-boot-control/setup-nv-boot-control.sh.in

diff --git a/...jetson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-agx-orin-devkit-64gb b/...jetson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-agx-orin-devkit-64gb
@@ -11,7 +11,7 @@ source /usr/bin/uefi_common.func
 
 DURING_UPDATE=${DURING_UPDATE:-0}
 bootloader_device="/dev/mtdblock0"
-internal_storage="/dev/nvme0n1"
+internal_storage="/dev/$(findmnt --noheadings --canonicalize --output SOURCE "/mnt/sysroot/active/" | xargs lsblk -no pkname)"
 use_capsule=1
 bootloader_blob="/opt/tegra-binaries/TEGRA_BL_3701_64.Cap.gz"
 efivars_dir="/sys/firmware/efi/efivars/"

diff --git a/...etson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-orin-nano-devkit-nvme b/...etson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-orin-nano-devkit-nvme
@@ -20,7 +20,7 @@ device_type="jetson-orin-nano-devkit"
 
 DURING_UPDATE=${DURING_UPDATE:-0}
 bootloader_device="/dev/mtdblock0"
-internal_storage="/dev/nvme0n1"
+internal_storage="/dev/$(findmnt --noheadings --canonicalize --output SOURCE "/mnt/sysroot/active/" | xargs lsblk -no pkname)"
 use_capsule=1
 bootloader_blob="/opt/tegra-binaries/TEGRA_BL_Orin_Nano.Cap.gz"
 boardspec=$(tegra-boardspec 2>/dev/null)

diff --git a/...etson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-orin-nano-seeed-j3010 b/...etson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-orin-nano-seeed-j3010
@@ -11,7 +11,7 @@ source /usr/bin/uefi_common.func
 
 DURING_UPDATE=${DURING_UPDATE:-0}
 bootloader_device="/dev/mtdblock0"
-internal_storage="/dev/nvme0n1"
+internal_storage="/dev/$(findmnt --noheadings --canonicalize --output SOURCE "/mnt/sysroot/active/" | xargs lsblk -no pkname)"
 use_capsule=1
 bootloader_blob="/opt/tegra-binaries/TEGRA_BL_Seeed_j3010.Cap.gz"
 efivars_dir="/sys/firmware/efi/efivars/"

diff --git a/...-jetson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-orin-nx-seeed-j4012 b/...-jetson/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-orin-nx-seeed-j4012
@@ -11,7 +11,7 @@ source /usr/bin/uefi_common.func
 
 DURING_UPDATE=${DURING_UPDATE:-0}
 bootloader_device="/dev/mtdblock0"
-internal_storage="/dev/nvme0n1"
+internal_storage="/dev/$(findmnt --noheadings --canonicalize --output SOURCE "/mnt/sysroot/active/" | xargs lsblk -no pkname)"
 use_capsule=1
 bootloader_blob="/opt/tegra-binaries/TEGRA_BL_Seeed_j4012.Cap.gz"
 efivars_dir="/sys/firmware/efi/efivars/"

diff --git a/...on/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-orin-nx-xavier-nx-devkit b/...on/recipes-support/hostapp-update-hooks/files/99-resin-bootfiles-orin-nx-xavier-nx-devkit
@@ -11,7 +11,7 @@ source /usr/bin/uefi_common.func
 
 DURING_UPDATE=${DURING_UPDATE:-0}
 bootloader_device="/dev/mtdblock0"
-internal_storage="/dev/nvme0n1"
+internal_storage="/dev/$(findmnt --noheadings --canonicalize --output SOURCE "/mnt/sysroot/active/" | xargs lsblk -no pkname)"
 use_capsule=1
 bootloader_blob="/opt/tegra-binaries/TEGRA_BL_Orin_NX.Cap.gz"
 efivars_dir="/sys/firmware/efi/efivars/"