diff --git a/README.md b/README.md index 5b0febd..78556fc 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,14 @@ This ISO builder is fork of the good work from the elementary crew. Many thanks ## Building Locally -As Ubuntu Sway is built with the Debian version of live-build, not the Ubuntu patched version, it's easiest to build an Ubuntu Sway .iso in a Debian VM or container. This prevents messing up your host system too. - The following example uses Docker and assumes you have Docker correctly installed and set up: Clone this project & cd into it: - git clone https://github.com/Ubuntu-Sway/iso-builder && cd iso-builder + git clone https://github.com/Tile-OS/iso-builder && cd iso-builder -Configure the channel in the etc/terraform.conf (unstable, stable). +Configure the channel in the etc/terraform.conf (dev, stable). +Configue desktop in the /etc/terraform.conf (sway, river). Run the build: diff --git a/build-rpi.sh b/build-rpi.sh deleted file mode 100755 index 106aeb5..0000000 --- a/build-rpi.sh +++ /dev/null @@ -1,375 +0,0 @@ -#!/bin/bash - -set -e - -# Install dependencies in host system -echo -e " -#----------------------# -# INSTALL DEPENDENCIES # -#----------------------# -" - -apt-get update -apt-get install -y --no-install-recommends \ -ubuntu-keyring ca-certificates debootstrap git \ -qemu-user-static qemu-utils qemu-system-arm binfmt-support \ -parted kpartx rsync dosfstools xz-utils - -# Make sure cross-running ARM ELF executables is enabled -update-binfmts --enable - -rootdir=$(pwd) -basedir=$(pwd)/artifacts/ubuntusway-rpi - -export packages="ubuntu-sway-minimal ubuntu-sway-desktop-raspi ubuntu-sway-standard" -export architecture="arm64" -export codename="lunar" -export channel="dev" - -version=23.04 -YYYYMMDD="$(date +%Y%m%d)" -imagename=ubuntusway-$version-$channel-rpi-$YYYYMMDD - -# Remove old builds before creating new one -echo -e " -#----------------------# -# REMOVE OLD BUILDS # -#----------------------# -" - -if [ -d $rootdir/artifacts ]; then - rm -rf $rootdir/artifacts -fi - -# Bootstrap an ubuntu minimal system -echo -e " -#----------------------# -# BOOTSTRAP BASE SYSTEM # -#----------------------# -" - -mkdir -p "${basedir}" -cd "${basedir}" - -debootstrap \ - --arch $architecture \ - --components=main,restricted,universe,multiverse \ - --foreign \ - --include=cloud-guest-utils \ - $codename ubuntusway-$architecture http://ports.ubuntu.com/ubuntu-ports - -# Add the QEMU emulator for running ARM executables -cp /usr/bin/qemu-arm-static ubuntusway-$architecture/usr/bin/ - -# Run the second stage of the bootstrap in QEMU -LANG=C.UTF-8 chroot ubuntusway-$architecture /debootstrap/debootstrap --second-stage - -# Copy Raspberry Pi specific files -cp -r "${rootdir}"/rpi/rootfs/writable/* ubuntusway-${architecture}/ - -# Add the rest of the ubuntu repos -cat << EOF > ubuntusway-$architecture/etc/apt/sources.list -deb http://ports.ubuntu.com/ubuntu-ports $codename main restricted universe multiverse -deb http://ports.ubuntu.com/ubuntu-ports $codename-updates main restricted universe multiverse -deb http://ports.ubuntu.com/ubuntu-ports $codename-security main restricted universe multiverse -deb http://ports.ubuntu.com/ubuntu-ports $codename-backports main restricted universe multiverse -EOF - -# Copy in the ubuntusway PPAs/keys/apt config -for f in "${rootdir}"/etc/config/archives/*.list; do cp -- "$f" "ubuntusway-$architecture/etc/apt/sources.list.d/$(basename -- "$f")"; done -for f in "${rootdir}"/etc/config/archives/*.key; do cp -- "$f" "ubuntusway-$architecture/etc/apt/trusted.gpg.d/$(basename -- "$f").asc"; done -for f in "${rootdir}"/etc/config/archives/*.pref; do cp -- "$f" "ubuntusway-$architecture/etc/apt/preferences.d/$(basename -- "$f")"; done - -# Set codename/channel in added repos -sed -i "s/@CHANNEL/$channel/" ubuntusway-$architecture/etc/apt/sources.list.d/*.list* -sed -i "s/@BASECODENAME/$codename/" ubuntusway-$architecture/etc/apt/sources.list.d/*.list* - -# Set codename in added preferences -sed -i "s/@BASECODENAME/$codename/" ubuntusway-$architecture/etc/apt/preferences.d/*.pref* - -echo "ubuntusway" > ubuntusway-$architecture/etc/hostname - -cat << EOF > ubuntusway-${architecture}/etc/hosts -127.0.0.1 ubuntusway localhost -::1 localhost ip6-localhost ip6-loopback -fe00::0 ip6-localnet -ff00::0 ip6-mcastprefix -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters -EOF - -# Configure mount points -cat << EOF > ubuntusway-${architecture}/etc/fstab -# -LABEL=writable / ext4 discard,noatime,x-systemd.growfs 0 1 -LABEL=system-boot /boot/firmware vfat defaults 0 1 -EOF - -export LC_ALL=C.UTF-8 -export DEBIAN_FRONTEND=noninteractive -# Config to stop flash-kernel trying to detect the hardware in chroot -export FK_MACHINE=none - -mount -t proc proc ubuntusway-$architecture/proc -mount -o bind /dev/ ubuntusway-$architecture/dev/ -mount -o bind /dev/pts ubuntusway-$architecture/dev/pts - -# Make a desktop stage that installs all of the metapackages -echo -e " -#--------------------------# -# INSTALL DESKTOP PACKAGES # -#--------------------------# -" - -cat << EOF > ubuntusway-$architecture/desktop -#!/bin/bash -apt-get update -apt-get -y upgrade -apt-get -y install $packages -rm -f /desktop -EOF - -chmod +x ubuntusway-$architecture/desktop -LANG=C.UTF-8 chroot ubuntusway-$architecture /desktop - -# Install Raspberry Pi specific packages -echo -e " -#----------------------------------------# -# INSTALL RASPBERRY PI SPECIFIC PACKAGES # -#----------------------------------------# -" - -cat << EOF > ubuntusway-$architecture/hardware -#!/bin/bash -apt-get -y install linux-image-raspi linux-firmware-raspi \ -linux-modules-extra-raspi pi-bluetooth upower \ -calamares-settings-ubuntu-sway-raspi -apt-get -y install --no-install-recommends raspi-config -systemctl disable raspi-config -rm -f hardware -EOF - -chmod +x ubuntusway-$architecture/hardware -LANG=C.UTF-8 chroot ubuntusway-$architecture /hardware - -# Copy in any file overrides -cp -rv "${rootdir}"/etc/config/includes.chroot/etc/apt/ ubuntusway-$architecture/etc/ -cp -rv "${rootdir}"/etc/config/includes.chroot/etc/netplan/ ubuntusway-$architecture/etc/ -cp -rv "${rootdir}"/etc/config/includes.chroot/usr ubuntusway-$architecture/ -cp -rv "${rootdir}"/rpi/greetd/* ubuntusway-${architecture}/etc/greetd/ - -echo -e " -#----------------------# -# RUNNING HOOKS # -#----------------------# -" - -mkdir ubuntusway-$architecture/hooks -cp -v "${rootdir}"/etc/config/hooks/live/*.chroot ubuntusway-$architecture/hooks - -hook_files="ubuntusway-$architecture/hooks/*" -for f in $hook_files -do - base=$(basename "${f}") - LANG=C.UTF-8 chroot ubuntusway-$architecture "/hooks/${base}" -done - -rm -r "ubuntusway-$architecture/hooks" - -# Create OEM user -echo -e " -#----------------------# -# CREATING OEM USER # -#----------------------# -" - -cat <> ubuntusway-$architecture/user -#!/bin/bash -DATE=$(date +%m%H%M%S) -PASSWD=$(mkpasswd -m sha-512 oem "${DATE}") -addgroup --gid 29999 oem -adduser --gecos "OEM Configuration (temporary user)" --add_extra_groups --disabled-password --gid 29999 --uid 29999 oem -usermod -a -G adm,sudo -p "${PASSWD}" oem -rm -f user -EOF - -chmod +x ubuntusway-$architecture/user -LANG=C.UTF-8 chroot ubuntusway-$architecture /user - -# Creating swapfile service -echo -e " -#----------------------# -# CREATING SWAPFILE # -#----------------------# -" - -mkdir -p ubuntusway-$architecture/usr/lib/systemd/system/swap.target.wants - -cat <> ubuntusway-$architecture/usr/lib/systemd/system/mkswap.service -[Unit] -Description=Create the default swapfile -DefaultDependencies=no -Requires=local-fs.target -After=local-fs.target -Before=swapfile.swap -ConditionPathExists=!/swapfile -[Service] -Type=oneshot -ExecStartPre=fallocate -l 1GiB /swapfile -ExecStartPre=chmod 600 /swapfile -ExecStart=mkswap /swapfile -[Install] -WantedBy=swap.target -EOF - -cat <> ubuntusway-$architecture/usr/lib/systemd/system/swapfile.swap -[Unit] -Description=The default swapfile -[Swap] -What=/swapfile -EOF - -cat <> ubuntusway-$architecture/enable_zswap -#!/bin/bash -ln -s /usr/lib/systemd/system/mkswap.service /usr/lib/systemd/system/swap.target.wants/mkswap.service -ln -s /usr/lib/systemd/system/swapfile.swap /usr/lib/systemd/system/swap.target.wants/swapfile.swap -update-initramfs -u -rm -f enable_zswap -EOF - -chmod +x ubuntusway-$architecture/enable_zswap -LANG=C.UTF-8 chroot ubuntusway-$architecture /enable_zswap - -# Cleanup chroot before creating .img -echo -e " -#----------------------# -# CLEANING CHROOT # -#----------------------# -" - -cat <> ubuntusway-$architecture/cleanup -#!/bin/bash - -apt-get -y autoremove -apt-get -y autoclean -apt-get -y clean - -rm -rf {*.bak,*.old} -rm -rf wget-log -rm -rf /boot/{*.bak,*.old} -rm -rf /etc/ssh/ssh_host_*_key* -rm -rf /etc/apt/*.save -rm -rf /etc/apt/apt.conf.d/90cache -rm -rf /etc/apt/sources.list.d/*.save -rm -rf /root/.wget-hsts -rm -rf /tmp/* -rm -rf /var/log/apt/* -rm -rf /var/log/alternatives.log -rm -rf /var/log/bootstrap.log -rm -rf /var/log/dpkg.log -rm -rf /var/log/fontconfig.log -rm -rf /var/cache/fontconfig/CACHEDIR.TAG -rm -rf /var/crash/* -rm -rf /var/lib/apt/lists/* -rm -rf /var/lib/dpkg/*-old - -[ -L /var/lib/dbus/machine-id ] || rm -f /var/lib/dbus/machine-id -echo '' > /etc/machine-id - -rm -f cleanup -EOF - -chmod +x ubuntusway-$architecture/cleanup -LANG=C.UTF-8 chroot ubuntusway-$architecture /cleanup - -echo -e " -#----------------------# -# CREATING IMAGE FILE # -#----------------------# -" - -# Calculate image size accounting for boot parition + 5% -boot_size="256" -root_size="$(du -cs --block-size=MB ubuntusway-$architecture | tail -n1 | cut -d'M' -f1)" -pad_size="$(( (root_size / 10) / 2 ))" -raw_size="$((boot_size + root_size + pad_size))" - -# Create the disk and partition it -fallocate -l "${raw_size}"M "${basedir}/${imagename}.img" - -parted "${imagename}.img" -s -- mklabel msdos -parted "${imagename}.img" -s -a optimal -- mkpart primary fat32 1 "${boot_size}MB" -parted "${imagename}.img" -s -a optimal -- mkpart primary ext4 "${boot_size}MB" 100% -parted "${imagename}.img" -s set 1 boot on - -# Set the partition variables -loopdevice=$(losetup -f --show "${basedir}/${imagename}.img") -device=$(kpartx -va "$loopdevice" | sed -E 's/.*(loop[0-9])p.*/\1/g' | head -1) -device="/dev/mapper/${device}" -bootp=${device}p1 -rootp=${device}p2 - -# Create file systems -mkfs.vfat -n system-boot -S 512 -s 16 -v "$bootp" -mkfs.ext4 -L writable -m 0 "$rootp" - -# Create the dirs for the partitions and mount them -mkdir -p "${basedir}/bootp" "${basedir}/root" -mount -t vfat "$bootp" "${basedir}/bootp" -mount "$rootp" "${basedir}/root" - -mkdir -p ubuntusway-$architecture/boot/firmware -mount -o bind "${basedir}/bootp/" ubuntusway-$architecture/boot/firmware - -# Copy Raspberry Pi specific files -cp -rv "${rootdir}"/rpi/rootfs/system-boot/* ubuntusway-${architecture}/boot/firmware/ - -NEW_KERNEL=$(find ubuntusway-$architecture/boot/vmlinuz-* | tail -n1 | awk -F/ '{print $NF}' | cut -d'-' -f2-4) - if [ -z "${NEW_KERNEL}" ]; then - echo "ERROR! Could not detect the new kernel version" - exit 1 - fi -echo "Kernel: ${NEW_KERNEL}" - -# Copy kernels and firmware to boot partition -cat << EOF > ubuntusway-$architecture/hardware -#!/bin/bash -cp -av /boot/vmlinuz-${NEW_KERNEL} /boot/firmware/vmlinuz -cp -av /boot/initrd.img-${NEW_KERNEL} /boot/firmware/initrd.img -# Copy device-tree blobs to fat32 partition -cp -v /lib/firmware/${NEW_KERNEL}/device-tree/broadcom/* /boot/firmware/ -cp -rv /lib/firmware/${NEW_KERNEL}/device-tree/overlays /boot/firmware/ -cp -v /lib/linux-firmware-raspi/* /boot/firmware/ -rm -f hardware -EOF - -chmod +x ubuntusway-$architecture/hardware -LANG=C.UTF-8 chroot ubuntusway-$architecture /hardware - -umount ubuntusway-$architecture/dev/pts -umount ubuntusway-$architecture/dev/ -umount ubuntusway-$architecture/proc -umount ubuntusway-$architecture/boot/firmware - -echo "Rsyncing rootfs into image file" -rsync -HPavz -q "${basedir}/ubuntusway-$architecture/" "${basedir}/root/" - -# Unmount partitions -umount "$bootp" -umount "$rootp" -kpartx -dv "$loopdevice" -losetup -d "$loopdevice" - -echo "Compressing ${imagename}.img" -xz -T0 -z "${basedir}/${imagename}.img" - -cd "${basedir}" - -md5sum "${imagename}.img.xz" | tee "${imagename}.md5.txt" -sha256sum "${imagename}.img.xz" | tee "${imagename}.sha256.txt" - -echo -e " -#----------------------# -# BUILD DONE # -#----------------------# -" diff --git a/build.sh b/build.sh index b37d9fa..cc2ebc8 100755 --- a/build.sh +++ b/build.sh @@ -52,9 +52,6 @@ patch -d /usr/share/debootstrap/ < debootstrap-backport-zstd-support.patch # This prevents error with "Disk full" on the lb binary_grub-efi stage patch -d /usr/lib/live/build/ < increase_number_of_blocks.patch -# Enable Lunar build in debootstrap -ln -sfn /usr/share/debootstrap/scripts/gutsy /usr/share/debootstrap/scripts/lunar - build () { BUILD_ARCH="$1" @@ -107,9 +104,9 @@ build () { OUTPUT_DIR="$BUILDS_DIR/$BUILD_ARCH" mkdir -p "$OUTPUT_DIR" if [ "$CHANNEL" == dev ]; then - FNAME="ubuntusway-$VERSION-$CHANNEL-$YYYYMMDD-$OUTPUT_SUFFIX-$ARCH" + FNAME="tileos-$DESKTOP-$VERSION-$CHANNEL-$YYYYMMDD-$OUTPUT_SUFFIX-$ARCH" elif [ "$CHANNEL" == stable ]; then - FNAME="ubuntusway-$VERSION-$OUTPUT_SUFFIX-$ARCH" + FNAME="tileos-$DESKTOP-$VERSION-$OUTPUT_SUFFIX-$ARCH" else echo -e "Error: invalid channel name!" fi diff --git a/debs/debian-keyring_2022.12.24_all.deb b/debs/debian-keyring_2022.12.24_all.deb new file mode 100644 index 0000000..1499355 Binary files /dev/null and b/debs/debian-keyring_2022.12.24_all.deb differ diff --git a/debs/ubuntu-keyring_2021.03.26_all.deb b/debs/ubuntu-keyring_2021.03.26_all.deb deleted file mode 100644 index 9ba9b8e..0000000 Binary files a/debs/ubuntu-keyring_2021.03.26_all.deb and /dev/null differ diff --git a/etc/auto/config b/etc/auto/config index 0e66871..5c92ae6 100755 --- a/etc/auto/config +++ b/etc/auto/config @@ -4,34 +4,26 @@ set -e . ./terraform.conf -# HWE starts with y, Y or 1? -if [ "$HWE" = "yes" ]; then - KERNEL_FLAVORS="generic-hwe-${BASEVERSION}" -else - KERNEL_FLAVORS="generic" -fi - lb config noauto \ --architectures "$ARCH" \ --mode debian \ --initramfs none \ --distribution "$BASECODENAME" \ --parent-distribution "$BASECODENAME" \ - --archive-areas "main restricted universe multiverse" \ - --parent-archive-areas "main restricted universe multiverse" \ + --archive-areas "main contrib non-free non-free-firmware" \ + --parent-archive-areas "main contrib non-free non-free-firmware" \ --linux-packages linux-image \ - --linux-flavours "$KERNEL_FLAVORS" \ - --bootappend-live "boot=casper quiet splash" \ + --bootappend-live "boot=live quiet splash" \ --mirror-bootstrap "$MIRROR_URL" \ --parent-mirror-bootstrap "$MIRROR_URL" \ - --mirror-chroot-security "http://security.ubuntu.com/ubuntu/" \ - --parent-mirror-chroot-security "http://security.ubuntu.com/ubuntu/" \ - --mirror-binary-security "http://security.ubuntu.com/ubuntu/" \ - --parent-mirror-binary-security "http://security.ubuntu.com/ubuntu/" \ + --mirror-chroot-security "http://deb.debian.org/debian-security/" \ + --parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \ + --mirror-binary-security "http://deb.debian.org/debian-security/" \ + --parent-mirror-binary-security "http://deb.debian.org/debian-security/" \ --apt-source-archives false \ --mirror-binary "$MIRROR_URL" \ --parent-mirror-binary "$MIRROR_URL" \ - --keyring-packages ubuntu-keyring \ + --keyring-packages debian-keyring \ --apt-options "--yes --option Acquire::Retries=5 --option Acquire::http::Timeout=100" \ --cache-packages false \ --checksums md5 \ @@ -44,13 +36,16 @@ lb config noauto \ --zsync false \ --security true \ --updates true \ - --debootstrap-options="--extractor=ar --include=lsb-release-minimal" \ + --debootstrap-options="--extractor=ar --variant=minbase" \ "${@}" # replace channel and suite sed -i "s/@CHANNEL/$CHANNEL/" config/archives/*.list* sed -i "s/@BASECODENAME/$BASECODENAME/" config/archives/*.list* +# replace desktop +sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install + DATE=$(date +%Y%m%d) sed -i "s/@CHANNEL/$CHANNEL/" config/includes.binary/.disk/info sed -i "s/@CODENAME/$CODENAME/" config/includes.binary/.disk/info @@ -58,5 +53,3 @@ sed -i "s/@ARCH/$ARCH/" config/includes.binary/.disk/info sed -i "s/@DISTRO_NAME/$NAME/" config/includes.binary/.disk/info sed -i "s/@VERSION/$VERSION/" config/includes.binary/.disk/info sed -i "s/@DATE/$DATE/" config/includes.binary/.disk/info - -sed -i "s/@XORG_HWE/$XORG_HWE/" config/package-lists/desktop.list.chroot_install diff --git a/etc/config/archives/mozillateam.key b/etc/config/archives/mozillateam.key deleted file mode 100644 index 42077f3..0000000 --- a/etc/config/archives/mozillateam.key +++ /dev/null @@ -1,155 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Comment: Hostname: -Version: Hockeypuck ~unreleased - -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 -o5I= -=T8PE ------END PGP PUBLIC KEY BLOCK----- - diff --git a/etc/config/archives/mozillateam.list b/etc/config/archives/mozillateam.list deleted file mode 100644 index 2d3328f..0000000 --- a/etc/config/archives/mozillateam.list +++ /dev/null @@ -1 +0,0 @@ -deb https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu @BASECODENAME main diff --git a/etc/config/archives/mozillateam.pref b/etc/config/archives/mozillateam.pref deleted file mode 100644 index 99a05aa..0000000 --- a/etc/config/archives/mozillateam.pref +++ /dev/null @@ -1,3 +0,0 @@ -Package: firefox* -Pin: release o=LP-PPA-mozillateam -Pin-Priority: 501 diff --git a/etc/config/archives/nosnap.pref b/etc/config/archives/nosnap.pref deleted file mode 100644 index c425d07..0000000 --- a/etc/config/archives/nosnap.pref +++ /dev/null @@ -1,3 +0,0 @@ -Package: snapd -Pin: release a=* -Pin-Priority: -10 diff --git a/etc/config/archives/tileos.list b/etc/config/archives/tileos.list new file mode 100644 index 0000000..64ed67f --- /dev/null +++ b/etc/config/archives/tileos.list @@ -0,0 +1 @@ +# Repositories will added later diff --git a/etc/config/archives/ubuntusway.key b/etc/config/archives/ubuntusway.key deleted file mode 100644 index 5bb0c06..0000000 --- a/etc/config/archives/ubuntusway.key +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Comment: Hostname: -Version: Hockeypuck ~unreleased - -xsFNBGJdon4BEACzsoiNVFCLjHA9tesJbSVtCi5tzF9eOUH655ftAX/VFhoZ3kUq -Kc955/3d5AH5qov2P1+lqpXrWlmV7b6EB/H/i0Xy65Y4PtvCFQjYl2OcVKVRZeNG -uryvCWe1OhB3HqWOrXTHig6j84ZzyMe0Uva9VKMUrYc2bitO7+NgEsGDHtUSk5sj -6ix4TusuxcuGxknbz9LkHNsIrrGpjoJjVBTc500+A2IfqzF29rKWVBLHQHSw8cg5 -KhpGAAhMvQp65eAylHH7eZCvyQ6NmMwt3La4W8lgj5Cjt53J5I/cSdH0yfMRtwqF -6pmNpsasvDQm7mses9cN1QBIcEGlckf3hiQMnzUySOfrP4w6gRixbW60wRi8Pznk -vjyvCsVMmd83zpqbm6VYWOiSo1oJYz6GieSFwHmvj+fUrzQmXFwHmqiMg1LPahuB -BgX7mKM40Hsuw8nAtEtYVHsIKwlPi9bPaC/rvs7BWELwdCI4LBN3FGNnaY9ZJmf2 -QlWfSPSB0BrsZJin1KqO/BhtWkLUYYAMLgNbPr71MKqYLAF055zjAztswVQpMG6x -GP95OTwilTA6B71cZxE5bPVkGSobkWizW4a/hEAf/HHd5x+BNCrkj4bz+GSKBjkl -i+sycbdtXvzI+s/EfaYKOLYRhO7WIJ2+EflHwmszJBFgZNlPnA4FZ1w6hQARAQAB -zSNMYXVuY2hwYWQgUFBBIGZvciBVYnVudHUgU3dheSBSZW1peMLBjgQTAQoAOBYh -BGHdtizCkY+I0zCnZnYZrGGiVdhKBQJiXaJ+AhsDBQsJCAcCBhUKCQgLAgQWAgMB -Ah4BAheAAAoJEHYZrGGiVdhKNjkP/34moHl77cBvCHV2wxGa+Jx+VgLdup/BzIHh -BdfYqSP539xVSs/LQjKxoN9VL9p+RS8sK+TEcgWbdKH1Bxs/gsavElMzRWDJ2XF5 -TKUIlUINCMNwbt3M98hAsSxtvwu41RzMN+N4vqeaP0QjVH4s63f20q+Vwl6GDOri -aWThJpbQHYlnLcpdAO8CFsNIep/DqUR8leTXWkRo1uEKZ0ulJN5t53Wedi1hXeUu -sW3Sei5rX/LYyMOzJFvmC8h/bCfrqlbOsW+jTNQYSRbHzR4BA/jl2K1pquTZzXbv -+hFA7E4gwAj8xuyDbhct5HElM3KQOCDlNvXuV2TKjsAJOh09NR1kdLdDHy7VmCVO -n5Dif5TuI8t3NmgycnknwmkaZbeNRup0pF5iKnE1dN22sev8fUDM0rOly/VDPG6m -kjiVbzVk02cjEO52Jiwn5XwP5OJ6YsTHBShf+9uK5Dm4iInOJroBP2oQjY8wmEoy -pz5BqE7D0fIW4XLYR97Cq7t59j7Dh8OgxYXTimcgKgxBX3m4hoeCmYYpIj9PRj6r -NJJ5R//jGOApfVOEruLan/GWX3V5Tn3T8v8MPa/hKeCt9yCoBBRZ2rmySTjxnfAo -+kfIA2LZDdpk7ODdXNcmpwsalM04k1Ndwq0khf9cfqVoytcMBxDtvx+3LfjSRwuV -t/yvBuay -=hmew ------END PGP PUBLIC KEY BLOCK----- diff --git a/etc/config/archives/ubuntusway.list b/etc/config/archives/ubuntusway.list deleted file mode 100644 index 8ff7c6f..0000000 --- a/etc/config/archives/ubuntusway.list +++ /dev/null @@ -1,2 +0,0 @@ -deb https://ppa.launchpadcontent.net/ubuntusway-dev/@CHANNEL/ubuntu @BASECODENAME main -deb-src https://ppa.launchpadcontent.net/ubuntusway-dev/@CHANNEL/ubuntu @BASECODENAME main diff --git a/etc/config/bootloaders/grub-pc/dejavu-bold-14.pf2 b/etc/config/bootloaders/grub-pc/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b2..0000000 Binary files a/etc/config/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ diff --git a/etc/config/bootloaders/grub-pc/dejavu-bold-16.pf2 b/etc/config/bootloaders/grub-pc/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7a..0000000 Binary files a/etc/config/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ diff --git a/etc/config/bootloaders/grub-pc/grub.cfg b/etc/config/bootloaders/grub-pc/grub.cfg deleted file mode 100644 index f258d98..0000000 --- a/etc/config/bootloaders/grub-pc/grub.cfg +++ /dev/null @@ -1,59 +0,0 @@ -load function_video { - if [ x$feature_all_video_module = xy ] - then - insmod all_video - else - insmod video_bochs - insmod video_cirrus - if test "${grub_platform}" == "efi" - then - insmod efi_gop - insmod efi_uga - elif test "${grub_platform}" == "pc" - then - insmod vbe - insmod vga - fi - fi -} - -set color_normal=white/black -set color_highlight=black/light-gray -set timeout=10 -set timeout_style=menu - -set theme=/boot/grub/ubuntusway-theme/theme.txt - -if loadfont /boot/grub/dejavu-bold-14.pf2 -then - set gfxmode=auto - export gfxmode - load_video - insmod gfxterm - terminal_output gfxterm - insmod gfxmenu - insmod png - export theme -fi - - -menuentry "Start Ubuntu Sway Remix" --class ubuntu { - set gfxpayload=keep - linux /casper/vmlinuz boot=casper quiet splash --- - initrd /casper/initrd.lz - -} - -menuentry "Check for Disk Defects" --class memtest { - set gfxpayload=keep - linux /casper/vmlinuz boot=casper integrity-check --- - initrd /casper/initrd.lz -} - -menuentry "EFI Firmware Settings" --class efi { - fwsetup -} - -menuentry "Power Off" --class shutdown { - halt -} diff --git a/etc/config/bootloaders/grub-pc/ubuntusway-theme/background.png b/etc/config/bootloaders/grub-pc/ubuntusway-theme/background.png deleted file mode 100644 index 3bc4e24..0000000 Binary files a/etc/config/bootloaders/grub-pc/ubuntusway-theme/background.png and /dev/null differ diff --git a/etc/config/bootloaders/grub-pc/ubuntusway-theme/logo.png b/etc/config/bootloaders/grub-pc/ubuntusway-theme/logo.png deleted file mode 100644 index 85e3af8..0000000 Binary files a/etc/config/bootloaders/grub-pc/ubuntusway-theme/logo.png and /dev/null differ diff --git a/etc/config/bootloaders/grub-pc/ubuntusway-theme/theme.txt b/etc/config/bootloaders/grub-pc/ubuntusway-theme/theme.txt deleted file mode 100644 index f519cf4..0000000 --- a/etc/config/bootloaders/grub-pc/ubuntusway-theme/theme.txt +++ /dev/null @@ -1,61 +0,0 @@ -title-text: "" -desktop-image: "background.png" -desktop-color: "#000000" -title-color: "#ffffff" -title-font: "DejaVu Sans Bold 16" -message-font: "Unifont Regular 16" - -terminal-left: "0" -terminal-top: "0" -terminal-width: "100%" -terminal-height: "100%" -terminal-border: "0" - -# Logo image -+ image { - left = 50%-270 - top = 50%-200 - file = "logo.png" -} - -#help bar at the bottom -+ label { - top = 100%-50 - left = 0 - width = 100% - height = 20 - text = "@KEYMAP_SHORT@" - align = "center" - color = "#ffffff" - font = "DejaVu Sans Bold 14" -} - -#boot menu -+ boot_menu { - left = 50%-125 - width = 500 - top = 50%+100 - height = 300 - - item_font = "DejaVu Sans Bold 14" - item_color = "#999" - selected_item_font = "DejaVu Sans Bold 14" - selected_item_color= "#fff" - - item_height = 26 - item_padding = 0 - item_icon_space = 0 - item_spacing = 1 - scrollbar = false -} - -# Show a countdown message using the label component -+ label { - top = 55% - left = 35% - width = 30% - align = "center" - id = "__timeout__" - text = "Booting in %d seconds" - color = "#f6f6f6" -} diff --git a/etc/config/bootloaders/isolinux/hdt.c32 b/etc/config/bootloaders/isolinux/hdt.c32 deleted file mode 120000 index f84c641..0000000 --- a/etc/config/bootloaders/isolinux/hdt.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/hdt.c32 \ No newline at end of file diff --git a/etc/config/bootloaders/isolinux/isolinux.bin b/etc/config/bootloaders/isolinux/isolinux.bin deleted file mode 120000 index 33a2ad6..0000000 --- a/etc/config/bootloaders/isolinux/isolinux.bin +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/ISOLINUX/isolinux.bin \ No newline at end of file diff --git a/etc/config/bootloaders/isolinux/isolinux.cfg b/etc/config/bootloaders/isolinux/isolinux.cfg deleted file mode 100644 index 0fa3783..0000000 --- a/etc/config/bootloaders/isolinux/isolinux.cfg +++ /dev/null @@ -1,3 +0,0 @@ -default vesamenu.c32 -include stdmenu.cfg -include live.cfg diff --git a/etc/config/bootloaders/isolinux/ldlinux.c32 b/etc/config/bootloaders/isolinux/ldlinux.c32 deleted file mode 120000 index df554c7..0000000 --- a/etc/config/bootloaders/isolinux/ldlinux.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/ldlinux.c32 \ No newline at end of file diff --git a/etc/config/bootloaders/isolinux/libcom32.c32 b/etc/config/bootloaders/isolinux/libcom32.c32 deleted file mode 120000 index 44ab36b..0000000 --- a/etc/config/bootloaders/isolinux/libcom32.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libcom32.c32 \ No newline at end of file diff --git a/etc/config/bootloaders/isolinux/libgpl.c32 b/etc/config/bootloaders/isolinux/libgpl.c32 deleted file mode 120000 index 81c83fb..0000000 --- a/etc/config/bootloaders/isolinux/libgpl.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libgpl.c32 \ No newline at end of file diff --git a/etc/config/bootloaders/isolinux/libmenu.c32 b/etc/config/bootloaders/isolinux/libmenu.c32 deleted file mode 120000 index 2491ff9..0000000 --- a/etc/config/bootloaders/isolinux/libmenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libmenu.c32 \ No newline at end of file diff --git a/etc/config/bootloaders/isolinux/libutil.c32 b/etc/config/bootloaders/isolinux/libutil.c32 deleted file mode 120000 index 478194e..0000000 --- a/etc/config/bootloaders/isolinux/libutil.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/libutil.c32 \ No newline at end of file diff --git a/etc/config/bootloaders/isolinux/live.cfg.in b/etc/config/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 6ae563a..0000000 --- a/etc/config/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,38 +0,0 @@ -prompt 0 - -MENU HIDDEN -MENU AUTOBOOT Booting ubuntu sway live disk in # seconds -timeout 50 - -label live-@FLAVOUR@ - menu label ^Start Ubuntu Sway Remix - menu default - linux /casper/vmlinuz - initrd /casper/initrd.lz - append @APPEND_LIVE@ - -MENU SEPARATOR - -label live-failsafe - menu label Start Ubuntu Sway Remix (Safe Graphics) - set gfxpayload=keep - linux /casper/vmlinuz - initrd /casper/initrd.lz - append @APPEND_LIVE@ nomodeset - -MENU SEPARATOR - -label check - menu label ^Check disk for Defects - linux /casper/vmlinuz - append boot=casper integrity-check initrd=/casper/initrd.lz quiet -- - -MENU SEPARATOR - -label hd - menu label ^Boot from first hard disk - localboot 0x80 -MENU SEPARATOR -LABEL power - MENU LABEL ^Power Off - COM32 poweroff.c32 diff --git a/etc/config/bootloaders/isolinux/menu.c32 b/etc/config/bootloaders/isolinux/menu.c32 deleted file mode 120000 index 86c360d..0000000 --- a/etc/config/bootloaders/isolinux/menu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/menu.c32 \ No newline at end of file diff --git a/etc/config/bootloaders/isolinux/poweroff.c32 b/etc/config/bootloaders/isolinux/poweroff.c32 deleted file mode 100644 index 435b764..0000000 Binary files a/etc/config/bootloaders/isolinux/poweroff.c32 and /dev/null differ diff --git a/etc/config/bootloaders/isolinux/stdmenu.cfg b/etc/config/bootloaders/isolinux/stdmenu.cfg deleted file mode 100644 index cb7f674..0000000 --- a/etc/config/bootloaders/isolinux/stdmenu.cfg +++ /dev/null @@ -1,42 +0,0 @@ -menu hshift 13 -menu width 49 -menu margin 8 - -# Override the default radial gradient background with black -menu background #ff000000 - -# Title bar -menu color title 0 #ffffffff #00000000 * - -# Border Area -menu color border * #00000000 #00000000 none - -# Unselected menu item -menu color unsel 0 #999999 #00000000 * - -# Unselected hotkey -menu color hotkey 0 #999999 #00000000 none - -# Selection bar -menu color sel 0 #ffffff #00000000 none - -# Selected hotkey -menu color hotsel 0 #ffffffff #00000000 none - -# Press [Tab] message -menu color tabmsg 0 #f6f6f6 #00000000 none - -# Timeout message -menu color timeout_msg 0 #f6f6f6 #00000000 none - -# Timeout counter -menu color timeout * #ffffffff #00000000 none - -# Command line -menu color cmdline 0 #ffffffff #00000000 none - -# Command line marker -menu color cmdmark 0 #00000000 #00000000 none - -# Helptest -menu color help 0 #ffffffff #00000000 none diff --git a/etc/config/bootloaders/isolinux/vesamenu.c32 b/etc/config/bootloaders/isolinux/vesamenu.c32 deleted file mode 120000 index 84e2eff..0000000 --- a/etc/config/bootloaders/isolinux/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/vesamenu.c32 \ No newline at end of file diff --git a/etc/config/hooks/live/000-remove-blacklisted-packages.chroot b/etc/config/hooks/live/000-remove-blacklisted-packages.chroot deleted file mode 100755 index 745721f..0000000 --- a/etc/config/hooks/live/000-remove-blacklisted-packages.chroot +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# Description: Checkout seed branches and remove blacklisted packages - -echo "P: Begin executing remove-blacklisted-packages chroot hook..." - -dist="$(lsb_release -c -s -u 2>&1)"||dist="$(lsb_release -c -s)" - -apt-get install --no-install-recommends -f -q -y git - -git clone --depth 1 https://github.com/Ubuntu-Sway/seeds.git --single-branch --branch "$dist" - -for package in $(cat 'seeds/blacklist' | grep -v '#'); do - apt-get autoremove --purge -f -q -y "$package" -done - -apt-get autoremove --purge -f -q -y git - -rm -R ../seeds diff --git a/etc/config/hooks/live/setup-casper-folder.binary b/etc/config/hooks/live/setup-casper-folder.binary deleted file mode 100755 index d3f63e9..0000000 --- a/etc/config/hooks/live/setup-casper-folder.binary +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -mkdir casper || true -mv boot/filesystem.squashfs casper/filesystem.squashfs -mv boot/filesystem.size casper/filesystem.size -mv boot/initrd.img-* casper/initrd.lz -mv boot/vmlinuz-* casper/vmlinuz -mv boot/filesystem.packages-remove casper/filesystem.manifest-remove -mv boot/filesystem.packages casper/filesystem.manifest - -mkdir live || true -cp casper/vmlinuz live/vmlinuz diff --git a/etc/config/includes.chroot/etc/apt/preferences.d/99mozillateamppa b/etc/config/includes.chroot/etc/apt/preferences.d/99mozillateamppa deleted file mode 100644 index 80e5584..0000000 --- a/etc/config/includes.chroot/etc/apt/preferences.d/99mozillateamppa +++ /dev/null @@ -1,7 +0,0 @@ -Package: firefox* -Pin: release o=LP-PPA-mozillateam -Pin-Priority: 501 - -Package: firefox* -Pin: release o=Ubuntu -Pin-Priority: -1 diff --git a/etc/config/includes.chroot/etc/greetd/config.toml b/etc/config/includes.chroot/etc/greetd/config.toml index b519bb2..b9f88c2 100644 --- a/etc/config/includes.chroot/etc/greetd/config.toml +++ b/etc/config/includes.chroot/etc/greetd/config.toml @@ -2,9 +2,9 @@ vt = 7 [default_session] -command = "tuigreet --remember --time --issue --asterisks --cmd start-sway" +command = "cage -s -d -- regreet" user = "_greetd" [initial_session] command = "start-sway" -user = "ubuntu" +user = "tileos" diff --git a/etc/config/includes.chroot/etc/netplan/01-network-manager-all.yml b/etc/config/includes.chroot/etc/netplan/01-network-manager-all.yml deleted file mode 100644 index 4a8fd08..0000000 --- a/etc/config/includes.chroot/etc/netplan/01-network-manager-all.yml +++ /dev/null @@ -1,4 +0,0 @@ -# Let NetworkManager manage all devices on this system -network: - version: 2 - renderer: NetworkManager diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_install b/etc/config/package-lists.calamares/desktop.list.chroot_install index 3d1dbd0..c9890d0 100644 --- a/etc/config/package-lists.calamares/desktop.list.chroot_install +++ b/etc/config/package-lists.calamares/desktop.list.chroot_install @@ -1,5 +1,4 @@ -ubuntu-sway-desktop -ubuntu-sway-minimal -ubuntu-sway-standard - -@XORG_HWE +tileos-base +tileos-desktop-common +tileos-drivers +tileos-desktop-@DESKTOP diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_live b/etc/config/package-lists.calamares/desktop.list.chroot_live index 4e5744b..16a37d5 100644 --- a/etc/config/package-lists.calamares/desktop.list.chroot_live +++ b/etc/config/package-lists.calamares/desktop.list.chroot_live @@ -1,5 +1 @@ -ubuntu-sway-live -ntfs-3g -fwupdate -shim-signed -shim +tileos-live diff --git a/etc/terraform.conf b/etc/terraform.conf index 5216efb..19c6d89 100644 --- a/etc/terraform.conf +++ b/etc/terraform.conf @@ -2,29 +2,29 @@ ARCH="amd64" # base codename -BASECODENAME="lunar" +BASECODENAME="bookworm" # base version -BASEVERSION="23.04" +BASEVERSION="12" # distribution codename -CODENAME="lunar" +CODENAME="t-rex" + +# desktop name (sway, river) +DESKTOP=sway # distribution version -VERSION="23.04" +VERSION="1.0" # distribution channel #CHANNEL="stable" CHANNEL="dev" # distribution name -NAME="Ubuntu Sway Remix" +NAME="TileOS" # mirror to fetch packages from -MIRROR_URL="http://archive.ubuntu.com/ubuntu/" - -# use HWE kernel and packages? -HWE="no" +MIRROR_URL="http://deb.debian.org/debian/" # suffix for generated .iso files OUTPUT_SUFFIX="desktop" diff --git a/rpi/greetd/config.toml b/rpi/greetd/config.toml deleted file mode 100644 index 9b00da8..0000000 --- a/rpi/greetd/config.toml +++ /dev/null @@ -1,10 +0,0 @@ -[terminal] -vt = "next" - -[default_session] -command = "tuigreet --remember --time --issue --asterisks --cmd sway" -user = "_greetd" - -[initial_session] -command = "sway --config /etc/greetd/oem-setup" -user = "oem" diff --git a/rpi/greetd/oem-setup b/rpi/greetd/oem-setup deleted file mode 100644 index 23d0030..0000000 --- a/rpi/greetd/oem-setup +++ /dev/null @@ -1,22 +0,0 @@ -# global variables -include /etc/sway/variables - -# include theme specific definitions -include /usr/share/ubuntusway/themes/yaru-sway/variables - -# enable default input/output devices -include /etc/sway/inputs/*.conf -include /etc/sway/outputs/*.conf - -# start calamares if available, otherwise start the greeter -for_window [app_id="io.calamares.calamares"] floating enable - -exec { - '[ -x "$(command -v calamares)" ] && sudo -E calamares -d -style Fusion || swaymsg exit' -} - -# offer shutdown options -bindsym $mod+Shift+e exec nwg-bar -x - -# capture PowerOff key -bindsym XF86PowerOff exec systemctl shutdown diff --git a/rpi/rootfs/system-boot/cmdline.txt b/rpi/rootfs/system-boot/cmdline.txt deleted file mode 100644 index 8fddf6f..0000000 --- a/rpi/rootfs/system-boot/cmdline.txt +++ /dev/null @@ -1 +0,0 @@ -zswap.enabled=1 zswap.zpool=z3fold zswap.compressor=lz4 dwc_otg.lpm_enable=0 console=tty1 root=LABEL=writable rootfstype=ext4 rootwait fixrtc quiet splash diff --git a/rpi/rootfs/system-boot/config.txt b/rpi/rootfs/system-boot/config.txt deleted file mode 100644 index c057551..0000000 --- a/rpi/rootfs/system-boot/config.txt +++ /dev/null @@ -1,45 +0,0 @@ -[all] -kernel=vmlinuz -cmdline=cmdline.txt -initramfs initrd.img followkernel - -[pi4] -max_framebuffers=2 -arm_boost=1 - -[all] -# Enable the audio output, I2C and SPI interfaces on the GPIO header. As these -# parameters related to the base device-tree they must appear *before* any -# other dtoverlay= specification -dtparam=audio=on -dtparam=i2c_arm=on -dtparam=spi=on - -# Comment out the following line if the edges of the desktop appear outside -# the edges of your display -disable_overscan=1 - -# If you have issues with audio, you may try uncommenting the following line -# which forces the HDMI output into HDMI mode instead of DVI (which doesn't -# support audio output) -hdmi_drive=2 - -[cm4] -# Enable the USB2 outputs on the IO board (assuming your CM4 is plugged into -# such a board) -dtoverlay=dwc2,dr_mode=host - -[all] -# Enable the KMS ("full" KMS) graphics overlay, leaving GPU memory as the -# default (the kernel is in control of graphics memory with full KMS) -dtoverlay=vc4-kms-v3d - -# Autoload overlays for any recognized cameras or displays that are attached -# to the CSI/DSI ports. Please note this is for libcamera support, *not* for -# the legacy camera stack -camera_auto_detect=1 -display_auto_detect=1 - -# Config settings specific to arm64 -arm_64bit=1 -dtoverlay=dwc2" diff --git a/rpi/rootfs/writable/etc/oem.conf b/rpi/rootfs/writable/etc/oem.conf deleted file mode 100644 index c68cce4..0000000 --- a/rpi/rootfs/writable/etc/oem.conf +++ /dev/null @@ -1,5 +0,0 @@ -[OEM] -Manufacturer=Raspberry Pi Foundation -Product=Raspberry Pi -Logo=/etc/oem/logo.svg -URL=https://www.raspberrypi.org/ diff --git a/rpi/rootfs/writable/etc/oem/logo.svg b/rpi/rootfs/writable/etc/oem/logo.svg deleted file mode 100644 index 62fc4f8..0000000 --- a/rpi/rootfs/writable/etc/oem/logo.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - -image/svg+xml