Ubuntu 24.04

t2linux · Oct 20, 2024 · 7aace77 · 7aace77
1 parent 54ca557
commit 7aace77
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 28 deletions.
diff --git a/.github/workflows/iso.sh b/.github/workflows/iso.sh
@@ -59,8 +59,8 @@ cat <<EOF
 
 Choose the version of Ubuntu you wish to install:
 
-1. 22.04 LTS - Jammy Jellyfish
-2. 24.04 LTS - Noble Numbat
+1. 24.04 LTS - Noble Numbat
+2. 24.10 - Oracular Oriole
 
 Type your choice (1 or 2) from the above list and press return.
 EOF
@@ -69,12 +69,12 @@ read verinput
 
 case "$verinput" in
 	(1)
-		iso="${flavour}-22.04-${latestkver}-t2-jammy"
-		ver="22.04 LTS - Jammy Jellyfish"
+		iso="${flavour}-24.04-${latestkver}-t2-noble"
+		ver="24.04 LTS - Noble Numbat"
 		;;
 	(2)
-		iso="${flavour}-24.04-${latestkver}-t2-noble"
-		ver="24.04 LTS  - Noble Numbat"
+		iso="${flavour}-24.10-${latestkver}-t2-oracular"
+		ver="24.10 - Oracular Oriole"
 		;;
 	(*)
 		echo "Invalid input. Aborting!"

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 output
 /.idea
+.DS_Store
diff --git a/01_build_file_system.sh b/01_build_file_system.sh
@@ -5,7 +5,7 @@ echo >&2 "===]> Info: Checkout bootstrap... "
 debootstrap \
   --arch=amd64 \
   --variant=minbase \
-  jammy \
+  noble \
   "${CHROOT_PATH}" \
   http://archive.ubuntu.com/ubuntu/
 

diff --git a/02_build_image.sh b/02_build_image.sh
@@ -37,7 +37,7 @@ done
 
 echo >&2 "===]> Info: Create diskdefines... "
 cat <<EOF >"${IMAGE_PATH}"/README.diskdefines
-#define DISKNAME  Ubuntu MBP 22.04 LTS "Jammy Jellyfish" - Beta amd64
+#define DISKNAME  Ubuntu MBP 24.04 LTS "Noble Numbat" - amd64
 #define TYPE  binary
 #define TYPEbinary  1
 #define ARCH  amd64

diff --git a/04_create_iso.sh b/04_create_iso.sh
@@ -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-22.04-${KERNEL_VERSION}.iso" \
+  -output "${ROOT_PATH}/ubuntu-24.04-${KERNEL_VERSION}.iso" \
   -graft-points \
   "." \
   /boot/grub/bios.img=isolinux/bios.img \

diff --git a/build.sh b/build.sh
@@ -5,7 +5,7 @@ ROOT_PATH=$(pwd)
 WORKING_PATH=/root/work
 CHROOT_PATH="${WORKING_PATH}/chroot"
 IMAGE_PATH="${WORKING_PATH}/image"
-KERNEL_VERSION=6.10.5
+KERNEL_VERSION=6.11.4
 PKGREL=1
 sed -i "s/KVER/${KERNEL_VERSION}/g" $(pwd)/files/chroot_build.sh
 sed -i "s/PREL/${PKGREL}/g" $(pwd)/files/chroot_build.sh
@@ -36,11 +36,11 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   syslinux
 
 echo >&2 "===]> Info: Start loop... "
-for ALTERNATIVE in t2-jammy
+for ALTERNATIVE in t2-noble
 do
   echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
 
-  echo >&2 "===]> Info: Build Ubuntu Jammy... "
+  echo >&2 "===]> Info: Build Ubuntu Noble... "
   /bin/bash -c "
     ROOT_PATH=${ROOT_PATH} \\
     WORKING_PATH=${WORKING_PATH} \\
@@ -51,7 +51,7 @@ do
     ${ROOT_PATH}/01_build_file_system.sh
   "
 
-  echo >&2 "===]> Info: Build Image Jammy... "
+  echo >&2 "===]> Info: Build Image Noble... "
   /bin/bash -c "
     ROOT_PATH=${ROOT_PATH} \\
     WORKING_PATH=${WORKING_PATH} \\
@@ -85,10 +85,10 @@ do
   fi
   ## Split iso into multiple parts - github max size of release attachment is 2GB, where ISO is sometimes bigger than that
   cd "${ROOT_PATH}"
-  split -b 1500M -x "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" "${ROOT_PATH}/output/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso."
+  split -b 1500M -x "${ROOT_PATH}/ubuntu-24.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" "${ROOT_PATH}/output/ubuntu-24.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso."
 done
 ## Calculate sha256 sums of built ISO
-sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256-ubuntu-22.04"
+sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256-ubuntu-24.04"
 
 find ./ | grep ".iso"
 #find ./ | grep ".zip"

diff --git a/build_in_docker.sh b/build_in_docker.sh
@@ -2,7 +2,7 @@
 
 set -eu -o pipefail
 
-DOCKER_IMAGE=ubuntu:22.04
+DOCKER_IMAGE=ubuntu:24.04
 
 docker pull ${DOCKER_IMAGE}
 docker run \

diff --git a/files/chroot_build.sh b/files/chroot_build.sh
@@ -2,7 +2,7 @@
 
 set -eu -o pipefail
 
-CODENAME=jammy
+CODENAME=noble
 
 echo >&2 "===]> Info: Configure environment... "
 
@@ -141,13 +141,13 @@ apt-get purge -y -qq \
   xiterm+thai \
   vim \
   linux-generic \
-  linux-headers-5.15.0-72 \
-  linux-headers-5.15.0-72-generic \
+  linux-headers-6.8.0-31 \
+  linux-headers-6.8.0-31-generic \
   linux-headers-generic \
-  linux-image-5.15.0-72-generic \
+  linux-image-6.8.0-31-generic \
   linux-image-generic \
-  linux-modules-5.15.0-72-generic \
-  linux-modules-extra-5.15.0-72-generic
+  linux-modules-6.8.0-31-generic \
+  linux-modules-extra-6.8.0-31-generic \
 
 apt-get autoremove -y
 

diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg
@@ -6,27 +6,27 @@ insmod all_video
 set default="0"
 set timeout=30
 
-menuentry "Try Ubuntu Jammy Jellyfish without installing" {
+menuentry "Try Ubuntu Noble Numbat without installing" {
    linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro quiet splash pcie_ports=native intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
-menuentry "Try Ubuntu Jammy Jellyfish without installing (Safe Graphics)" {
+menuentry "Try Ubuntu Noble Numbat without installing (Safe Graphics)" {
    linux /casper/vmlinuz file=/cdrom/preseed/mbp164.seed boot=casper ro quiet splash nomodeset pcie_ports=native intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
-menuentry "Try Ubuntu Jammy Jellyfish without installing (NVMe blacklisted)" {
+menuentry "Try Ubuntu Noble Numbat without installing (NVMe blacklisted)" {
    linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro quiet splash pcie_ports=native intel_iommu=on iommu=pt modprobe.blacklist=nvme ---
    initrd /casper/initrd
 }
-menuentry "Install Ubuntu Jammy Jellyfish" {
+menuentry "Install Ubuntu Noble Numbat" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity quiet splash pcie_ports=native intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
-menuentry "Install Ubuntu Jammy Jellyfish (Safe Graphics)" {
+menuentry "Install Ubuntu Noble Numbat (Safe Graphics)" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp164.seed boot=casper only-ubiquity quiet splash nomodeset pcie_ports=native intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
-menuentry "Install Ubuntu Jammy Jellyfish (NVMe blacklisted)" {
+menuentry "Install Ubuntu Noble Numbat (NVMe blacklisted)" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity quiet splash pcie_ports=native intel_iommu=on iommu=pt modprobe.blacklist=nvme ---
    initrd /casper/initrd
 }