From fc7c118f01ed6e0e043686fceaf64ed819494ae1 Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Mon, 7 Nov 2022 16:14:55 +0530
Subject: [PATCH 01/36] 22.10 - Kinetic Kudu

---
 .github/workflows/CI.yml | 67 ++++++++++++++++++++++++++--------------
 01_build_file_system.sh  |  2 +-
 02_build_image.sh        |  2 +-
 04_create_iso.sh         |  2 +-
 build.sh                 |  8 ++---
 files/chroot_build.sh    | 24 +++++++-------
 files/grub/grub.cfg      |  6 ++--
 7 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 8829dfd..25431c0 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,5 +1,5 @@
 ---
-name: CI
+name: CI - Kinetic
 # yamllint disable-line rule:truthy
 on:
   [push]
@@ -22,30 +22,41 @@ jobs:
           VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2)
           REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2)
           echo "kerneltag=${VERSION}-${REL}" >> $GITHUB_ENV
-          sudo apt install git
-          mkdir /tmp/artifacts
-          git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git
-          sed -i 's/LOCALVERSION=-t2-\"${CODENAME}\"/LOCALVERSION=-t2-external/g' ${{ github.workspace }}/T2-Ubuntu-Kernel/build.sh
-          cd ${{ github.workspace }}/T2-Ubuntu-Kernel/patches
-          wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch
-          cd ${{ github.workspace }}/T2-Ubuntu-Kernel
-          sudo ./build.sh
-          sudo rm /tmp/artifacts/*dbg*
-          sudo rm /tmp/artifacts/*libc-dev*
+
+          DOCKER_IMAGE=ubuntu:22.10
+          docker pull ${DOCKER_IMAGE}
+          docker run \
+          -t \
+          -v "$(pwd)":/repo \
+          ${DOCKER_IMAGE} \
+          /bin/bash -c 'cd /repo && \
+          apt-get update && \
+          apt-get install -y lsb-release git wget && \
+          mkdir /tmp/artifacts && \
+          git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git && \
+          sed -i 's/LOCALVERSION=-t2-\"${CODENAME}\"/LOCALVERSION=-t2-external/g' /repo/T2-Ubuntu-Kernel/build.sh && cd /repo/T2-Ubuntu-Kernel && \
+          cd /repo/T2-Ubuntu-Kernel/patches && \
+          wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch && \
+          cd /repo/T2-Ubuntu-Kernel && \
+          ./build.sh && mkdir /repo/debs && \
+          rm /tmp/artifacts/*dbg*
+          rm /tmp/artifacts/*libc-dev*
+          cp -r /tmp/artifacts/* /repo/debs'
+          cp -r "$(pwd)"/debs/* /tmp/artifacts
 
       - name: Upload package artifact
         uses: actions/upload-artifact@v2
         with:
-          name: kernel-${{ env.kerneltag }}
+          name: kernel-${{ env.kerneltag }}-kinetic
           path: /tmp/artifacts/*
 
       - name: Release
-        if: github.ref == 'refs/heads/jammy'
+        if: github.ref == 'refs/heads/kinetic'
         uses: softprops/action-gh-release@v1
         with:
           files: |
             /tmp/artifacts/*.deb
-          tag_name: v${{ env.kerneltag }}-kernel
+          tag_name: v${{ env.kerneltag }}-kernel-kinetic
           draft: false
           prerelease: true
         env:
@@ -55,7 +66,7 @@ jobs:
     needs: [Kernel]
     runs-on: ubuntu-22.04
     steps:
-      - name: 'Checkout Jammy Repo'
+      - name: 'Checkout Kinetic Repo'
         uses: actions/checkout@v3
 
       - name: Get version
@@ -65,13 +76,13 @@ jobs:
          echo "ver=${VERSION}" >> $GITHUB_ENV
          echo "release=${REL}" >> $GITHUB_ENV
           
-      - name: 'Checkout jammy-16,4 Repo'
+      - name: 'Checkout kinetic-16,4 Repo'
         uses: actions/checkout@v3
         with:
-          ref: jammy-16,4
+          ref: kinetic-16,4
           persist-credentials: false
 
-      - name: 'Push new version to jammy-16,4'
+      - name: 'Push new version to kinetic-16,4'
         id: publish
         run: |
          sed -i "s/KERNEL_VERSION=6.*/KERNEL_VERSION=${{ env.ver }}/g" build.sh
@@ -83,7 +94,7 @@ jobs:
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.PAT }}
-          branch: jammy-16,4
+          branch: kinetic-16,4
 
   ISO:
     needs: [Kernel]
@@ -92,7 +103,15 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build
-        run: sudo ./build.sh
+        run: |
+          DOCKER_IMAGE=ubuntu:22.10
+          docker pull ${DOCKER_IMAGE}
+          docker run \
+          -t \
+          -v "$(pwd)":/repo \
+          ${DOCKER_IMAGE} \
+          /bin/bash -c 'cd /repo && \
+          ./build.sh'
 
       - name: print sha256sum
         run: cat output/sha256
@@ -122,11 +141,11 @@ jobs:
           EOF
 
       - name: Release
-        if: github.ref == 'refs/heads/jammy'
+        if: github.ref == 'refs/heads/kinetic'
         uses: softprops/action-gh-release@v1
         with:
           files: ${{ github.workspace }}/*.iso
-          tag_name: v22.04-${{ env.isotag }}
+          tag_name: ${{ env.isotag }}
           body_path: ${{ github.workspace }}/.github/workflows/instructions.txt
           draft: false
           prerelease: false
@@ -134,10 +153,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Delete kernel from releases
-        if: github.ref == 'refs/heads/jammy'
+        if: github.ref == 'refs/heads/kinetic'
         uses: dev-drprasad/delete-tag-and-release@v0.2.0
         with:
           delete_release: true
-          tag_name: v${{ env.isotag }}-kernel
+          tag_name: v${{ env.isotag }}-kernel-kinetic
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/01_build_file_system.sh b/01_build_file_system.sh
index 265e0ae..3be7cec 100755
--- 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 \
+  kinetic \
   "${CHROOT_PATH}" \
   http://archive.ubuntu.com/ubuntu/
 
diff --git a/02_build_image.sh b/02_build_image.sh
index 1f8a66a..3df0d93 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  Ubuntu MBP 22.04 LTS "Jammy Jellyfish" - Beta amd64
+#define DISKNAME  Ubuntu MBP 22.10 "Kinetic Kudu" - Beta amd64
 #define TYPE  binary
 #define TYPEbinary  1
 #define ARCH  amd64
diff --git a/04_create_iso.sh b/04_create_iso.sh
index 0abbe28..6060059 100755
--- 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-22.10-${KERNEL_VERSION}.iso" \
   -graft-points \
   "." \
   /boot/grub/bios.img=isolinux/bios.img \
diff --git a/build.sh b/build.sh
index 57f85f3..e1a5924 100755
--- 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.0.7
+KERNEL_VERSION=6.0.6
 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
@@ -40,7 +40,7 @@ for ALTERNATIVE in t2-jammy t2-external
 do
   echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
 
-  echo >&2 "===]> Info: Build Ubuntu Jammy... "
+  echo >&2 "===]> Info: Build Ubuntu Kinetic... "
   /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 Kinetic... "
   /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-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso"
+  zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-22.10-${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 2229392..14a9a5b 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -11,17 +11,17 @@ mount none -t devpts /dev/pts
 export HOME=/root
 export LC_ALL=C
 
-echo "ubuntu-jammy-live" >/etc/hostname
+echo "ubuntu-kinetic-live" >/etc/hostname
 
 echo >&2 "===]> Info: Configure and update apt... "
 
 cat <<EOF >/etc/apt/sources.list
-deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
-deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ kinetic main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ kinetic main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ kinetic-security main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ kinetic-security main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ kinetic-updates main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ kinetic-updates main restricted universe multiverse
 EOF
 apt-get update
 
@@ -162,13 +162,13 @@ apt-get purge -y -qq \
   vim \
   binutils \
   linux-generic \
-  linux-headers-5.15.0-30 \
-  linux-headers-5.15.0-30-generic \
+  linux-headers-5.19.0-21 \
+  linux-headers-5.19.0-21-generic \
   linux-headers-generic \
-  linux-image-5.15.0-30-generic \
+  linux-image-5.19.0-21-generic \
   linux-image-generic \
-  linux-modules-5.15.0-30-generic \
-  linux-modules-extra-5.15.0-30-generic
+  linux-modules-5.19.0-21-generic \
+  linux-modules-extra-5.19.0-21-generic
 
 apt-get autoremove -y
 
diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg
index c31253d..c5d98ce 100644
--- a/files/grub/grub.cfg
+++ b/files/grub/grub.cfg
@@ -6,15 +6,15 @@ insmod all_video
 set default="0"
 set timeout=30
 
-menuentry "Try Ubuntu Jammy Jellyfish without installing" {
+menuentry "Try Ubuntu Kinetic Kudu 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 Jammy Jellyfish without installing (Safe Graphics)" {
+menuentry "Try Ubuntu Kinetic Kudu 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 "Install Ubuntu Jammy Jellyfish" {
+menuentry "Install Ubuntu Kinetic Kudu" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }

From 0e92eaec0f461a00c5ff453548d4f4db1d78c68f Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Mon, 7 Nov 2022 16:16:45 +0530
Subject: [PATCH 02/36] Change kernel to T2 Kinetic

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index e1a5924..91e2213 100755
--- a/build.sh
+++ b/build.sh
@@ -36,7 +36,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   syslinux
 
 echo >&2 "===]> Info: Start loop... "
-for ALTERNATIVE in t2-jammy t2-external
+for ALTERNATIVE in t2-kinetic t2-external
 do
   echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
 

From 116fd6a9a37f317d68f2adbfba6776339cd3badd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 11:03:04 +0000
Subject: [PATCH 03/36] 6.0.7-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 91e2213..fe4b5f4 100755
--- 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.0.6
+KERNEL_VERSION=6.0.7
 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

From 07be0e870a268fabbe1b6786f9f6d92e2cf36d7e Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Mon, 7 Nov 2022 16:33:56 +0530
Subject: [PATCH 04/36] Update build.sh

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index fe4b5f4..91e2213 100755
--- 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.0.7
+KERNEL_VERSION=6.0.6
 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

From 6d3cb40d7c60ea2499928ad2a169f65800049507 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 11:04:39 +0000
Subject: [PATCH 05/36] 6.0.7-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 91e2213..fe4b5f4 100755
--- 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.0.6
+KERNEL_VERSION=6.0.7
 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

From 76873bcd494dbb7e59933478ce4ff28b571f71fa Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Mon, 7 Nov 2022 20:43:14 +0530
Subject: [PATCH 06/36] Update CI.yml

---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 25431c0..e147d1c 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -37,7 +37,7 @@ jobs:
           sed -i 's/LOCALVERSION=-t2-\"${CODENAME}\"/LOCALVERSION=-t2-external/g' /repo/T2-Ubuntu-Kernel/build.sh && cd /repo/T2-Ubuntu-Kernel && \
           cd /repo/T2-Ubuntu-Kernel/patches && \
           wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch && \
-          cd /repo/T2-Ubuntu-Kernel && \
+          cd /repo/T2-Ubuntu-Kernel && mkdir /tmp/artifacts && \
           ./build.sh && mkdir /repo/debs && \
           rm /tmp/artifacts/*dbg*
           rm /tmp/artifacts/*libc-dev*

From d74bf5cc7948df6d8c67468bdd667c444e7e0cd2 Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Mon, 7 Nov 2022 21:06:24 +0530
Subject: [PATCH 07/36] Update CI.yml

---
 .github/workflows/CI.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e147d1c..1b73735 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -37,10 +37,10 @@ jobs:
           sed -i 's/LOCALVERSION=-t2-\"${CODENAME}\"/LOCALVERSION=-t2-external/g' /repo/T2-Ubuntu-Kernel/build.sh && cd /repo/T2-Ubuntu-Kernel && \
           cd /repo/T2-Ubuntu-Kernel/patches && \
           wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch && \
-          cd /repo/T2-Ubuntu-Kernel && mkdir /tmp/artifacts && \
+          cd /repo/T2-Ubuntu-Kernel && \
           ./build.sh && mkdir /repo/debs && \
-          rm /tmp/artifacts/*dbg*
-          rm /tmp/artifacts/*libc-dev*
+          rm /tmp/artifacts/*dbg* && \
+          rm /tmp/artifacts/*libc-dev* && \
           cp -r /tmp/artifacts/* /repo/debs'
           cp -r "$(pwd)"/debs/* /tmp/artifacts
 

From c5d5ad3442da9211d5f40704c0c5bd4f43e0534f Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Tue, 8 Nov 2022 01:00:34 +0530
Subject: [PATCH 08/36] Update CI.yml

---
 .github/workflows/CI.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1b73735..af1ffb0 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -29,19 +29,20 @@ jobs:
           -t \
           -v "$(pwd)":/repo \
           ${DOCKER_IMAGE} \
-          /bin/bash -c 'cd /repo && \
+          /bin/bash -c "cd /repo && \
           apt-get update && \
           apt-get install -y lsb-release git wget && \
           mkdir /tmp/artifacts && \
           git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git && \
-          sed -i 's/LOCALVERSION=-t2-\"${CODENAME}\"/LOCALVERSION=-t2-external/g' /repo/T2-Ubuntu-Kernel/build.sh && cd /repo/T2-Ubuntu-Kernel && \
+          sed -i "s/CODENAME=.*/CODENAME=external/g" /repo/T2-Ubuntu-Kernel/build.sh && cd /repo/T2-Ubuntu-Kernel && \
           cd /repo/T2-Ubuntu-Kernel/patches && \
           wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch && \
           cd /repo/T2-Ubuntu-Kernel && \
           ./build.sh && mkdir /repo/debs && \
           rm /tmp/artifacts/*dbg* && \
           rm /tmp/artifacts/*libc-dev* && \
-          cp -r /tmp/artifacts/* /repo/debs'
+          cp -r /tmp/artifacts/* /repo/debs"
+          mkdir /tmp/artifacts
           cp -r "$(pwd)"/debs/* /tmp/artifacts
 
       - name: Upload package artifact

From bd5186961210d87018b223d0387477bbe5f87ba0 Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Tue, 8 Nov 2022 11:17:41 +0530
Subject: [PATCH 09/36] Fix CI and scripts for 22.10

---
 .github/workflows/CI.yml | 10 +---------
 build_in_docker.sh       |  2 +-
 files/chroot_build.sh    |  4 +---
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index af1ffb0..e17509e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -104,15 +104,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build
-        run: |
-          DOCKER_IMAGE=ubuntu:22.10
-          docker pull ${DOCKER_IMAGE}
-          docker run \
-          -t \
-          -v "$(pwd)":/repo \
-          ${DOCKER_IMAGE} \
-          /bin/bash -c 'cd /repo && \
-          ./build.sh'
+        run: sudo ./build_in_docker.sh
 
       - name: print sha256sum
         run: cat output/sha256
diff --git a/build_in_docker.sh b/build_in_docker.sh
index b603421..0308516 100755
--- a/build_in_docker.sh
+++ b/build_in_docker.sh
@@ -2,7 +2,7 @@
 
 set -eu -o pipefail
 
-DOCKER_IMAGE=ubuntu:20.04
+DOCKER_IMAGE=ubuntu:22.10
 
 docker pull ${DOCKER_IMAGE}
 docker run \
diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 14a9a5b..404d3d1 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -81,7 +81,7 @@ apt install /tmp/headers.deb /tmp/image.deb
 echo >&2 "===]> Info: Install window manager... "
 
 apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
-  plymouth-theme-ubuntu-logo \
+  plymouth-theme-ubuntu-gnome-logo \
   ubuntu-desktop-minimal \
   ubuntu-gnome-wallpapers \
   snapd
@@ -177,8 +177,6 @@ echo >&2 "===]> Info: Reconfigure environment ... "
 locale-gen --purge en_US.UTF-8 en_US
 printf 'LANG="C.UTF-8"\nLANGUAGE="C.UTF-8"\n' >/etc/default/locale
 
-dpkg-reconfigure -f readline resolvconf
-
 cat <<EOF >/etc/NetworkManager/NetworkManager.conf
 [main]
 plugins=ifupdown,keyfile

From 61a572dab8d47fd967e83e6c31028e06ebe92144 Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Tue, 8 Nov 2022 11:38:32 +0530
Subject: [PATCH 10/36] Update CI.yml

---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index af1ffb0..41baf36 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -146,7 +146,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: ${{ github.workspace }}/*.iso
-          tag_name: ${{ env.isotag }}
+          tag_name: v${{ env.isotag }}
           body_path: ${{ github.workspace }}/.github/workflows/instructions.txt
           draft: false
           prerelease: false

From 5e6556a2b81c941c11221aecad5910320367f56c Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Tue, 8 Nov 2022 11:39:15 +0530
Subject: [PATCH 11/36] Update build.sh

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index fe4b5f4..91e2213 100755
--- 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.0.7
+KERNEL_VERSION=6.0.6
 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

From 8bcc7c1ca765cd21d08e6cd975d9c46005131491 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 06:18:19 +0000
Subject: [PATCH 12/36] 6.0.7-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 91e2213..fe4b5f4 100755
--- 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.0.6
+KERNEL_VERSION=6.0.7
 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

From 637fa1cc1280526ffcf9becc00e5e9338fffae2b Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Tue, 8 Nov 2022 12:00:39 +0530
Subject: [PATCH 13/36] Update build.sh

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index fe4b5f4..91e2213 100755
--- 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.0.7
+KERNEL_VERSION=6.0.6
 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

From 4ef81fadbd3a89b599027efaeb4a07f343012e22 Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Tue, 8 Nov 2022 13:22:10 +0530
Subject: [PATCH 14/36] Update chroot_build.sh

---
 files/chroot_build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 404d3d1..fe27f46 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -81,7 +81,8 @@ apt install /tmp/headers.deb /tmp/image.deb
 echo >&2 "===]> Info: Install window manager... "
 
 apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
-  plymouth-theme-ubuntu-gnome-logo \
+  plymouth-theme-spinner \
+  plymouth-theme-ubuntu-text \
   ubuntu-desktop-minimal \
   ubuntu-gnome-wallpapers \
   snapd

From 56cf55c13849b0d6e35e76e20e58bef0aa182e69 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 07:53:57 +0000
Subject: [PATCH 15/36] 6.0.7-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 91e2213..fe4b5f4 100755
--- 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.0.6
+KERNEL_VERSION=6.0.7
 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

From 9a0c311c064fa7a1e800bc8b17b6387eac8d5a0a Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Tue, 8 Nov 2022 18:23:47 +0530
Subject: [PATCH 16/36] Update chroot_build.sh

---
 files/chroot_build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index fe27f46..6466c4a 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -69,8 +69,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
 
 if [[ ${ALTERNATIVE} = t2-external ]]
 then
-curl -L https://github.com/AdityaGarg8/T2-Ubuntu/releases/download/vKVER-PREL-kernel/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb
-curl -L https://github.com/AdityaGarg8/T2-Ubuntu/releases/download/vKVER-PREL-kernel/linux-image-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/image.deb
+curl -L https://github.com/AdityaGarg8/T2-Ubuntu/releases/download/vKVER-PREL-kernel-kinetic/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb
+curl -L https://github.com/AdityaGarg8/T2-Ubuntu/releases/download/vKVER-PREL-kernel-kinetic/linux-image-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/image.deb
 else
 curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb
 curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/image.deb

From 30168277929e660ceeb5b499229deaa67debc246 Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Wed, 16 Nov 2022 20:23:05 +0530
Subject: [PATCH 17/36] Update rmmod_tb.sh

---
 files/suspend/rmmod_tb.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/suspend/rmmod_tb.sh b/files/suspend/rmmod_tb.sh
index 30c6ead..d0f33eb 100755
--- a/files/suspend/rmmod_tb.sh
+++ b/files/suspend/rmmod_tb.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 if [ "${1}" = "pre" ]; then
-        modprobe -r apple_ib_tb
+        modprobe -r apple-touchbar
 elif [ "${1}" = "post" ]; then
-        modprobe apple_ib_tb
+        modprobe apple-touchbar
 fi

From b84ad9fee779ce0b52ebbbaae5073c6c1fd79625 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 14:54:11 +0000
Subject: [PATCH 18/36] 6.0.9-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index fe4b5f4..e2a4f3e 100755
--- 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.0.7
+KERNEL_VERSION=6.0.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

From d4811f8c1cc24fbda537f30abcdc3dc98f3b1bc5 Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Thu, 17 Nov 2022 11:29:09 +0530
Subject: [PATCH 19/36] Update chroot_build.sh

---
 files/chroot_build.sh | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 6466c4a..a4972dd 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -121,26 +121,6 @@ printf '\n### apple-bce start ###\nsnd\nsnd_pcm\napple-bce\n### apple-bce end ##
 printf '\n# display f* key in touchbar\noptions apple-ib-tb fnmode=1\n'  >> /etc/modprobe.d/apple-tb.conf
 #printf '\n# delay loading of the touchbar driver\ninstall apple-ib-tb /bin/sleep 7; /sbin/modprobe --ignore-install apple-ib-tb' >> /etc/modprobe.d/delay-tb.conf
 
-echo '
-#!/usr/bin/env bash
-echo "Select Touch Bar mode"
-echo
-echo "0: Only show F1-F12"
-echo "1: Show media and brightness controls, use the fn key to switch to F1-12"
-echo "2: Show F1-F12, use the fn key to switch to media and brightness controls"
-echo "3: Only show media and brightness controls"
-echo "4: Only show the escape key"
-read tb
-echo "Changing default mode ..."
-echo "# display f* key in touchbar" > /etc/modprobe.d/apple-tb.conf
-echo "options apple-ib-tb fnmode=$tb" >> /etc/modprobe.d/apple-tb.conf
-bash -c "echo $tb > /sys/class/input/*/device/fnmode"
-echo "Done!"' | tee /usr/local/bin/touchbar >/dev/null
-
-chmod a+x /usr/local/bin/touchbar
-chown root:root /usr/local/bin/touchbar
-
-
 echo >&2 "===]> Info: Update initramfs... "
 
 ## Add custom drivers to be loaded at boot

From d7e2c4abe29725b664ad13b940e7b8d419d30fe2 Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Fri, 25 Nov 2022 13:49:12 +0530
Subject: [PATCH 20/36] Update instructions.txt

---
 .github/workflows/instructions.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/instructions.txt b/.github/workflows/instructions.txt
index 979ee8b..936e309 100644
--- a/.github/workflows/instructions.txt
+++ b/.github/workflows/instructions.txt
@@ -5,3 +5,5 @@ Follow [this guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) for Wi-Fi a
 Users of **MacBookPro16,4** are recommended to use the safe graphics ISO as the kernel doesn't have the driver for their AMD Graphics Card. Rest users can use the normal ISO.
 
 The **t2-external** ISO has the internal SSD support removed in the kernel. This can be useful if you wish to install in an external SSD. After installation, you can update your kernel to a **t2** kernel by following [this guide](https://github.com/t2linux/T2-Ubuntu-Kernel#installation) which shall bring back internal SSD support.
+
+**Getting kernel updates :-** Post installation, users are recommended to set up the [kernel update script](https://github.com/t2linux/T2-Ubuntu-Kernel#installation) to receive kernel updates.

From 35a49c99002808dc13e4fff450f95b2fa59f8a67 Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Fri, 25 Nov 2022 13:52:29 +0530
Subject: [PATCH 21/36] Update instructions.txt

---
 .github/workflows/instructions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/instructions.txt b/.github/workflows/instructions.txt
index 936e309..b84eab4 100644
--- a/.github/workflows/instructions.txt
+++ b/.github/workflows/instructions.txt
@@ -4,6 +4,6 @@ Follow [this guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) for Wi-Fi a
 
 Users of **MacBookPro16,4** are recommended to use the safe graphics ISO as the kernel doesn't have the driver for their AMD Graphics Card. Rest users can use the normal ISO.
 
-The **t2-external** ISO has the internal SSD support removed in the kernel. This can be useful if you wish to install in an external SSD. After installation, you can update your kernel to a **t2** kernel by following [this guide](https://github.com/t2linux/T2-Ubuntu-Kernel#installation) which shall bring back internal SSD support.
+The **t2-external** ISO has the internal SSD support removed in the kernel. This can be useful if you wish to install on an external SSD. After installation, you can update your kernel to a **t2** kernel by following [this guide](https://github.com/t2linux/T2-Ubuntu-Kernel#installation) which shall bring back internal SSD support.
 
 **Getting kernel updates :-** Post installation, users are recommended to set up the [kernel update script](https://github.com/t2linux/T2-Ubuntu-Kernel#installation) to receive kernel updates.

From 5179d441bd01acb113131e03e60e8ec1875364ef Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 27 Nov 2022 06:55:11 +0000
Subject: [PATCH 22/36] 6.0.10-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index e2a4f3e..000bfbc 100755
--- 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.0.9
+KERNEL_VERSION=6.0.10
 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

From 6983404a1ba453ab913b4e6e7c0d6d7f55cf45a7 Mon Sep 17 00:00:00 2001
From: Aditya Garg <gargaditya08@live.com>
Date: Tue, 20 Dec 2022 14:59:23 +0530
Subject: [PATCH 23/36] Remove t2-external

---
 .github/workflows/CI.yml           | 68 +-----------------------------
 .github/workflows/instructions.txt |  2 -
 build.sh                           |  2 +-
 files/chroot_build.sh              |  6 ---
 4 files changed, 2 insertions(+), 76 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 40824f7..bb94da4 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,67 +1,10 @@
 ---
-name: CI - Kinetic
+name: CI
 # yamllint disable-line rule:truthy
 on:
   [push]
 
 jobs:
-  Kernel:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Free up disk space for the CI
-        uses: AdityaGarg8/remove-unwanted-software@v1
-        with:
-          remove-android: 'true'
-          remove-dotnet: 'true'
-          remove-haskell: 'false'
-
-      - uses: actions/checkout@v3
-
-      - name: Build kernel with internal SSD removed
-        run: |
-          VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2)
-          REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2)
-          echo "kerneltag=${VERSION}-${REL}" >> $GITHUB_ENV
-
-          DOCKER_IMAGE=ubuntu:22.10
-          docker pull ${DOCKER_IMAGE}
-          docker run \
-          -t \
-          -v "$(pwd)":/repo \
-          ${DOCKER_IMAGE} \
-          /bin/bash -c "cd /repo && \
-          apt-get update && \
-          apt-get install -y lsb-release git wget && \
-          mkdir /tmp/artifacts && \
-          git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git && \
-          sed -i "s/CODENAME=.*/CODENAME=external/g" /repo/T2-Ubuntu-Kernel/build.sh && cd /repo/T2-Ubuntu-Kernel && \
-          cd /repo/T2-Ubuntu-Kernel/patches && \
-          wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch && \
-          cd /repo/T2-Ubuntu-Kernel && \
-          ./build.sh && mkdir /repo/debs && \
-          rm /tmp/artifacts/*dbg* && \
-          rm /tmp/artifacts/*libc-dev* && \
-          cp -r /tmp/artifacts/* /repo/debs"
-          mkdir /tmp/artifacts
-          cp -r "$(pwd)"/debs/* /tmp/artifacts
-
-      - name: Upload package artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: kernel-${{ env.kerneltag }}-kinetic
-          path: /tmp/artifacts/*
-
-      - name: Release
-        if: github.ref == 'refs/heads/kinetic'
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            /tmp/artifacts/*.deb
-          tag_name: v${{ env.kerneltag }}-kernel-kinetic
-          draft: false
-          prerelease: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   Safe-graphics:
     needs: [Kernel]
@@ -144,12 +87,3 @@ jobs:
           prerelease: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Delete kernel from releases
-        if: github.ref == 'refs/heads/kinetic'
-        uses: dev-drprasad/delete-tag-and-release@v0.2.0
-        with:
-          delete_release: true
-          tag_name: v${{ env.isotag }}-kernel-kinetic
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/instructions.txt b/.github/workflows/instructions.txt
index b84eab4..6dcf574 100644
--- a/.github/workflows/instructions.txt
+++ b/.github/workflows/instructions.txt
@@ -4,6 +4,4 @@ Follow [this guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) for Wi-Fi a
 
 Users of **MacBookPro16,4** are recommended to use the safe graphics ISO as the kernel doesn't have the driver for their AMD Graphics Card. Rest users can use the normal ISO.
 
-The **t2-external** ISO has the internal SSD support removed in the kernel. This can be useful if you wish to install on an external SSD. After installation, you can update your kernel to a **t2** kernel by following [this guide](https://github.com/t2linux/T2-Ubuntu-Kernel#installation) which shall bring back internal SSD support.
-
 **Getting kernel updates :-** Post installation, users are recommended to set up the [kernel update script](https://github.com/t2linux/T2-Ubuntu-Kernel#installation) to receive kernel updates.
diff --git a/build.sh b/build.sh
index 000bfbc..0e26e6a 100755
--- a/build.sh
+++ b/build.sh
@@ -36,7 +36,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   syslinux
 
 echo >&2 "===]> Info: Start loop... "
-for ALTERNATIVE in t2-kinetic t2-external
+for ALTERNATIVE in t2-kinetic
 do
   echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
 
diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index a4972dd..47a5f99 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -67,14 +67,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   grub2 \
   nautilus-admin
 
-if [[ ${ALTERNATIVE} = t2-external ]]
-then
-curl -L https://github.com/AdityaGarg8/T2-Ubuntu/releases/download/vKVER-PREL-kernel-kinetic/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb
-curl -L https://github.com/AdityaGarg8/T2-Ubuntu/releases/download/vKVER-PREL-kernel-kinetic/linux-image-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/image.deb
-else
 curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb
 curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/image.deb
-fi
 file /tmp/*
 apt install /tmp/headers.deb /tmp/image.deb
 

From d3e493aa3238d3f64ec6a950917435dba94051c5 Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Tue, 20 Dec 2022 15:04:24 +0530
Subject: [PATCH 24/36] Update CI.yml

---
 .github/workflows/CI.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index bb94da4..753b341 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -7,7 +7,6 @@ on:
 jobs:
 
   Safe-graphics:
-    needs: [Kernel]
     runs-on: ubuntu-22.04
     steps:
       - name: 'Checkout Kinetic Repo'
@@ -41,7 +40,6 @@ jobs:
           branch: kinetic-16,4
 
   ISO:
-    needs: [Kernel]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3

From b374647b2527e2209430d5ba214a6803149f9f77 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 20 Dec 2022 09:37:02 +0000
Subject: [PATCH 25/36] 6.0.12-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 0e26e6a..411c640 100755
--- 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.0.10
+KERNEL_VERSION=6.0.12
 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

From acf96026bff0d8eefd4716911c239705d1e07eb7 Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Tue, 20 Dec 2022 15:16:22 +0530
Subject: [PATCH 26/36] Update grub.cfg

---
 files/grub/grub.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg
index c5d98ce..8a61f58 100644
--- a/files/grub/grub.cfg
+++ b/files/grub/grub.cfg
@@ -14,10 +14,18 @@ menuentry "Try Ubuntu Kinetic Kudu 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 Kinetic Kudu 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 Kinetic Kudu" {
    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 Kinetic Kudu (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
+}
 menuentry "Check disc for defects" {
    linux /casper/vmlinuz boot=casper integrity-check enforcing=0 efi=noruntime pcie_ports=compat ---
    initrd /casper/initrd

From a498cc2392aecde5655f1cf8d5fa771ee7dd8182 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 30 Dec 2022 18:08:07 +0000
Subject: [PATCH 27/36] 6.1.1-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 411c640..75a3b14 100755
--- 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.0.12
+KERNEL_VERSION=6.1.1
 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

From b9e9fa2ee0ad6d3deb65f1efce23a9899bc76766 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 11:33:50 +0000
Subject: [PATCH 28/36] 6.1.2-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 75a3b14..474e72a 100755
--- 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.1.1
+KERNEL_VERSION=6.1.2
 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

From 3d45a8edfc4d0f96ee3364171bbdb0a9fdce9b32 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 22:41:09 +0000
Subject: [PATCH 29/36] 6.1.5-1

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 474e72a..d7e2785 100755
--- 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.1.2
+KERNEL_VERSION=6.1.5
 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

From 8e545b9c7a7290307321672e9f1a70421590ccae Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Wed, 18 Jan 2023 15:36:25 +0530
Subject: [PATCH 30/36] Remove wpagui

---
 files/chroot_build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 47a5f99..6b90e88 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -55,7 +55,6 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   resolvconf \
   net-tools \
   wireless-tools \
-  wpagui \
   locales \
   initramfs-tools \
   binutils \

From 6fb1ecf2c41d9c690941b2b3d6bc7eaf82c76950 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 18 Jan 2023 10:08:32 +0000
Subject: [PATCH 31/36] 6.1.6-2

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index d7e2785..dda1540 100755
--- a/build.sh
+++ b/build.sh
@@ -5,8 +5,8 @@ ROOT_PATH=$(pwd)
 WORKING_PATH=/root/work
 CHROOT_PATH="${WORKING_PATH}/chroot"
 IMAGE_PATH="${WORKING_PATH}/image"
-KERNEL_VERSION=6.1.5
-PKGREL=1
+KERNEL_VERSION=6.1.6
+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
 

From 9b310eabc21c190c952cb8c0b6e11022c65e76ff Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Wed, 18 Jan 2023 15:49:54 +0530
Subject: [PATCH 32/36] Remove gedit

---
 files/chroot_build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 6b90e88..0c1dcca 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -142,7 +142,8 @@ apt-get purge -y -qq \
   linux-image-5.19.0-21-generic \
   linux-image-generic \
   linux-modules-5.19.0-21-generic \
-  linux-modules-extra-5.19.0-21-generic
+  linux-modules-extra-5.19.0-21-generic \
+  gedit
 
 apt-get autoremove -y
 

From ca06afa89e78a74feb6e176a08b0e95ce5803d29 Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Sat, 28 Jan 2023 16:16:19 +0530
Subject: [PATCH 33/36] Remove suspend fix

---
 01_build_file_system.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/01_build_file_system.sh b/01_build_file_system.sh
index 3be7cec..0b091fe 100755
--- a/01_build_file_system.sh
+++ b/01_build_file_system.sh
@@ -35,8 +35,3 @@ umount "${CHROOT_PATH}/dev"
 echo >&2 "===]> Info: Patch Grub... "
 cp -rfv "${ROOT_PATH}"/files/grub/30_os-prober "${CHROOT_PATH}"/etc/grub.d/30_os-prober
 chmod 755 "${CHROOT_PATH}"/etc/grub.d/30_os-prober
-
-### Copy suspend fix
-echo >&2 "===]> Info: Fix suspend... "
-cp -rfv "${ROOT_PATH}"/files/suspend/rmmod_tb.sh "${CHROOT_PATH}"/lib/systemd/system-sleep/rmmod_tb.sh
-chmod +x "${CHROOT_PATH}"/lib/systemd/system-sleep/rmmod_tb.sh

From 4429dbe40ce81d615a72e3fd605e1a8b9ec8faff Mon Sep 17 00:00:00 2001
From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com>
Date: Sat, 28 Jan 2023 16:18:21 +0530
Subject: [PATCH 34/36] Remove suspend script

---
 files/suspend/rmmod_tb.sh | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100755 files/suspend/rmmod_tb.sh

diff --git a/files/suspend/rmmod_tb.sh b/files/suspend/rmmod_tb.sh
deleted file mode 100755
index d0f33eb..0000000
--- a/files/suspend/rmmod_tb.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ "${1}" = "pre" ]; then
-        modprobe -r apple-touchbar
-elif [ "${1}" = "post" ]; then
-        modprobe apple-touchbar
-fi

From 36bdd4964bab6ca91716442130c0f67035ea626e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 28 Jan 2023 14:02:44 +0000
Subject: [PATCH 35/36] 6.1.8-2

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index dda1540..aac3d5b 100755
--- 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.1.6
+KERNEL_VERSION=6.1.8
 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

From ad7132eed51cd82547fe844e12de2c214ce5cb33 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:54:44 +0000
Subject: [PATCH 36/36] 6.1.9-1

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index aac3d5b..237ae68 100755
--- a/build.sh
+++ b/build.sh
@@ -5,8 +5,8 @@ ROOT_PATH=$(pwd)
 WORKING_PATH=/root/work
 CHROOT_PATH="${WORKING_PATH}/chroot"
 IMAGE_PATH="${WORKING_PATH}/image"
-KERNEL_VERSION=6.1.8
-PKGREL=2
+KERNEL_VERSION=6.1.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