Seperate arm specific for rpi specefic stuff too.

configs/build_rpi

@@ -1,3 +1,4 @@
-# Raspberry Pi OS only targets arm64 since the rpi4
+# Raspberry Pi OS only targets arm64 since the rpi4.
+# So ChillcraftOs will also only target arm64 for the rpi4 and up.
 ARCH=arm64
 PLATFORM=rpi

stage0/00-configure-apt/00-run.sh

@@ -43,13 +43,15 @@ fi
 install -m 644 files/apt-chillcraftos-prefs "${ROOTFS_DIR}/etc/apt/preferences.d/"
 sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/preferences.d/apt-chillcraftos-prefs"
 
-# Add armhf and arm64 architectures, update and upgrade and cache policy
+# Add additional architectures if needed, update and upgrade and cache policy
 on_chroot <<- \EOF
 	SYSTEM_ARCH="$(dpkg --print-architecture)"
-	if [ "$SYSTEM_ARCH" = "armhf" ]; then
-		dpkg --add-architecture arm64
-	elif [ "$SYSTEM_ARCH" = "arm64" ]; then
-		dpkg --add-architecture armhf
+	if [ "${PLATFORM}" == "rpi" ]; then
+		if [ "$SYSTEM_ARCH" = "armhf" ]; then
+			dpkg --add-architecture arm64
+		elif [ "$SYSTEM_ARCH" = "arm64" ]; then
+			dpkg --add-architecture armhf
+		fi
 	fi
 	apt-get update
 	apt-get dist-upgrade -y

stage1/01-sys-tweaks/00-run.sh

@@ -2,16 +2,14 @@
 
 install -m 755 files/system-readonly "${ROOTFS_DIR}/sbin/"
 
-if [ "${ARCH}" = "amd64" ]; then
-	install -m 644 files/fstab-amd64 "${ROOTFS_DIR}/etc/fstab"
-elif [[ "${ARCH}" == "arm64" || "${ARCH}" == "armhf" ]]; then
+if [ "${PLATFORM}" == "rpi" ]; then
 	install -m 644 files/fstab-rpi "${ROOTFS_DIR}/etc/fstab"
+else
+	install -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab"
 fi
 
+# Create system user and set root password
 on_chroot << EOF
-# Create a system user
 useradd -r -M -d / system
-
-# Set root password to "root"
 echo "root:root" | chpasswd
 EOF

stage2/01-sys-tweaks/01-run.sh

@@ -20,7 +20,7 @@ if [ "${USE_QEMU}" = "1" ]; then
 fi
 
 on_chroot <<- EOF
-    if [[ "${ARCH}" == "arm64" || "${ARCH}" == "armhf" ]]; then
+    if [ "${PLATFORM}" == "rpi" ]; then
 		systemctl enable rpi-resize
 	fi
 

stage3/02-setup-system/00-run.sh

@@ -19,7 +19,7 @@ touch /var/lib/gdm/run-initial-setup
 EOF
 
 # polkit fixes (seems to be rpi only thing)
-if [[ "${ARCH}" == "arm64" || "${ARCH}" == "armhf" ]]; then
+if [ "$PLATFORM" == "rpi" ]; then
     install -m 644 files/polkit-admin.conf "${ROOTFS_DIR}/etc/polkit-1/localauthority.conf.d/51-admin.conf"
 fi