From 97d8740fb2f6707bd2fe85bd3b4408dfabfd5a29 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Fri, 11 Oct 2024 10:11:00 +0200 Subject: [PATCH] ccmp25: swupdate: fix hardcoded index in fwupdate strategy https://onedigi.atlassian.net/browse/DEL-9228 Signed-off-by: Francisco Gil --- meta-digi-dey/recipes-digi/swu-images/files/update_files.sh | 4 ++-- meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh b/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh index 9d28629ec..83de89ba2 100755 --- a/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh +++ b/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh @@ -22,9 +22,9 @@ fi # Variables. FS_TYPE="ext4" -LINUX_DEV_BLOCK="/dev/mmcblk0p1" +LINUX_DEV_BLOCK="/dev/mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" LINUX_MOUNT_POINT="/mnt/linux" -ROOTFS_DEV_BLOCK="/dev/mmcblk0p3" +ROOTFS_DEV_BLOCK="/dev/mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" ROOTFS_MOUNT_POINT="/system" # Determines whether the file system type is UBI or not. diff --git a/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh b/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh index 85ee8f265..c65f630c4 100755 --- a/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh +++ b/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh @@ -32,8 +32,8 @@ fi # Variables. BLOCK_SIZE=4096 ROOTFS_SOURCE_ENDPOINT="/dev/rdiff_source_rootfs" -ROOTFS_DEV_BLOCK_A="mmcblk0p3" -ROOTFS_DEV_BLOCK_B="mmcblk0p4" +ROOTFS_DEV_BLOCK_A="mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" +ROOTFS_DEV_BLOCK_B="mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" # Determines whether the file system type is UBIFS or not. is_ubifs() {