From d1e369ef46c39693745c5784e0cd3190b59aca4c Mon Sep 17 00:00:00 2001 From: galder Date: Wed, 3 May 2023 12:23:56 +0100 Subject: [PATCH] kubuntuMainline (#84) --- 02_build_image.sh | 2 +- 04_create_iso.sh | 4 ++-- build.sh | 4 ++-- files/chroot_build.sh | 20 ++++++++++++++------ files/grub/grub.cfg | 10 +++++----- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/02_build_image.sh b/02_build_image.sh index 2fb98ef..1262c18 100755 --- a/02_build_image.sh +++ b/02_build_image.sh @@ -37,7 +37,7 @@ done echo >&2 "===]> Info: Create diskdefines... " cat <"${IMAGE_PATH}"/README.diskdefines -#define DISKNAME Ubuntu MBP 23.04 "Lunar Lobster" - amd64 +#define DISKNAME Kubuntu MBP 23.04 "Lunar Lobster" - amd64 #define TYPE binary #define TYPEbinary 1 #define ARCH amd64 diff --git a/04_create_iso.sh b/04_create_iso.sh index 93deb7f..7243abe 100755 --- a/04_create_iso.sh +++ b/04_create_iso.sh @@ -10,7 +10,7 @@ echo >&2 "===]> Info: Create Isolinux... " xorriso -as mkisofs \ -iso-level 3 \ -full-iso9660-filenames \ - -volid "UBUNTU_MBP" \ + -volid "KUBUNTU_MBP" \ -b boot/grub/bios.img \ -no-emul-boot \ -boot-load-size 4 \ @@ -23,7 +23,7 @@ xorriso -as mkisofs \ -no-emul-boot \ -isohybrid-mbr "${ROOT_PATH}/files/isohdpfx.bin" \ -isohybrid-gpt-basdat -isohybrid-apm-hfsplus \ - -output "${ROOT_PATH}/ubuntu-23.04-${KERNEL_VERSION}.iso" \ + -output "${ROOT_PATH}/kubuntu-23.04-${KERNEL_VERSION}.iso" \ -graft-points \ "." \ /boot/grub/bios.img=isolinux/bios.img \ diff --git a/build.sh b/build.sh index 5de4a6f..858924e 100755 --- a/build.sh +++ b/build.sh @@ -40,7 +40,7 @@ for ALTERNATIVE in t2-lunar do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " - echo >&2 "===]> Info: Build Ubuntu Lunar... " + echo >&2 "===]> Info: Build Kubuntu Lunar... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ @@ -85,7 +85,7 @@ do fi ### Zip iso and split it into multiple parts - github max size of release attachment is 2GB, where ISO is sometimes bigger than that cd "${ROOT_PATH}" - zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-23.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" + zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/kubuntu-23.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" done ## Calculate sha256 sums of built ISO sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256" diff --git a/files/chroot_build.sh b/files/chroot_build.sh index a2129c9..ca27df8 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -11,7 +11,7 @@ mount none -t devpts /dev/pts export HOME=/root export LC_ALL=C -echo "ubuntu-lunar-live" >/etc/hostname +echo "kubuntu-lunar-live" >/etc/hostname echo >&2 "===]> Info: Configure and update apt... " @@ -45,7 +45,7 @@ echo >&2 "===]> Info: Install packages needed for Live System... " export DEBIAN_FRONTEND=noninteractive apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ - ubuntu-standard \ + kde-standard \ sudo \ casper \ discover \ @@ -75,10 +75,17 @@ echo >&2 "===]> Info: Install window manager... " apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ plymouth-theme-spinner \ + plymouth-theme-kubuntu-logo \ + plymouth-theme-kubuntu-text \ plymouth-theme-ubuntu-text \ - ubuntu-desktop-minimal \ - ubuntu-gnome-wallpapers \ - snapd + kde-plasma-desktop \ + kubuntu-desktop \ + kubuntu-settings-desktop \ + kubuntu-wallpapers \ + kde-plasma-desktop \ + sddm-theme-breeze \ + snapd \ + software-properties-common \ echo >&2 "===]> Info: Install Graphical installer... " @@ -86,7 +93,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" ubiquity \ ubiquity-casper \ ubiquity-frontend-gtk \ - ubiquity-slideshow-ubuntu \ + ubiquity-slideshow-kubuntu \ ubiquity-ubuntu-artwork echo >&2 "===]> Info: Install useful applications and sound configuration... " @@ -143,6 +150,7 @@ apt-get purge -y -qq \ linux-image-generic \ linux-modules-6.2.0-20-generic \ linux-modules-extra-6.2.0-20-generic \ + sddm-theme-debian-maui \ gedit apt-get autoremove -y diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 8fd1473..d20fde0 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -6,23 +6,23 @@ insmod all_video set default="0" set timeout=30 -menuentry "Try Ubuntu Lunar Lobster without installing" { +menuentry "Try Kubuntu Lunar Lobster without installing" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu Lunar Lobster without installing (Safe Graphics)" { +menuentry "Try Kubuntu Lunar Lobster without installing (Safe Graphics)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset pcie_ports=compat intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu Lunar Lobster without installing (NVMe blacklisted)" { +menuentry "Try Kubuntu Lunar Lobster without installing (NVMe blacklisted)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat intel_iommu=on iommu=pt modprobe.blacklist=nvme --- initrd /casper/initrd } -menuentry "Install Ubuntu Lunar Lobster" { +menuentry "Install Kubuntu Lunar Lobster" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Install Ubuntu Lunar Lobster (NVMe blacklisted)" { +menuentry "Install Kubuntu Lunar Lobster (NVMe blacklisted)" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt modprobe.blacklist=nvme --- initrd /casper/initrd }