From 5af1cf821c880221d0c5fed0ea41e36caeecf13f Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Sat, 27 Jul 2024 16:25:38 +0530
Subject: [PATCH] Linux mint Wilma

---
 .github/workflows/CI.yml |  6 +++---
 .github/workflows/iso.sh |  4 ++--
 02_build_image.sh        |  2 +-
 build.sh                 |  8 ++++----
 build_in_docker.sh       |  2 +-
 files/chroot_build.sh    | 10 +++++-----
 files/grub/grub.cfg      | 12 ++++++------
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 06cf73d..c32ac42 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -7,7 +7,7 @@ on:
 jobs:
 
   Cinnamon:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
@@ -71,7 +71,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   Mate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
@@ -131,7 +131,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   XFCE:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/iso.sh b/.github/workflows/iso.sh
index 1ce7cff..9d3e71b 100644
--- a/.github/workflows/iso.sh
+++ b/.github/workflows/iso.sh
@@ -62,8 +62,8 @@ case "$flavinput" in
 		;;
 esac
 
-iso="linuxmint-21.3-${flavour}-${latestkver}-t2-jammy"
-ver="Linux Mint 21.3 \"Virginia\" - ${flavourcap} Edition"
+iso="linuxmint-22-${flavour}-${latestkver}-t2-noble"
+ver="Linux Mint 22 \"Wilma\" - ${flavourcap} Edition"
 
 if [ ! -f ${iso}.iso.00 ]; then
 	echo -e "\nDownloading Part 1 for ${ver}"
diff --git a/02_build_image.sh b/02_build_image.sh
index 20ec7ea..e52411e 100755
--- 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  Linux Mint MBP ${MINT_VERSION} "Virginia" - Beta amd64
+#define DISKNAME  Linux Mint MBP ${MINT_VERSION} "Wilma" - Beta amd64
 #define TYPE  binary
 #define TYPEbinary  1
 #define ARCH  amd64
diff --git a/build.sh b/build.sh
index c7028f0..c8b9f9f 100755
--- a/build.sh
+++ b/build.sh
@@ -5,11 +5,11 @@ ROOT_PATH=$(pwd)
 WORKING_PATH=/root/work
 CHROOT_PATH="${WORKING_PATH}/chroot"
 IMAGE_PATH="${WORKING_PATH}/image"
-CODENAME=jammy
+CODENAME=noble
 FLAVOUR=$1
-MINT_VERSION=21.3
-KERNEL_VERSION=6.9.7
-PKGREL=4
+MINT_VERSION=22
+KERNEL_VERSION=6.9.9
+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
 
diff --git a/build_in_docker.sh b/build_in_docker.sh
index bc953e3..0dc9166 100755
--- 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
index 0968e28..00f52c6 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -52,13 +52,13 @@ echo >&2 "===]> Info: Remove unused applications ... "
 
 apt-get purge -y -qq \
   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
index 7db7bcb..e19a244 100644
--- 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 Linux Mint Virginia without installing" {
+menuentry "Try Linux Mint Wilma 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 Linux Mint Virginia without installing (Safe Graphics)" {
+menuentry "Try Linux Mint Wilma 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 Linux Mint Virginia without installing (NVMe blacklisted)" {
+menuentry "Try Linux Mint Wilma 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 Linux Mint Virginia" {
+menuentry "Install Linux Mint Wilma" {
    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 Linux Mint Virginia (Safe Graphics)" {
+menuentry "Install Linux Mint Wilma (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 Linux Mint Virginia (NVMe blacklisted)" {
+menuentry "Install Linux Mint Wilma (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
 }