From ba4769800fa2081850664607c4a4649c5f37bc5e Mon Sep 17 00:00:00 2001 From: WJCarpenter Date: Fri, 18 Oct 2024 15:28:51 -0700 Subject: [PATCH] Resolve various build issues (#683) * some shell scripts did not have execute permissions, so they got skipped during build * a little more elbow room in the image --- export-image/prerun.sh | 6 +++++- stage3/02-pip-installs/00-run.sh | 0 stage3/03-crankshaft-base/05-run-chroot.sh | 0 stage3/03-crankshaft-base/06-run-chroot.sh | 0 stage3/03-crankshaft-base/07-run-chroot.sh | 0 stage4/01-armv7-fixes/00-run.sh | 0 stage4/prerun.sh | 0 7 files changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 stage3/02-pip-installs/00-run.sh mode change 100644 => 100755 stage3/03-crankshaft-base/05-run-chroot.sh mode change 100644 => 100755 stage3/03-crankshaft-base/06-run-chroot.sh mode change 100644 => 100755 stage3/03-crankshaft-base/07-run-chroot.sh mode change 100644 => 100755 stage4/01-armv7-fixes/00-run.sh mode change 100644 => 100755 stage4/prerun.sh diff --git a/export-image/prerun.sh b/export-image/prerun.sh index 8e6557c4..a5a389f4 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -24,7 +24,11 @@ BOOT_PART_START=$((ALIGN)) BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN)) ROOT_PART_START=$((BOOT_PART_START + BOOT_PART_SIZE)) ROOT_PART_SIZE=$(((ROOT_SIZE + ROOT_MARGIN + ALIGN - 1) / ALIGN * ALIGN)) -IMG_SIZE=$((BOOT_PART_START + BOOT_PART_SIZE + ROOT_PART_SIZE)) +# IMG_SIZE=$((BOOT_PART_START + BOOT_PART_SIZE + ROOT_PART_SIZE)) +# I didn't really figure out all the sector math going on here, but the "lotsetup" step for the rootfs +# failed unless I gave the "truncate" step some breathing room. I don't know how much it wants, +# so I arbitrarily chose the "ALIGN" amount. +IMG_SIZE=$((BOOT_PART_START + BOOT_PART_SIZE + ROOT_PART_SIZE + ALIGN)) truncate -s "${IMG_SIZE}" "${IMG_FILE}" diff --git a/stage3/02-pip-installs/00-run.sh b/stage3/02-pip-installs/00-run.sh old mode 100644 new mode 100755 diff --git a/stage3/03-crankshaft-base/05-run-chroot.sh b/stage3/03-crankshaft-base/05-run-chroot.sh old mode 100644 new mode 100755 diff --git a/stage3/03-crankshaft-base/06-run-chroot.sh b/stage3/03-crankshaft-base/06-run-chroot.sh old mode 100644 new mode 100755 diff --git a/stage3/03-crankshaft-base/07-run-chroot.sh b/stage3/03-crankshaft-base/07-run-chroot.sh old mode 100644 new mode 100755 diff --git a/stage4/01-armv7-fixes/00-run.sh b/stage4/01-armv7-fixes/00-run.sh old mode 100644 new mode 100755 diff --git a/stage4/prerun.sh b/stage4/prerun.sh old mode 100644 new mode 100755