diff --git a/build.sh b/build.sh index 42ad083..916d42b 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,10 @@ ROOT_PATH=$(pwd) WORKING_PATH=/root/work CHROOT_PATH="${WORKING_PATH}/chroot" IMAGE_PATH="${WORKING_PATH}/image" -KERNEL_VERSION=5.16.0 +KERNEL_VERSION=5.15.14 +PKGREL=2 +sed -i "s/KVER/${KERNEL_VERSION}/g" $(pwd)/files/chroot_build.sh +sed -i "s/PREL/${PKGREL}/g" $(pwd)/files/chroot_build.sh if [ -d "$WORKING_PATH" ]; then rm -rf "$WORKING_PATH" diff --git a/files/chroot_build.sh b/files/chroot_build.sh index f105a3e..2eb17cd 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -68,8 +68,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" # This is not ideal, but it should work until the apt repo gets updated. -curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/v5.16-2/linux-headers-5.16.0-t2_5.16.0-2_amd64.deb > /tmp/headers.deb -curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/v5.16-2/linux-image-5.16.0-t2_5.16.0-2_amd64.deb > /tmp/image.deb +curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-t2_KVER-2_amd64.deb > /tmp/headers.deb +curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-t2_PREL-2_amd64.deb > /tmp/image.deb curl -L https://cdn.discordapp.com/attachments/706581810745966653/926729551558639646/iso-firmware.deb > /tmp/firmware.deb file /tmp/* apt install /tmp/headers.deb /tmp/image.deb /tmp/firmware.deb diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 5f4879b..d19c83e 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -7,35 +7,35 @@ set default="0" set timeout=30 menuentry "Try Ubuntu FS without installing" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force --- + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force intel_iommu=on iommu=pt quiet splash --- initrd /casper/initrd } menuentry "Try Ubuntu FS without installing (efi=noruntime)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force --- + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt quiet splash --- initrd /casper/initrd } menuentry "Try Ubuntu FS without installing (blacklist=thunderbolt)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force --- modprobe.blacklist=thunderbolt + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force intel_iommu=on iommu=pt quiet splash --- modprobe.blacklist=thunderbolt initrd /casper/initrd } menuentry "Try Ubuntu FS without installing (blacklist=thunderbolt and efi=noruntime)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force --- modprobe.blacklist=thunderbolt + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt quiet splash --- modprobe.blacklist=thunderbolt initrd /casper/initrd } menuentry "Install Ubuntu FS" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force --- + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force intel_iommu=on iommu=pt quiet splash --- initrd /casper/initrd } menuentry "Install Ubuntu FS (efi=noruntime)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force --- + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt quiet splash --- initrd /casper/initrd } menuentry "Install Ubuntu FS (blacklist=thunderbolt)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force --- modprobe.blacklist=thunderbolt + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force intel_iommu=on iommu=pt quiet splash --- modprobe.blacklist=thunderbolt initrd /casper/initrd } menuentry "Install Ubuntu FS (blacklist=thunderbolt and efi=noruntime)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force --- modprobe.blacklist=thunderbolt + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt quiet splash --- modprobe.blacklist=thunderbolt initrd /casper/initrd } menuentry "Check disc for defects" {