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] 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