diff --git a/configs/build_rpi b/configs/build_rpi index cf3dca6..c1efd16 100644 --- a/configs/build_rpi +++ b/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 diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh index 836fb43..f7a36c6 100755 --- a/stage0/00-configure-apt/00-run.sh +++ b/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 diff --git a/stage0/02-firmware/01-packages-arm-only b/stage0/02-firmware/01-packages-rpi-only similarity index 100% rename from stage0/02-firmware/01-packages-arm-only rename to stage0/02-firmware/01-packages-rpi-only diff --git a/stage1/00-boot-files/00-run-arm-only.sh b/stage1/00-boot-files/00-run-rpi-only.sh old mode 100755 new mode 100644 similarity index 100% rename from stage1/00-boot-files/00-run-arm-only.sh rename to stage1/00-boot-files/00-run-rpi-only.sh diff --git a/stage1/01-sys-tweaks/00-packages-arm-only b/stage1/01-sys-tweaks/00-packages-rpi-only similarity index 100% rename from stage1/01-sys-tweaks/00-packages-arm-only rename to stage1/01-sys-tweaks/00-packages-rpi-only diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh index c008a3d..29ebfeb 100755 --- a/stage1/01-sys-tweaks/00-run.sh +++ b/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 \ No newline at end of file diff --git a/stage1/01-sys-tweaks/files/fstab-amd64 b/stage1/01-sys-tweaks/files/fstab similarity index 100% rename from stage1/01-sys-tweaks/files/fstab-amd64 rename to stage1/01-sys-tweaks/files/fstab diff --git a/stage1/02-net-tweaks/01-run-arm-only.sh b/stage1/02-net-tweaks/01-run-rpi-only.sh old mode 100755 new mode 100644 similarity index 100% rename from stage1/02-net-tweaks/01-run-arm-only.sh rename to stage1/02-net-tweaks/01-run-rpi-only.sh diff --git a/stage2/01-sys-tweaks/00-packages-arm-only b/stage2/01-sys-tweaks/00-packages-rpi-only similarity index 100% rename from stage2/01-sys-tweaks/00-packages-arm-only rename to stage2/01-sys-tweaks/00-packages-rpi-only diff --git a/stage2/01-sys-tweaks/00-patches-arm-only/01-resize-init.diff b/stage2/01-sys-tweaks/00-patches-rpi-only/01-resize-init.diff similarity index 100% rename from stage2/01-sys-tweaks/00-patches-arm-only/01-resize-init.diff rename to stage2/01-sys-tweaks/00-patches-rpi-only/01-resize-init.diff diff --git a/stage2/01-sys-tweaks/00-patches-arm-only/02-inputrc.diff b/stage2/01-sys-tweaks/00-patches-rpi-only/02-inputrc.diff similarity index 100% rename from stage2/01-sys-tweaks/00-patches-arm-only/02-inputrc.diff rename to stage2/01-sys-tweaks/00-patches-rpi-only/02-inputrc.diff diff --git a/stage2/01-sys-tweaks/00-patches-arm-only/series b/stage2/01-sys-tweaks/00-patches-rpi-only/series similarity index 100% rename from stage2/01-sys-tweaks/00-patches-arm-only/series rename to stage2/01-sys-tweaks/00-patches-rpi-only/series diff --git a/stage2/01-sys-tweaks/01-packages-arm-only b/stage2/01-sys-tweaks/01-packages-rpi-only similarity index 100% rename from stage2/01-sys-tweaks/01-packages-arm-only rename to stage2/01-sys-tweaks/01-packages-rpi-only diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 6dc3e71..b61601f 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/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 diff --git a/stage2/02-net-tweaks/01-packages-arm-only b/stage2/02-net-tweaks/01-packages-rpi-only similarity index 100% rename from stage2/02-net-tweaks/01-packages-arm-only rename to stage2/02-net-tweaks/01-packages-rpi-only diff --git a/stage2/02-net-tweaks/01-run-arm-only.sh b/stage2/02-net-tweaks/01-run-rpi-only.sh old mode 100755 new mode 100644 similarity index 100% rename from stage2/02-net-tweaks/01-run-arm-only.sh rename to stage2/02-net-tweaks/01-run-rpi-only.sh diff --git a/stage2/04-cloud-init/00-packages-arm-only b/stage2/04-cloud-init/00-packages-rpi-only similarity index 100% rename from stage2/04-cloud-init/00-packages-arm-only rename to stage2/04-cloud-init/00-packages-rpi-only diff --git a/stage2/04-cloud-init/01-run-arm-only.sh b/stage2/04-cloud-init/01-run-rpi-only.sh old mode 100755 new mode 100644 similarity index 100% rename from stage2/04-cloud-init/01-run-arm-only.sh rename to stage2/04-cloud-init/01-run-rpi-only.sh diff --git a/stage2/04-cloud-init/README.amd64.txt b/stage2/04-cloud-init/README.txt similarity index 100% rename from stage2/04-cloud-init/README.amd64.txt rename to stage2/04-cloud-init/README.txt diff --git a/stage3/00-install-packages/01-packages-arm-only b/stage3/00-install-packages/01-packages-rpi-only similarity index 100% rename from stage3/00-install-packages/01-packages-arm-only rename to stage3/00-install-packages/01-packages-rpi-only diff --git a/stage3/01-install-desktop/00-packages-nr-arm-only b/stage3/01-install-desktop/00-packages-nr-rpi-only similarity index 100% rename from stage3/01-install-desktop/00-packages-nr-arm-only rename to stage3/01-install-desktop/00-packages-nr-rpi-only diff --git a/stage3/02-setup-system/00-run.sh b/stage3/02-setup-system/00-run.sh index 93a170e..a393340 100755 --- a/stage3/02-setup-system/00-run.sh +++ b/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 diff --git a/stage3/02-setup-system/01-run-arm-only.sh b/stage3/02-setup-system/01-run-rpi-only.sh old mode 100755 new mode 100644 similarity index 100% rename from stage3/02-setup-system/01-run-arm-only.sh rename to stage3/02-setup-system/01-run-rpi-only.sh diff --git a/stage3/EXPORT_ISO b/stage3/EXPORT_SQUASHFS similarity index 100% rename from stage3/EXPORT_ISO rename to stage3/EXPORT_SQUASHFS