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
opencardev · Oct 18, 2024 · ba47698 · ba47698
1 parent 5bdb0ae
commit ba47698
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 1 deletion.
diff --git 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
diff --git a/stage3/03-crankshaft-base/05-run-chroot.sh b/stage3/03-crankshaft-base/05-run-chroot.sh
diff --git a/stage3/03-crankshaft-base/06-run-chroot.sh b/stage3/03-crankshaft-base/06-run-chroot.sh
diff --git a/stage3/03-crankshaft-base/07-run-chroot.sh b/stage3/03-crankshaft-base/07-run-chroot.sh
diff --git a/stage4/01-armv7-fixes/00-run.sh b/stage4/01-armv7-fixes/00-run.sh
diff --git a/stage4/prerun.sh b/stage4/prerun.sh