Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-31 04:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix raspi build (#2472)

Browse Source 
* fix raspi build

* Update build.sh
This commit is contained in:
Aiden McClelland
2023-10-24 15:27:33 -06:00
committed by GitHub
parent 6e92a7d93d
commit a96467cb3e
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/startos-iso.yaml vendored
View File

@@ -112,8 +112,8 @@ jobs:
format( format(
'["ubuntu-22.04", "{0}"]', '["ubuntu-22.04", "{0}"]',
fromJson('{ fromJson('{
"x86_64": "buildjet-32vcpu-ubuntu-2204", "x86_64": "buildjet-8vcpu-ubuntu-2204",
"x86_64-nonfree": "buildjet-32vcpu-ubuntu-2204", "x86_64-nonfree": "buildjet-8vcpu-ubuntu-2204",
"aarch64": "buildjet-8vcpu-ubuntu-2204-arm", "aarch64": "buildjet-8vcpu-ubuntu-2204-arm",
"aarch64-nonfree": "buildjet-8vcpu-ubuntu-2204-arm", "aarch64-nonfree": "buildjet-8vcpu-ubuntu-2204-arm",
"raspberrypi": "buildjet-8vcpu-ubuntu-2204-arm", "raspberrypi": "buildjet-8vcpu-ubuntu-2204-arm",

29
image-recipe/build.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
MAX_IMG_SECTORS=8388608 # 4GB MAX_IMG_SECTORS=7217792 # 4GB
echo "==== StartOS Image Build ====" echo "==== StartOS Image Build ===="
@@ -273,7 +273,7 @@ elif [ "${IMAGE_TYPE}" = img ]; then
fi fi
} }
ROOT_PART_END=7217792 ROOT_PART_END=$MAX_IMG_SECTORS
TARGET_NAME=$prep_results_dir/${IMAGE_BASENAME}.img TARGET_NAME=$prep_results_dir/${IMAGE_BASENAME}.img
TARGET_SIZE=$[($ROOT_PART_END+1)*512] TARGET_SIZE=$[($ROOT_PART_END+1)*512]
truncate -s $TARGET_SIZE $TARGET_NAME truncate -s $TARGET_SIZE $TARGET_NAME
@@ -317,8 +317,31 @@ elif [ "${IMAGE_TYPE}" = img ]; then
umount $TMPDIR/boot umount $TMPDIR/boot
umount $TMPDIR umount $TMPDIR
e2fsck -fy `partition_for ${OUTPUT_DEVICE} 2`
resize2fs -M `partition_for ${OUTPUT_DEVICE} 2`
BLOCK_COUNT=$(dumpe2fs -h `partition_for ${OUTPUT_DEVICE} 2` | awk '/^Block count:/ { print $3 }')
BLOCK_SIZE=$(dumpe2fs -h `partition_for ${OUTPUT_DEVICE} 2` | awk '/^Block size:/ { print $3 }')
SECTOR_LEN=$[$BLOCK_COUNT*$BLOCK_SIZE/512]
losetup -d $OUTPUT_DEVICE losetup -d $OUTPUT_DEVICE
mv $prep_results_dir/${IMAGE_BASENAME}.img $RESULTS_DIR/$IMAGE_BASENAME.iso (
echo d
echo 2
echo n
echo p
echo 2
echo 526336
echo +$SECTOR_LEN
echo w
) | fdisk $TARGET_NAME
ROOT_PART_END=$[526336+$SECTOR_LEN]
TARGET_SIZE=$[($ROOT_PART_END+1)*512]
truncate -s $TARGET_SIZE $TARGET_NAME
mv $TARGET_NAME $RESULTS_DIR/$IMAGE_BASENAME.img
fi fi