workaround build failure on AWS M6g instances (RPi-Distro#449)

(cherry picked from commit d159645)
analogdevicesinc · May 30, 2023 · 52b49d9 · 52b49d9
1 parent bc93556
commit 52b49d9
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 9 deletions.
diff --git a/export-image/prerun.sh b/export-image/prerun.sh
@@ -52,14 +52,52 @@ BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 4 | tr -d B)
 ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 2 | tr -d B)
 ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 4 | tr -d B)
 
+
 BOOTLOADER_OFFSET=$(echo "$PARTED_OUT" | grep -e '^3:' | cut -d':' -f 2 | tr -d B)
 BOOTLOADER_LENGTH=$(echo "$PARTED_OUT" | grep -e '^3:' | cut -d':' -f 4 | tr -d B)
 
-BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}")
-ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}")
-BOOTLOADER_DEV=$(losetup --show -f -o "${BOOTLOADER_OFFSET}" --sizelimit "${BOOTLOADER_LENGTH}" "${IMG_FILE}")
+echo "Mounting BOOT_DEV..."
+cnt=0
+until BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}"); do
+ if [ $cnt -lt 5 ]; then
+ cnt=$((cnt + 1))
+ echo "Error in losetup for BOOT_DEV. Retrying..."
+ sleep 5
+ else
+ echo "ERROR: losetup for BOOT_DEV failed; exiting"
+ exit 1
+ fi
+done
+
+echo "Mounting ROOT_DEV..."
+cnt=0
+until ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}"); do
+ if [ $cnt -lt 5 ]; then
+ cnt=$((cnt + 1))
+ echo "Error in losetup for ROOT_DEV. Retrying..."
+ sleep 5
+ else
+ echo "ERROR: losetup for ROOT_DEV failed; exiting"
+ exit 1
+ fi
+done
+
+echo "Mounting BOOTLOADER_DEV..."
+cnt=0
+until BOOTLOADER_DEV=$(losetup --show -f -o "${BOOTLOADER_OFFSET}" --sizelimit "${BOOTLOADER_LENGTH}" "${IMG_FILE}"); do
+ if [ $cnt -lt 5 ]; then
+ cnt=$((cnt + 1))
+ echo "Error in losetup for BOOTLOADER_DEV. Retrying..."
+ sleep 5
+ else
+ echo "ERROR: losetup for BOOTLOADER_DEV failed; exiting"
+ exit 1
+ fi
+done
+
 echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
 echo "/: offset $ROOT_OFFSET, length $ROOT_LENGTH"
+echo "blder: offset $BOOTLOADER_OFFSET, length $BOOTLOADER_LENGTH"
 
 ROOT_FEATURES="^huge_file"
 for FEATURE in metadata_csum 64bit; do

diff --git a/export-noobs/prerun.sh b/export-noobs/prerun.sh
@@ -9,21 +9,34 @@ unmount_image "${IMG_FILE}"
 
 rm -rf "${NOOBS_DIR}"
 
-echo "Creating loop device..."
+echo "Mounting BOOT_DEV..."
 cnt=0
-until LOOP_DEV="$(losetup --show --find --partscan "$IMG_FILE")"; do
+until BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}"); do
  if [ $cnt -lt 5 ]; then
  cnt=$((cnt + 1))
- echo "Error in losetup. Retrying..."
+ echo "Error in losetup for BOOT_DEV. Retrying..."
  sleep 5
  else
- echo "ERROR: losetup failed; exiting"
+ echo "ERROR: losetup for BOOT_DEV failed; exiting"
  exit 1
  fi
 done
 
-BOOT_DEV="${LOOP_DEV}p1"
-ROOT_DEV="${LOOP_DEV}p2"
+echo "Mounting ROOT_DEV..."
+cnt=0
+until ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}"); do
+ if [ $cnt -lt 5 ]; then
+ cnt=$((cnt + 1))
+ echo "Error in losetup for ROOT_DEV. Retrying..."
+ sleep 5
+ else
+ echo "ERROR: losetup for ROOT_DEV failed; exiting"
+ exit 1
+ fi
+done
+
+echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
+echo "/: offset $ROOT_OFFSET, length $ROOT_LENGTH"
 
 mkdir -p "${STAGE_WORK_DIR}/rootfs"
 mkdir -p "${NOOBS_DIR}"