diff --git a/conf/turnkey.d/arm.d/rpi b/conf/turnkey.d/arm.d/rpi deleted file mode 100755 index 51081cc7..00000000 --- a/conf/turnkey.d/arm.d/rpi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e - -systemctl enable rpi-reconfigure-raspi-firmware.service - -cp /usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb /boot/firmware/ - -sed -i 's/root=/console=ttyS1,115200 root=/' /boot/firmware/cmdline.txt -sed -i 's#root=/dev/mmcblk0p2#root=LABEL=RASPIROOT#' /boot/firmware/cmdline.txt -sed -i 's/^#ROOTPART=.*/ROOTPART=LABEL=RASPIROOT/' /etc/default/raspi*-firmware - -sed -i 's/cma=64M //' /boot/firmware/cmdline.txt - diff --git a/overlays/turnkey.d/arm.d/firmware/etc/systemd/system/rpi-reconfigure-raspi-firmware.service b/overlays/turnkey.d/arm.d/firmware/etc/systemd/system/rpi-reconfigure-raspi-firmware.service deleted file mode 100644 index d8c55582..00000000 --- a/overlays/turnkey.d/arm.d/firmware/etc/systemd/system/rpi-reconfigure-raspi-firmware.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Reconfigure raspi-firmware to regenerate config.txt matching actual hardware -Before=sysinit.target -DefaultDependencies=no -RequiresMountsFor=/boot/firmware - -[Service] -Type=oneshot -TimeoutSec=infinity -ExecStart=/usr/sbin/dpkg-reconfigure raspi-firmware -ExecStart=/bin/systemctl --no-reload disable %n - -[Install] -RequiredBy=sysinit.target diff --git a/overlays/turnkey.d/arm.d/fstab/etc/fstab b/overlays/turnkey.d/arm.d/fstab/etc/fstab deleted file mode 100644 index 805b5997..00000000 --- a/overlays/turnkey.d/arm.d/fstab/etc/fstab +++ /dev/null @@ -1,4 +0,0 @@ -# The root file system has fs_passno=1 as per fstab(5) for automatic fsck. -LABEL=RASPIROOT / ext4 rw 0 1 -# All other file systems have fs_passno=2 as per fstab(5) for automatic fsck. -LABEL=RASPIFIRM /boot/firmware vfat rw 0 2 diff --git a/overlays/turnkey.d/arm.d/interfaces/etc/network/interfaces b/overlays/turnkey.d/arm.d/interfaces/etc/network/interfaces deleted file mode 100644 index cf720aa3..00000000 --- a/overlays/turnkey.d/arm.d/interfaces/etc/network/interfaces +++ /dev/null @@ -1,17 +0,0 @@ -# UNCONFIGURED INTERFACES -# remove the above line if you edit this file - -auto lo -iface lo inet loopback - -auto eth0 -iface eth0 inet dhcp - -allow-hotplug eth1 -iface eth1 inet dhcp - -allow-hotplug wlan0 -iface wlan0 inet dhcp - wpa-ssid my-network-ssid - wpa-psk s3kr3t_P4ss - diff --git a/overlays/turnkey.d/arm.d/resizerootfs/etc/initramfs-tools/hooks/rpi-resizerootfs b/overlays/turnkey.d/arm.d/resizerootfs/etc/initramfs-tools/hooks/rpi-resizerootfs deleted file mode 100755 index f4776aa4..00000000 --- a/overlays/turnkey.d/arm.d/resizerootfs/etc/initramfs-tools/hooks/rpi-resizerootfs +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -set -e - -# -# List the soft prerequisites here. This is a space separated list of -# names, of scripts that are in the same directory as this one, that -# must be run before this one can be. -# -PREREQS="" -case $1 in - prereqs) echo "$PREREQS"; exit 0;; -esac - -. /usr/share/initramfs-tools/hook-functions - -# XXX: tail and realpath are included by default, right? -#copy_exec /usr/bin/realpath -#copy_exec /usr/bin/tail -copy_exec /sbin/blkid -copy_exec /bin/lsblk -copy_exec /sbin/parted -copy_exec /sbin/partprobe -copy_exec /sbin/resize2fs diff --git a/overlays/turnkey.d/arm.d/resizerootfs/etc/initramfs-tools/scripts/local-bottom/rpi-resizerootfs b/overlays/turnkey.d/arm.d/resizerootfs/etc/initramfs-tools/scripts/local-bottom/rpi-resizerootfs deleted file mode 100755 index 09bf36f2..00000000 --- a/overlays/turnkey.d/arm.d/resizerootfs/etc/initramfs-tools/scripts/local-bottom/rpi-resizerootfs +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -set -e - -# -# List the soft prerequisites here. This is a space separated list of -# names, of scripts that are in the same directory as this one, that -# must be run before this one can be. -# -PREREQS="" -case $1 in - prereqs) echo "$PREREQS"; exit 0;; -esac - -. /scripts/functions - -# Given the root partition, get the underlying device and partition number -rootpart=$(realpath $ROOT) -rootpart_nr=$(blkid -sPART_ENTRY_NUMBER -o value -p $rootpart) -rootdev="/dev/$(lsblk -no pkname "$rootpart")" - -# Parted will detect if the GPT label is messed up and fix it -# automatically, we just need to tell it to do so. -parted -s $rootdev print 2>&1 | grep -z "fix the GPT" && { - echo "Fix" | parted ---pretend-input-tty $rootdev print -} - -# Check if there's free space at the end of the device -free_space="$(parted -m -s $rootdev print free | tail -n1 | grep free)" -if test -z "$free_space"; then - # Great, we already resized; nothing left to do! - exit 0 -fi - -log_begin_msg "$0 resizing $ROOT" - -# Unmount for safety -umount "${rootmnt}" - -# Expand the partition size to fill the entire device -parted -s $rootdev resizepart $rootpart_nr 100% - -wait_for_udev 5 - -# Now resize the filesystem -partprobe $rootdev -resize2fs $rootpart - -# Remount root -if ! mount -r ${FSTYPE:+-t "${FSTYPE}"} ${ROOTFLAGS} "${ROOT}" "${rootmnt?}"; then - panic "Failed to mount ${ROOT} as root file system." -fi - -log_end_msg diff --git a/plans/boot b/plans/boot index 539324a5..bb795654 100644 --- a/plans/boot +++ b/plans/boot @@ -40,7 +40,6 @@ linux-image-amd64 #endif #ifdef ARM64 linux-image-arm64 -raspi-firmware #endif #endif #endif diff --git a/plans/turnkey/base b/plans/turnkey/base index f81a896c..500b2b35 100644 --- a/plans/turnkey/base +++ b/plans/turnkey/base @@ -1,9 +1,6 @@ #include #include #include -#ifdef ARM64 -#include -#endif wget curl diff --git a/plans/wifi b/plans/wifi index b16910a3..7c454946 100644 --- a/plans/wifi +++ b/plans/wifi @@ -3,8 +3,4 @@ wireless-tools # Tools for manipulating Linux Wireless Extensions wpasupplicant # Client support for WPA and WPA2 (IEEE 802.11i) -#ifdef ARM64 -firmware-brcm80211 -#endif - #endif