From d32ed1b9f8b504cc4117d7fedca6f8982932e050 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Sat, 20 Nov 2021 11:42:54 +0530 Subject: [PATCH 001/141] 5.15.3 --- build.sh | 2 +- files/chroot_build.sh | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build.sh b/build.sh index b4e04e7..fa23c56 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=5.10.52 +KERNEL_VERSION=5.15.3 if [ -d "$WORKING_PATH" ]; then rm -rf "$WORKING_PATH" diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 59c272c..242fecf 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -63,11 +63,16 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" linux-generic \ linux-headers-generic \ grub-efi-amd64-signed \ - "linux-image-${KERNEL_VERSION}" \ - "linux-headers-${KERNEL_VERSION}" \ intel-microcode \ thermald +# This is not ideal, but it should work until the apt repo gets updated. + +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-headers-5.15.3-t2-big-sur_5.15.3-1_amd64.deb > /tmp/headers.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-image-5.15.3-t2-big-sur_5.15.3-1_amd64.deb > /tmp/image.deb +file /tmp/* +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" \ @@ -105,13 +110,13 @@ APPLE_BCE_DRIVER_GIT_URL=https://github.com/t2linux/apple-bce-drv.git APPLE_BCE_DRIVER_BRANCH_NAME=aur APPLE_BCE_DRIVER_COMMIT_HASH=f93c6566f98b3c95677de8010f7445fa19f75091 APPLE_BCE_DRIVER_MODULE_NAME=apple-bce -APPLE_BCE_DRIVER_MODULE_VERSION=0.2 +APPLE_BCE_DRIVER_MODULE_VERSION=r183.c884d9c -APPLE_IB_DRIVER_GIT_URL=https://github.com/t2linux/apple-ib-drv +APPLE_IB_DRIVER_GIT_URL=https://github.com/Redecorating/apple-ib-drv APPLE_IB_DRIVER_BRANCH_NAME=mbp15 -APPLE_IB_DRIVER_COMMIT_HASH=fc9aefa5a564e6f2f2bb0326bffb0cef0446dc05 +APPLE_IB_DRIVER_COMMIT_HASH=b518bff292cc14a4b55925dac6a76d171d427032 APPLE_IB_DRIVER_MODULE_NAME=apple-ibridge -APPLE_IB_DRIVER_MODULE_VERSION=0.2 +APPLE_IB_DRIVER_MODULE_VERSION=0.1 # thunderbolt is working for me. #printf '\nblacklist thunderbolt' >>/etc/modprobe.d/blacklist.conf @@ -122,7 +127,7 @@ git -C /usr/src/"${APPLE_BCE_DRIVER_MODULE_NAME}-${APPLE_BCE_DRIVER_MODULE_VERSI cat << EOF > /usr/src/${APPLE_BCE_DRIVER_MODULE_NAME}-${APPLE_BCE_DRIVER_MODULE_VERSION}/dkms.conf PACKAGE_NAME=apple-bce -PACKAGE_VERSION=0.1 +PACKAGE_VERSION=r183.c884d9c CLEAN="make clean" MAKE="make" BUILT_MODULE_NAME[0]="apple-bce" @@ -140,7 +145,7 @@ git clone --single-branch --branch ${APPLE_IB_DRIVER_BRANCH_NAME} ${APPLE_IB_DRI git -C /usr/src/"${APPLE_IB_DRIVER_MODULE_NAME}-${APPLE_IB_DRIVER_MODULE_VERSION}" checkout "${APPLE_IB_DRIVER_COMMIT_HASH}" dkms install -m "${APPLE_IB_DRIVER_MODULE_NAME}" -v "${APPLE_IB_DRIVER_MODULE_VERSION}" -k "${KERNEL_VERSION}" printf '\n### applespi start ###\napple_ibridge\napple_ib_tb\napple_ib_als\n### applespi end ###' >>/etc/modules-load.d/applespi.conf -printf '\n# display f* key in touchbar\noptions apple-ib-tb fnmode=2\n' >> /etc/modprobe.d/apple-touchbar.conf +printf '\n# display f* key in touchbar\noptions apple-ib-tb fnmode=2\n' >> /etc/modprobe.d/apple-tb.conf echo >&2 "===]> Info: Update initramfs... " From 23d3fdb9d8bb7368fd285289e9156ea982ce5d15 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 11:44:37 +0530 Subject: [PATCH 002/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index fa23c56..b2a646e 100755 --- a/build.sh +++ b/build.sh @@ -33,7 +33,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" syslinux echo >&2 "===]> Info: Start loop... " -for ALTERNATIVE in mbp mbp-16x-wifi +for ALTERNATIVE in t2-big-sur do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " From 6b55e304da99b31f1ac0428d5545a860fe321e8a Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 12:14:28 +0530 Subject: [PATCH 003/141] 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 4ba07fc..4b11828 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -42,7 +42,7 @@ jobs: if: github.ref == 'refs/heads/master' uses: softprops/action-gh-release@v1 with: - data: ${{ github.workspace }}/output/* + files: ${{ github.workspace }}/output/* tag_name: v20.04-${{ steps.tag.outputs.tag }} draft: true env: From 099fd15fa05704d2f47752a3d4f8a5ace030c6ab Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 12:40:46 +0530 Subject: [PATCH 004/141] 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 4b11828..9f0f27c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,7 +35,7 @@ jobs: Download all the artifacts, and put them in a folder without other files. Then run:" unzip "*.z??.zip" - cat livecd-${{ steps.tag.outputs.tag }}-mbp.z?? > cd.zip + cat livecd-${{ steps.tag.outputs.tag }}-t2-big-sur.z?? > cd.zip echo unzip cd.zip EOF - name: Release From d3782e7f2eb535311cffc144a374ef848df098b8 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 12:56:12 +0530 Subject: [PATCH 005/141] Update CI.yml --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9f0f27c..e592592 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,8 @@ jobs: - uses: actions/checkout@v2 - name: Build - run: sudo ./build.sh + run: echo "${{ github.workspace }}" + sudo ./build.sh - name: print sha256sum run: cat output/sha256 From 65d3abef7879f3c62adadb98419b19c962d0e674 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 13:02:47 +0530 Subject: [PATCH 006/141] Make release --- .github/workflows/CI.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e592592..57a1c68 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,8 +11,7 @@ jobs: - uses: actions/checkout@v2 - name: Build - run: echo "${{ github.workspace }}" - sudo ./build.sh + run: sudo ./build.sh - name: print sha256sum run: cat output/sha256 @@ -39,11 +38,17 @@ jobs: cat livecd-${{ steps.tag.outputs.tag }}-t2-big-sur.z?? > cd.zip echo unzip cd.zip EOF + + - name: Put ISO back for release + run: | + cd ${{ github.workspace }}/output + cat livecd-${{ steps.tag.outputs.tag }}-t2-big-sur.z?? > cd.zip + unzip cd.zip - name: Release if: github.ref == 'refs/heads/master' uses: softprops/action-gh-release@v1 with: - files: ${{ github.workspace }}/output/* + files: ${{ github.workspace }}/output/${{ github.workspace }}/* tag_name: v20.04-${{ steps.tag.outputs.tag }} draft: true env: From 82512a24157699cd3ea14eb8bdb5619e00f3a72b Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 13:25:43 +0530 Subject: [PATCH 007/141] Fix CI --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 57a1c68..e8bed27 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -41,6 +41,7 @@ jobs: - name: Put ISO back for release run: | + sudo su cd ${{ github.workspace }}/output cat livecd-${{ steps.tag.outputs.tag }}-t2-big-sur.z?? > cd.zip unzip cd.zip From 3fbc0dd5041a15e3af50ab3b4df3b1c433401a14 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 13:50:16 +0530 Subject: [PATCH 008/141] Update CI.yml (#1) --- .github/workflows/CI.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e8bed27..85eb6c9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,19 +38,13 @@ jobs: cat livecd-${{ steps.tag.outputs.tag }}-t2-big-sur.z?? > cd.zip echo unzip cd.zip EOF - - - name: Put ISO back for release - run: | - sudo su - cd ${{ github.workspace }}/output - cat livecd-${{ steps.tag.outputs.tag }}-t2-big-sur.z?? > cd.zip - unzip cd.zip + - name: Release - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/test' uses: softprops/action-gh-release@v1 with: - files: ${{ github.workspace }}/output/${{ github.workspace }}/* - tag_name: v20.04-${{ steps.tag.outputs.tag }} + files: ${{ github.workspace }}/*.iso + tag_name: v20.04-${{ steps.tag.outputs.tag }}-test draft: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9c37d2ecb162b8da0dda0c4be7e165adfb2504b1 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 13:50:43 +0530 Subject: [PATCH 009/141] 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 85eb6c9..e9bb698 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -40,11 +40,11 @@ jobs: EOF - name: Release - if: github.ref == 'refs/heads/test' + if: github.ref == 'refs/heads/master' uses: softprops/action-gh-release@v1 with: files: ${{ github.workspace }}/*.iso - tag_name: v20.04-${{ steps.tag.outputs.tag }}-test - draft: true + tag_name: v20.04-${{ steps.tag.outputs.tag }} + draft: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 3935bdeacadafc54b2b78c0a3a76c32eaa0c3a49 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 13:52:19 +0530 Subject: [PATCH 010/141] install snap-store --- files/chroot_build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 242fecf..33f8964 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -100,6 +100,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" gcc \ dkms \ iwd + +snap install snap-store echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" From f258a721707314075b1bf9f47516b5cf16d0fb85 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 20 Nov 2021 15:10:53 +0530 Subject: [PATCH 011/141] 5.15.3 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b2a646e..a9d7676 100755 --- a/build.sh +++ b/build.sh @@ -81,7 +81,7 @@ do cd "${ROOT_PATH}" zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-20.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" done -### Calculate sha256 sums of built ISO +## Calculate sha256 sums of built ISO sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256" find ./ | grep ".iso" From 4f89d6bc2ef2eb01f84b4b53f74b288ac7a8e95d Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 21 Nov 2021 09:39:04 +0530 Subject: [PATCH 012/141] Add Mojave --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a9d7676..ef2239e 100755 --- a/build.sh +++ b/build.sh @@ -33,7 +33,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" syslinux echo >&2 "===]> Info: Start loop... " -for ALTERNATIVE in t2-big-sur +for ALTERNATIVE in t2-big-sur t2-mojave do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " From fbb4d577f4a13353d90c403636e6b1daaf742d89 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 21 Nov 2021 09:46:21 +0530 Subject: [PATCH 013/141] Update chroot_build.sh --- files/chroot_build.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 33f8964..e887fff 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -68,10 +68,15 @@ 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-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-headers-5.15.3-t2-big-sur_5.15.3-1_amd64.deb > /tmp/headers.deb -curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-image-5.15.3-t2-big-sur_5.15.3-1_amd64.deb > /tmp/image.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-big-sur_${KERNEL_VERSION}-1_amd64.deb > /tmp/headers_bs.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-big-sur_${KERNEL_VERSION}-1_amd64.deb > /tmp/image_bs.deb file /tmp/* -apt install /tmp/headers.deb /tmp/image.deb +apt install /tmp/headers_bs.deb /tmp/image_bs.deb + +curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb > /tmp/headers_m.deb +curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb > /tmp/image_m.deb +file /tmp/* +apt install /tmp/headers_m.deb /tmp/image_m.deb echo >&2 "===]> Info: Install window manager... " From e0f6923835e7b073a3d26f7505080d4a816f8ad2 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 21 Nov 2021 09:55:00 +0530 Subject: [PATCH 014/141] Mojave --- files/chroot_build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index e887fff..e81a4f2 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -68,15 +68,15 @@ 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-Big-Sur-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-big-sur_${KERNEL_VERSION}-1_amd64.deb > /tmp/headers_bs.deb -curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-big-sur_${KERNEL_VERSION}-1_amd64.deb > /tmp/image_bs.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-big-sur_${KERNEL_VERSION}-1_amd64.deb > /tmp/headers-bs.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-big-sur_${KERNEL_VERSION}-1_amd64.deb > /tmp/image-bs.deb file /tmp/* -apt install /tmp/headers_bs.deb /tmp/image_bs.deb +apt install /tmp/headers-bs.deb /tmp/image-bs.deb -curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb > /tmp/headers_m.deb -curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb > /tmp/image_m.deb +curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb > /tmp/headers-m.deb +curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb > /tmp/image-m.deb file /tmp/* -apt install /tmp/headers_m.deb /tmp/image_m.deb +apt install /tmp/headers-m.deb /tmp/image-m.deb echo >&2 "===]> Info: Install window manager... " From 780ee6219db64e96d466ba788b3b0daf8c0d1888 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 21 Nov 2021 10:18:04 +0530 Subject: [PATCH 015/141] 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 e81a4f2..7989495 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-Big-Sur-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-big-sur_${KERNEL_VERSION}-1_amd64.deb > /tmp/headers-bs.deb -curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-big-sur_${KERNEL_VERSION}-1_amd64.deb > /tmp/image-bs.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-headers-5.15.3-t2-big-sur_5.15.3-1_amd64.deb > /tmp/headers-bs.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-image-5.15.3-t2-big-sur_5.15.3-1_amd64.deb > /tmp/image-bs.deb file /tmp/* apt install /tmp/headers-bs.deb /tmp/image-bs.deb From d4977c23b6aa92cde52cc7fe29bf76b670a2c0bf Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 21 Nov 2021 10:26:30 +0530 Subject: [PATCH 016/141] Fix variable error --- 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 7989495..895624a 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -73,8 +73,8 @@ curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/downloa file /tmp/* apt install /tmp/headers-bs.deb /tmp/image-bs.deb -curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb > /tmp/headers-m.deb -curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb > /tmp/image-m.deb +curl -L "https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb" > /tmp/headers-m.deb +curl -L "https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb" > /tmp/image-m.deb file /tmp/* apt install /tmp/headers-m.deb /tmp/image-m.deb From 156a9af7e4351fc7821637d0bf33029da7d86bb0 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 21 Nov 2021 10:34:01 +0530 Subject: [PATCH 017/141] 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 895624a..223fb47 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -73,8 +73,8 @@ curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/downloa file /tmp/* apt install /tmp/headers-bs.deb /tmp/image-bs.deb -curl -L "https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-headers-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb" > /tmp/headers-m.deb -curl -L "https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v${KERNEL_VERSION}-1/linux-image-${KERNEL_VERSION}-t2-mojave_${KERNEL_VERSION}-1_amd64.deb" > /tmp/image-m.deb +curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-headers-5.15.3-t2-mojave_5.15.3-1_amd64.deb" > /tmp/headers-m.deb +curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-image-5.15.3-t2-mojave_5.15.3-1_amd64.deb" > /tmp/image-m.deb file /tmp/* apt install /tmp/headers-m.deb /tmp/image-m.deb From 3ce39616f6525b9e04ac9e3c9321d797ff58a0ba Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 21 Nov 2021 11:03:21 +0530 Subject: [PATCH 018/141] Fix url --- 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 223fb47..62c3774 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -73,8 +73,8 @@ curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/downloa file /tmp/* apt install /tmp/headers-bs.deb /tmp/image-bs.deb -curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-headers-5.15.3-t2-mojave_5.15.3-1_amd64.deb" > /tmp/headers-m.deb -curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-image-5.15.3-t2-mojave_5.15.3-1_amd64.deb" > /tmp/image-m.deb +curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-headers-5.15.3-t2-mojave_5.15.3-1_amd64.deb > /tmp/headers-m.deb +curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-image-5.15.3-t2-mojave_5.15.3-1_amd64.deb > /tmp/image-m.deb file /tmp/* apt install /tmp/headers-m.deb /tmp/image-m.deb From ab3fcb5d37d45455eaceb8c5e44c25a179365212 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:41:24 +0530 Subject: [PATCH 019/141] Update chroot_build.sh Skip snap-store installation --- files/chroot_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 62c3774..509de1d 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -106,7 +106,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" dkms \ iwd -snap install snap-store +#snap install snap-store echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" From 6503c003ecdc73217504cb55554e9757abe321b3 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 22 Nov 2021 12:12:22 +0530 Subject: [PATCH 020/141] Remove Mojave --- build.sh | 3 +-- files/chroot_build.sh | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/build.sh b/build.sh index ef2239e..56eb0ab 100755 --- a/build.sh +++ b/build.sh @@ -33,8 +33,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" syslinux echo >&2 "===]> Info: Start loop... " -for ALTERNATIVE in t2-big-sur t2-mojave -do +for ALTERNATIVE in t2-big-sur echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " echo >&2 "===]> Info: Build Ubuntu FS... " diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 509de1d..83490f0 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -73,11 +73,6 @@ curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/downloa file /tmp/* apt install /tmp/headers-bs.deb /tmp/image-bs.deb -curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-headers-5.15.3-t2-mojave_5.15.3-1_amd64.deb > /tmp/headers-m.deb -curl -L https://github.com/AdityaGarg8/T2-Mojave-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-image-5.15.3-t2-mojave_5.15.3-1_amd64.deb > /tmp/image-m.deb -file /tmp/* -apt install /tmp/headers-m.deb /tmp/image-m.deb - echo >&2 "===]> Info: Install window manager... " apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ From 3314e4668c203d0116a36a4736dab7b225efc760 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 22 Nov 2021 12:15:13 +0530 Subject: [PATCH 021/141] Fix build.sh --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 56eb0ab..a9d7676 100755 --- a/build.sh +++ b/build.sh @@ -34,6 +34,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" echo >&2 "===]> Info: Start loop... " for ALTERNATIVE in t2-big-sur +do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " echo >&2 "===]> Info: Build Ubuntu FS... " From a3ff7d29928a2f39cd531e88e1b443bbae629b0c Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:38:55 +0530 Subject: [PATCH 022/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a9d7676..3168e08 100755 --- a/build.sh +++ b/build.sh @@ -79,7 +79,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-20.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" + zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-21.10-${KERNEL_VERSION}-${ALTERNATIVE}.iso" done ## Calculate sha256 sums of built ISO sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256" From 2875b729d3e7ef82ca96af1ee2c75cde40454ae4 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:49:38 +0530 Subject: [PATCH 023/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3168e08..a9d7676 100755 --- a/build.sh +++ b/build.sh @@ -79,7 +79,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-21.10-${KERNEL_VERSION}-${ALTERNATIVE}.iso" + zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-20.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" done ## Calculate sha256 sums of built ISO sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256" From 9795cbc388fe96e45891480d2cabfcfa891e6920 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 2 Dec 2021 12:32:54 +0530 Subject: [PATCH 024/141] fix key --- files/chroot_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 83490f0..691443a 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -23,6 +23,7 @@ deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted univers deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse EOF +apt-get install linuxmint-keyring apt-get update echo >&2 "===]> Info: Install systemd and Ubuntu MBP Repo... " From 82fb7f605e3f1802cf785c00390f61f636c99bd1 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 7 Dec 2021 08:50:59 +0530 Subject: [PATCH 025/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a9d7676..bc380cc 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=5.15.3 +KERNEL_VERSION=5.15.6 if [ -d "$WORKING_PATH" ]; then rm -rf "$WORKING_PATH" From c0c8aa21c65bcd98f3c33ff203d0d532469820c5 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 7 Dec 2021 08:53:32 +0530 Subject: [PATCH 026/141] Update chroot_build.sh --- files/chroot_build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 691443a..d0e5045 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -23,7 +23,6 @@ deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted univers deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse EOF -apt-get install linuxmint-keyring apt-get update echo >&2 "===]> Info: Install systemd and Ubuntu MBP Repo... " @@ -69,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-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-headers-5.15.3-t2-big-sur_5.15.3-1_amd64.deb > /tmp/headers-bs.deb -curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.3-1/linux-image-5.15.3-t2-big-sur_5.15.3-1_amd64.deb > /tmp/image-bs.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.6-1/linux-headers-5.15.6-t2-big-sur_5.15.6-1_amd64.deb > /tmp/headers-bs.deb +curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.6-1/linux-image-5.15.6-t2-big-sur_5.15.6-1_amd64.deb > /tmp/image-bs.deb file /tmp/* apt install /tmp/headers-bs.deb /tmp/image-bs.deb From d05e957a115119ee2855a567e83f301fbb7f9e83 Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 7 Dec 2021 08:57:12 +0530 Subject: [PATCH 027/141] 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 d36ad48..89720c1 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -10,6 +10,10 @@ menuentry "Try Ubuntu FS without installing" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force --- initrd /casper/initrd } +menuentry "Try Ubuntu FS without installing (efi=noruntine removed)" { + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force --- + initrd /casper/initrd +} menuentry "Try Ubuntu FS without installing (blacklist=thunderbolt)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force --- modprobe.blacklist=thunderbolt initrd /casper/initrd @@ -18,6 +22,10 @@ menuentry "Install Ubuntu FS" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force --- initrd /casper/initrd } +menuentry "Install Ubuntu FS (efi=noruntine removed)" { + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force --- + initrd /casper/initrd +} menuentry "Install Ubuntu FS (blacklist=thunderbolt)" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force --- modprobe.blacklist=thunderbolt initrd /casper/initrd From 8587b9d3c919884ec677a22b10bce8c442ba232c Mon Sep 17 00:00:00 2001 From: AdityaGarg8 <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 22 Dec 2021 09:25:54 +0530 Subject: [PATCH 028/141] Update grub.cfg --- files/grub/grub.cfg | 8 -------- 1 file changed, 8 deletions(-) diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 89720c1..d36ad48 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -10,10 +10,6 @@ menuentry "Try Ubuntu FS without installing" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force --- initrd /casper/initrd } -menuentry "Try Ubuntu FS without installing (efi=noruntine removed)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force --- - initrd /casper/initrd -} menuentry "Try Ubuntu FS without installing (blacklist=thunderbolt)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force --- modprobe.blacklist=thunderbolt initrd /casper/initrd @@ -22,10 +18,6 @@ menuentry "Install Ubuntu FS" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force --- initrd /casper/initrd } -menuentry "Install Ubuntu FS (efi=noruntine removed)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force --- - initrd /casper/initrd -} menuentry "Install Ubuntu FS (blacklist=thunderbolt)" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force --- modprobe.blacklist=thunderbolt initrd /casper/initrd From 398018a39fd139b905c0027644be2ba0dcad3dbd Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Sat, 25 Dec 2021 09:10:46 +0530 Subject: [PATCH 029/141] OTP --- .github/workflows/CI.yml | 4 ++-- build.sh | 4 ++-- files/chroot_build.sh | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e9bb698..e196c67 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,12 +35,12 @@ jobs: Download all the artifacts, and put them in a folder without other files. Then run:" unzip "*.z??.zip" - cat livecd-${{ steps.tag.outputs.tag }}-t2-big-sur.z?? > cd.zip + cat livecd-${{ steps.tag.outputs.tag }}-t2.z?? > cd.zip echo unzip cd.zip EOF - name: Release - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/OTP' uses: softprops/action-gh-release@v1 with: files: ${{ github.workspace }}/*.iso diff --git a/build.sh b/build.sh index bc380cc..43b1a18 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=5.15.6 +KERNEL_VERSION=5.15.11 if [ -d "$WORKING_PATH" ]; then rm -rf "$WORKING_PATH" @@ -33,7 +33,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" syslinux echo >&2 "===]> Info: Start loop... " -for ALTERNATIVE in t2-big-sur +for ALTERNATIVE in t2 do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " diff --git a/files/chroot_build.sh b/files/chroot_build.sh index d0e5045..2c40e3e 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -68,10 +68,11 @@ 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-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.6-1/linux-headers-5.15.6-t2-big-sur_5.15.6-1_amd64.deb > /tmp/headers-bs.deb -curl -L https://github.com/AdityaGarg8/T2-Big-Sur-Ubuntu-Kernel/releases/download/v5.15.6-1/linux-image-5.15.6-t2-big-sur_5.15.6-1_amd64.deb > /tmp/image-bs.deb +curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/linux-headers-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/headers.deb +curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/linux-image-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/image.deb +curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/firmware.deb > /tmp/firmware.deb file /tmp/* -apt install /tmp/headers-bs.deb /tmp/image-bs.deb +apt install /tmp/headers.deb /tmp/image.deb /tmp/firmware.deb echo >&2 "===]> Info: Install window manager... " From ecd2c1e77380453391e18c956ae0d1bb35202c87 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 25 Dec 2021 09:27:32 +0530 Subject: [PATCH 030/141] Update chroot_build.sh --- files/chroot_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 2c40e3e..ddbc612 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -70,7 +70,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/linux-headers-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/headers.deb curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/linux-image-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/image.deb -curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/firmware.deb > /tmp/firmware.deb +curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/iso-firmware.deb > /tmp/firmware.deb file /tmp/* apt install /tmp/headers.deb /tmp/image.deb /tmp/firmware.deb From 243c2ac0afd90da15d62ba29543c25cadf930941 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 26 Dec 2021 10:22:26 +0530 Subject: [PATCH 031/141] Update chroot_build.sh --- files/chroot_build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index ddbc612..34dddb3 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -192,11 +192,13 @@ dpkg-reconfigure -f readline resolvconf cat </etc/NetworkManager/NetworkManager.conf [main] -rc-manager=resolvconf plugins=ifupdown,keyfile -dns=dnsmasq + [ifupdown] managed=false + +[device] +wifi.scan-rand-mac-address=no EOF dpkg-reconfigure network-manager From a8e5ffd2148e74b8422cb80396b5cfd8f1639313 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 26 Dec 2021 11:58:12 +0530 Subject: [PATCH 032/141] txcap --- files/chroot_build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 34dddb3..2d2869b 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -68,9 +68,9 @@ 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/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/linux-headers-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/headers.deb -curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/linux-image-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/image.deb -curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/v5.15.11-ubuntu/iso-firmware.deb > /tmp/firmware.deb +curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/5.15.11-txcap-ubuntu/linux-headers-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/headers.deb +curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/5.15.11-txcap-ubuntu/linux-image-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/image.deb +curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/5.15.11-txcap-ubuntu/iso-firmware.deb > /tmp/firmware.deb file /tmp/* apt install /tmp/headers.deb /tmp/image.deb /tmp/firmware.deb From f4216cfea2291f24970feb6163388a7a8007d74f Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 6 Jan 2022 13:48:16 +0530 Subject: [PATCH 033/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 43b1a18..171955e 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=5.15.11 +KERNEL_VERSION=5.15.12 if [ -d "$WORKING_PATH" ]; then rm -rf "$WORKING_PATH" From 6beb9cabb551122cc43e894164d143b59249ddc8 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 6 Jan 2022 13:50:57 +0530 Subject: [PATCH 034/141] 5.15.12 --- files/chroot_build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 2d2869b..c6c30e0 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -68,9 +68,9 @@ 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/mbp-16.1-linux-wifi/releases/download/5.15.11-txcap-ubuntu/linux-headers-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/headers.deb -curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/5.15.11-txcap-ubuntu/linux-image-5.15.11-t2_5.15.11-1_amd64.deb > /tmp/image.deb -curl -L https://github.com/AdityaGarg8/mbp-16.1-linux-wifi/releases/download/5.15.11-txcap-ubuntu/iso-firmware.deb > /tmp/firmware.deb +curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/v5.15.12-1/linux-headers-5.15.12-t2_5.15.12-1_amd64.deb > /tmp/headers.deb +curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/v5.15.12-1/linux-image-5.15.12-t2_5.15.12-1_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 From 783bdeb5c869d5f9debf0628ab0386bcdb1e8c8d Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 7 Jan 2022 11:53:58 +0530 Subject: [PATCH 035/141] 5.15.12 --- files/chroot_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index c6c30e0..4707b1e 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -117,7 +117,7 @@ APPLE_BCE_DRIVER_MODULE_VERSION=r183.c884d9c APPLE_IB_DRIVER_GIT_URL=https://github.com/Redecorating/apple-ib-drv APPLE_IB_DRIVER_BRANCH_NAME=mbp15 -APPLE_IB_DRIVER_COMMIT_HASH=b518bff292cc14a4b55925dac6a76d171d427032 +APPLE_IB_DRIVER_COMMIT_HASH=467df9b11cb55456f0365f40dd11c9e666623bf3 APPLE_IB_DRIVER_MODULE_NAME=apple-ibridge APPLE_IB_DRIVER_MODULE_VERSION=0.1 From da73152bae4f024398d7cf6fa60a218d36a66243 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 12 Jan 2022 18:34:53 +0530 Subject: [PATCH 036/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 171955e..06db161 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=5.15.12 +KERNEL_VERSION=5.16 if [ -d "$WORKING_PATH" ]; then rm -rf "$WORKING_PATH" From 7e71d34762d23ce08ce7d99b8f4dd643ac047719 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 12 Jan 2022 18:36:10 +0530 Subject: [PATCH 037/141] Update grub.cfg --- files/grub/grub.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index d36ad48..602d350 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -7,6 +7,10 @@ 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 --- + 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 --- initrd /casper/initrd } @@ -15,6 +19,10 @@ menuentry "Try Ubuntu FS without installing (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 --- + 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 --- initrd /casper/initrd } @@ -23,6 +31,10 @@ menuentry "Install Ubuntu FS (blacklist=thunderbolt)" { initrd /casper/initrd } menuentry "Check disc for defects" { + linux /casper/vmlinuz boot=casper integrity-check enforcing=0 efi=noruntime pcie_ports=compat acpi=force --- + initrd /casper/initrd +} +menuentry "Check disc for defects (efi=noruntime)" { linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat acpi=force --- initrd /casper/initrd } From f30626379e2b1ab3107bcde9992d7d2e8e6cf6e5 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 12 Jan 2022 18:37:13 +0530 Subject: [PATCH 038/141] 5.16 --- 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 4707b1e..f105a3e 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.15.12-1/linux-headers-5.15.12-t2_5.15.12-1_amd64.deb > /tmp/headers.deb -curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/v5.15.12-1/linux-image-5.15.12-t2_5.15.12-1_amd64.deb > /tmp/image.deb +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://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 From 27addce7d53d4a0b5890302f1fd6c8259d587a8a Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 12 Jan 2022 18:49:26 +0530 Subject: [PATCH 039/141] 5.16.0 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 06db161..42ad083 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=5.16 +KERNEL_VERSION=5.16.0 if [ -d "$WORKING_PATH" ]; then rm -rf "$WORKING_PATH" From dd0ae2a46e94b0c9c0250ba3d378c6478e489926 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 13 Jan 2022 15:50:42 +0530 Subject: [PATCH 040/141] Update grub.cfg --- files/grub/grub.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 602d350..5f4879b 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -15,6 +15,10 @@ menuentry "Try Ubuntu FS without installing (efi=noruntime)" { 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 + 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 initrd /casper/initrd } @@ -27,6 +31,10 @@ menuentry "Install Ubuntu FS (efi=noruntime)" { 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 + 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 initrd /casper/initrd } @@ -39,6 +47,10 @@ menuentry "Check disc for defects (efi=noruntime)" { initrd /casper/initrd } menuentry "Check disc for defects (blacklist=thunderbolt)" { + linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 pcie_ports=compat --- modprobe.blacklist=thunderbolt + initrd /casper/initrd +} +menuentry "Check disc for defects (blacklist=thunderbolt and efi=noruntime)" { linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat --- modprobe.blacklist=thunderbolt initrd /casper/initrd } From e2ef47b4177949b06c1c4023349fa6ae8828cb97 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Sat, 15 Jan 2022 10:43:47 +0530 Subject: [PATCH 041/141] 5.15.14 --- build.sh | 5 ++++- files/chroot_build.sh | 4 ++-- files/grub/grub.cfg | 16 ++++++++-------- 3 files changed, 14 insertions(+), 11 deletions(-) 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" { From 583843699522c164063903098308e8478c268aa5 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 15 Jan 2022 10:54:48 +0530 Subject: [PATCH 042/141] Fix wrong variable --- 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 2eb17cd..fed6b30 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/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://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-t2_KVER-PREL_amd64.deb > /tmp/headers.deb +curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-t2_KVER-PREL_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 From abde44e189af0ed3a25ec0b038b3df3ff9f91f3c Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 15 Jan 2022 11:04:09 +0530 Subject: [PATCH 043/141] Remove quiet splash --- files/grub/grub.cfg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index d19c83e..85063cc 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 intel_iommu=on iommu=pt quiet splash --- + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt quiet splash --- + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt quiet splash --- modprobe.blacklist=thunderbolt + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt quiet splash --- 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 --- 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 intel_iommu=on iommu=pt quiet splash --- + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt quiet splash --- + 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 --- 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 intel_iommu=on iommu=pt quiet splash --- 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 --- 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 intel_iommu=on iommu=pt quiet splash --- 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 --- modprobe.blacklist=thunderbolt initrd /casper/initrd } menuentry "Check disc for defects" { From 995e73b2f46e0a0afd4d2ffd830b8a3e59766f4f Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 15 Jan 2022 11:08:22 +0530 Subject: [PATCH 044/141] Make touchbar show media controls --- files/chroot_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index fed6b30..9a0c892 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -148,7 +148,7 @@ git clone --single-branch --branch ${APPLE_IB_DRIVER_BRANCH_NAME} ${APPLE_IB_DRI git -C /usr/src/"${APPLE_IB_DRIVER_MODULE_NAME}-${APPLE_IB_DRIVER_MODULE_VERSION}" checkout "${APPLE_IB_DRIVER_COMMIT_HASH}" dkms install -m "${APPLE_IB_DRIVER_MODULE_NAME}" -v "${APPLE_IB_DRIVER_MODULE_VERSION}" -k "${KERNEL_VERSION}" printf '\n### applespi start ###\napple_ibridge\napple_ib_tb\napple_ib_als\n### applespi end ###' >>/etc/modules-load.d/applespi.conf -printf '\n# display f* key in touchbar\noptions apple-ib-tb fnmode=2\n' >> /etc/modprobe.d/apple-tb.conf +printf '\n# display f* key in touchbar\noptions apple-ib-tb fnmode=1\n' >> /etc/modprobe.d/apple-tb.conf echo >&2 "===]> Info: Update initramfs... " From ce8cd89517badd1b301540692d0923a9e4cf1c22 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 17 Jan 2022 17:24:16 +0530 Subject: [PATCH 045/141] Fix wifi --- .github/workflows/CI.yml | 1 + files/chroot_build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e196c67..91a2255 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -46,5 +46,6 @@ jobs: files: ${{ github.workspace }}/*.iso tag_name: v20.04-${{ steps.tag.outputs.tag }} draft: false + prerelease: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 9a0c892..9c2fd5d 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -204,7 +204,7 @@ dpkg-reconfigure network-manager echo >&2 "===]> Info: Configure Network Manager to use iwd... " mkdir -p /etc/NetworkManager/conf.d -printf '[device]\nwifi.backend=iwd\n' > /etc/NetworkManager/conf.d/wifi_backend.conf +printf '#[device]\n#wifi.backend=iwd\n' > /etc/NetworkManager/conf.d/wifi_backend.conf #systemctl enable iwd.service echo >&2 "===]> Info: Cleanup the chroot environment... " From 122ea679d3032a33a51305088135e8eb59e450a0 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 17 Jan 2022 20:18:08 +0530 Subject: [PATCH 046/141] Use efi=noruntime only --- files/grub/grub.cfg | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 85063cc..e11c671 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -7,50 +7,26 @@ 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 intel_iommu=on iommu=pt --- - 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 intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt --- - 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 intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt --- 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 intel_iommu=on iommu=pt --- modprobe.blacklist=thunderbolt initrd /casper/initrd } menuentry "Check disc for defects" { - linux /casper/vmlinuz boot=casper integrity-check enforcing=0 efi=noruntime pcie_ports=compat acpi=force --- - initrd /casper/initrd -} -menuentry "Check disc for defects (efi=noruntime)" { linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat acpi=force --- initrd /casper/initrd } menuentry "Check disc for defects (blacklist=thunderbolt)" { - linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 pcie_ports=compat --- modprobe.blacklist=thunderbolt - initrd /casper/initrd -} -menuentry "Check disc for defects (blacklist=thunderbolt and efi=noruntime)" { linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat --- modprobe.blacklist=thunderbolt initrd /casper/initrd } From 1f4534fbfc57ad904f53758662307bca4fa272e8 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 18 Jan 2022 18:50:05 +0530 Subject: [PATCH 047/141] Update build.sh --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 916d42b..ac4349d 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=5.15.14 -PKGREL=2 +KERNEL_VERSION=5.15.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 734440e2d79f8b3948ebb067ddce2191d7f5e2bb Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Tue, 18 Jan 2022 20:55:05 +0530 Subject: [PATCH 048/141] Add safe graphics --- .github/workflows/CI.yml | 2 +- files/grub/grub.cfg | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 91a2255..825ee28 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -46,6 +46,6 @@ jobs: files: ${{ github.workspace }}/*.iso tag_name: v20.04-${{ steps.tag.outputs.tag }} draft: false - prerelease: true + prerelease: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index e11c671..e0c63cb 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -10,6 +10,10 @@ menuentry "Try Ubuntu FS without installing" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- initrd /casper/initrd } +menuentry "Try Ubuntu FS without installing (Safe Graphics)" { + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- + initrd /casper/initrd +} menuentry "Try Ubuntu FS without installing (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 --- modprobe.blacklist=thunderbolt initrd /casper/initrd @@ -18,6 +22,10 @@ menuentry "Install Ubuntu FS" { 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 --- initrd /casper/initrd } +menuentry "Install Ubuntu FS (Safe Graphics)" { + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- + initrd /casper/initrd +} menuentry "Install Ubuntu FS (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 --- modprobe.blacklist=thunderbolt initrd /casper/initrd From b165a5a890608682317aeaf3634937e5b279689c Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Sat, 22 Jan 2022 21:33:30 +0530 Subject: [PATCH 049/141] 5.15.16 --- .github/workflows/CI.yml | 2 +- build.sh | 2 +- files/chroot_build.sh | 34 +--------------------------------- 3 files changed, 3 insertions(+), 35 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 825ee28..91a2255 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -46,6 +46,6 @@ jobs: files: ${{ github.workspace }}/*.iso tag_name: v20.04-${{ steps.tag.outputs.tag }} draft: false - prerelease: false + prerelease: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.sh b/build.sh index ac4349d..666f680 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=5.15.12 +KERNEL_VERSION=5.15.16 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/files/chroot_build.sh b/files/chroot_build.sh index 9c2fd5d..d95f4c9 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -107,46 +107,14 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" -echo >&2 "===]> Info: Add drivers... " - -APPLE_BCE_DRIVER_GIT_URL=https://github.com/t2linux/apple-bce-drv.git -APPLE_BCE_DRIVER_BRANCH_NAME=aur -APPLE_BCE_DRIVER_COMMIT_HASH=f93c6566f98b3c95677de8010f7445fa19f75091 -APPLE_BCE_DRIVER_MODULE_NAME=apple-bce -APPLE_BCE_DRIVER_MODULE_VERSION=r183.c884d9c - -APPLE_IB_DRIVER_GIT_URL=https://github.com/Redecorating/apple-ib-drv -APPLE_IB_DRIVER_BRANCH_NAME=mbp15 -APPLE_IB_DRIVER_COMMIT_HASH=467df9b11cb55456f0365f40dd11c9e666623bf3 -APPLE_IB_DRIVER_MODULE_NAME=apple-ibridge -APPLE_IB_DRIVER_MODULE_VERSION=0.1 +echo >&2 "===]> Info: Configure drivers... " # thunderbolt is working for me. #printf '\nblacklist thunderbolt' >>/etc/modprobe.d/blacklist.conf -git clone --single-branch --branch ${APPLE_BCE_DRIVER_BRANCH_NAME} ${APPLE_BCE_DRIVER_GIT_URL} \ - /usr/src/"${APPLE_BCE_DRIVER_MODULE_NAME}-${APPLE_BCE_DRIVER_MODULE_VERSION}" -git -C /usr/src/"${APPLE_BCE_DRIVER_MODULE_NAME}-${APPLE_BCE_DRIVER_MODULE_VERSION}" checkout "${APPLE_BCE_DRIVER_COMMIT_HASH}" - -cat << EOF > /usr/src/${APPLE_BCE_DRIVER_MODULE_NAME}-${APPLE_BCE_DRIVER_MODULE_VERSION}/dkms.conf -PACKAGE_NAME=apple-bce -PACKAGE_VERSION=r183.c884d9c -CLEAN="make clean" -MAKE="make" -BUILT_MODULE_NAME[0]="apple-bce" -DEST_MODULE_LOCATION[0]="/updates" -AUTOINSTALL="yes" -REMAKE_INITRD="yes" -EOF - -dkms install -m "${APPLE_BCE_DRIVER_MODULE_NAME}" -v "${APPLE_BCE_DRIVER_MODULE_VERSION}" -k "${KERNEL_VERSION}" printf '\n### apple-bce start ###\nhid-apple\nbcm5974\nsnd-seq\napple-bce\n### apple-bce end ###' >>/etc/modules-load.d/apple-bce.conf printf '\n### apple-bce start ###\nhid-apple\nsnd-seq\napple-bce\n### apple-bce end ###' >>/etc/initramfs-tools/modules -git clone --single-branch --branch ${APPLE_IB_DRIVER_BRANCH_NAME} ${APPLE_IB_DRIVER_GIT_URL} \ - /usr/src/"${APPLE_IB_DRIVER_MODULE_NAME}-${APPLE_IB_DRIVER_MODULE_VERSION}" -git -C /usr/src/"${APPLE_IB_DRIVER_MODULE_NAME}-${APPLE_IB_DRIVER_MODULE_VERSION}" checkout "${APPLE_IB_DRIVER_COMMIT_HASH}" -dkms install -m "${APPLE_IB_DRIVER_MODULE_NAME}" -v "${APPLE_IB_DRIVER_MODULE_VERSION}" -k "${KERNEL_VERSION}" printf '\n### applespi start ###\napple_ibridge\napple_ib_tb\napple_ib_als\n### applespi end ###' >>/etc/modules-load.d/applespi.conf printf '\n# display f* key in touchbar\noptions apple-ib-tb fnmode=1\n' >> /etc/modprobe.d/apple-tb.conf From de315a1fb47d756be6a316464a127fbbad62e6ed Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Thu, 3 Feb 2022 18:46:56 +0530 Subject: [PATCH 050/141] iso with touchbar fixed --- .github/workflows/CI.yml | 2 +- build.sh | 4 ++-- files/chroot_build.sh | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 91a2255..825ee28 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -46,6 +46,6 @@ jobs: files: ${{ github.workspace }}/*.iso tag_name: v20.04-${{ steps.tag.outputs.tag }} draft: false - prerelease: true + prerelease: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.sh b/build.sh index 666f680..00e6a36 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=5.15.16 -PKGREL=1 +KERNEL_VERSION=5.16.5 +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 diff --git a/files/chroot_build.sh b/files/chroot_build.sh index d95f4c9..3de8779 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -117,6 +117,26 @@ printf '\n### apple-bce start ###\nhid-apple\nsnd-seq\napple-bce\n### apple-bce printf '\n### applespi start ###\napple_ibridge\napple_ib_tb\napple_ib_als\n### applespi end ###' >>/etc/modules-load.d/applespi.conf 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... " From 1138b32fb8c27a7de2f67713bd684c4cf718a150 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 6 Feb 2022 10:57:08 +0530 Subject: [PATCH 051/141] Update chroot_build.sh --- files/chroot_build.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 3de8779..92e9ce6 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -112,12 +112,10 @@ echo >&2 "===]> Info: Configure drivers... " # thunderbolt is working for me. #printf '\nblacklist thunderbolt' >>/etc/modprobe.d/blacklist.conf -printf '\n### apple-bce start ###\nhid-apple\nbcm5974\nsnd-seq\napple-bce\n### apple-bce end ###' >>/etc/modules-load.d/apple-bce.conf +printf 'apple-bce' >>/etc/modules-load.d/t2.conf printf '\n### apple-bce start ###\nhid-apple\nsnd-seq\napple-bce\n### apple-bce end ###' >>/etc/initramfs-tools/modules - -printf '\n### applespi start ###\napple_ibridge\napple_ib_tb\napple_ib_als\n### applespi end ###' >>/etc/modules-load.d/applespi.conf 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 +#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 From a2d05f7cd1239b895c0a2075efbf977770853743 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 6 Feb 2022 12:16:28 +0530 Subject: [PATCH 052/141] 5.16.7 --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 00e6a36..e86c21f 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=5.16.5 -PKGREL=2 +KERNEL_VERSION=5.16.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 318cd6614c2745928da50446d7e1603bd4aeaa66 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 7 Feb 2022 22:44:40 +0530 Subject: [PATCH 053/141] Install grub2 as well --- 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 92e9ce6..9edb274 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -64,7 +64,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" linux-headers-generic \ grub-efi-amd64-signed \ intel-microcode \ - thermald + thermald \ + grub2 # This is not ideal, but it should work until the apt repo gets updated. From bc29ed30313e7d0ae9e6bacbe7aa504ccc49df5d Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 9 Feb 2022 13:25:34 +0530 Subject: [PATCH 054/141] 5.16.8 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index e86c21f..5d8f72e 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=5.16.7 +KERNEL_VERSION=5.16.8 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 faad788d381778894e55504acdac1f92becd6148 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 9 Feb 2022 14:02:40 +0530 Subject: [PATCH 055/141] Add experimental NVRAM writes --- files/grub/grub.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index e0c63cb..2ff5ef8 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -10,6 +10,10 @@ menuentry "Try Ubuntu FS without installing" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- initrd /casper/initrd } +menuentry "Try Ubuntu FS without installing (Experimental NVRAM writes)" { + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- + initrd /casper/initrd +} menuentry "Try Ubuntu FS without installing (Safe Graphics)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- initrd /casper/initrd @@ -22,6 +26,10 @@ menuentry "Install Ubuntu FS" { 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 --- initrd /casper/initrd } +menuentry "Install Ubuntu FS (Experimental NVRAM writes)" { + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- + initrd /casper/initrd +} menuentry "Install Ubuntu FS (Safe Graphics)" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- initrd /casper/initrd From 41bce09d4f9efd4a08fb163e021b6f3f1cb82afb Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 11 Feb 2022 09:15:57 +0530 Subject: [PATCH 056/141] Add refind link --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 825ee28..6d64ff7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -45,6 +45,7 @@ jobs: with: files: ${{ github.workspace }}/*.iso tag_name: v20.04-${{ steps.tag.outputs.tag }} + body: If you are facing blank screen after installation, try [booting using refind](https://wiki.t2linux.org/guides/refind/). draft: false prerelease: false env: From 85f6f3f52d69f3bde5d7ec7e75b8e59dc309be68 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Fri, 11 Feb 2022 18:58:00 +0530 Subject: [PATCH 057/141] 5.16.9 --- build.sh | 2 +- files/chroot_build.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 5d8f72e..f13c024 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=5.16.8 +KERNEL_VERSION=5.16.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/files/chroot_build.sh b/files/chroot_build.sh index 9edb274..f68d994 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::=" # 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/vKVER-PREL/linux-headers-KVER-t2_KVER-PREL_amd64.deb > /tmp/headers.deb -curl -L https://github.com/AdityaGarg8/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-t2_KVER-PREL_amd64.deb > /tmp/image.deb +curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-t2_KVER-PREL_amd64.deb > /tmp/headers.deb +curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-t2_KVER-PREL_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 @@ -103,7 +103,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" dkms \ iwd -#snap install snap-store +snap install snap-store echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" From 718d66ed2d4e98d527c92cd7853a087924eb85ed Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 13 Feb 2022 14:29:18 +0530 Subject: [PATCH 058/141] Add nautilus-admin --- 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 f68d994..12b2470 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -65,7 +65,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" grub-efi-amd64-signed \ intel-microcode \ thermald \ - grub2 + grub2 \ + nautilus-admin # This is not ideal, but it should work until the apt repo gets updated. From ce4bc18f77ddb4c1f5dc64b75ed26b2a31adbdb5 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 3 Apr 2022 21:49:48 +0530 Subject: [PATCH 059/141] 5.17.1 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f13c024..fdf4faa 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=5.16.9 +KERNEL_VERSION=5.17.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 90931ba8ed89e7b9e2d30a8aabf2794e5e266cf3 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 17 May 2022 16:23:02 +0530 Subject: [PATCH 060/141] 5.17.7 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index fdf4faa..c01f4d1 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=5.17.1 +KERNEL_VERSION=5.17.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 02a29d91f76ad22af3630b1deb02a1b25c355b60 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Fri, 20 May 2022 17:22:30 +0530 Subject: [PATCH 061/141] 22.04 --- .github/workflows/CI.yml | 8 ++++---- 01_build_file_system.sh | 2 +- 02_build_image.sh | 2 +- build.sh | 6 +++--- files/chroot_build.sh | 26 ++++++++++++-------------- files/grub/grub.cfg | 38 +++++++++----------------------------- 6 files changed, 30 insertions(+), 52 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6d64ff7..1e3ca6e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -40,13 +40,13 @@ jobs: EOF - name: Release - if: github.ref == 'refs/heads/OTP' + if: github.ref == 'refs/heads/jammy' uses: softprops/action-gh-release@v1 with: files: ${{ github.workspace }}/*.iso - tag_name: v20.04-${{ steps.tag.outputs.tag }} + tag_name: v22.04-${{ steps.tag.outputs.tag }} body: If you are facing blank screen after installation, try [booting using refind](https://wiki.t2linux.org/guides/refind/). draft: false - prerelease: false + prerelease: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/01_build_file_system.sh b/01_build_file_system.sh index e812ad2..265e0ae 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 \ - focal \ + jammy \ "${CHROOT_PATH}" \ http://archive.ubuntu.com/ubuntu/ diff --git a/02_build_image.sh b/02_build_image.sh index b843809..1f8a66a 100755 --- a/02_build_image.sh +++ b/02_build_image.sh @@ -37,7 +37,7 @@ done echo >&2 "===]> Info: Create diskdefines... " cat <"${IMAGE_PATH}"/README.diskdefines -#define DISKNAME Ubuntu MBP 20.04 LTS "Focal Fossa" - Beta amd64 +#define DISKNAME Ubuntu MBP 22.04 LTS "Jammy Jellyfish" - Beta amd64 #define TYPE binary #define TYPEbinary 1 #define ARCH amd64 diff --git a/build.sh b/build.sh index c01f4d1..094db3d 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=5.17.7 +KERNEL_VERSION=5.17.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 @@ -40,7 +40,7 @@ for ALTERNATIVE in t2 do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " - echo >&2 "===]> Info: Build Ubuntu FS... " + echo >&2 "===]> Info: Build Ubuntu Jammy... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ @@ -50,7 +50,7 @@ do ${ROOT_PATH}/01_build_file_system.sh " - echo >&2 "===]> Info: Build Image FS... " + echo >&2 "===]> Info: Build Image Jammy... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 12b2470..1e892be 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-fs-live" >/etc/hostname +echo "ubuntu-jammy-live" >/etc/hostname echo >&2 "===]> Info: Configure and update apt... " cat </etc/apt/sources.list -deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse +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 EOF apt-get update @@ -103,8 +103,6 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" gcc \ dkms \ iwd - -snap install snap-store echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" @@ -161,13 +159,13 @@ apt-get purge -y -qq \ vim \ binutils \ linux-generic \ - linux-headers-5.4.0-28 \ - linux-headers-5.4.0-28-generic \ + linux-headers-5.15.0-30 \ + linux-headers-5.15.0-30-generic \ linux-headers-generic \ - linux-image-5.4.0-28-generic \ + linux-image-5.15.0-30-generic \ linux-image-generic \ - linux-modules-5.4.0-28-generic \ - linux-modules-extra-5.4.0-28-generic + linux-modules-5.15.0-30-generic \ + linux-modules-extra-5.15.0-30-generic apt-get autoremove -y diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 2ff5ef8..892790e 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -6,43 +6,23 @@ insmod all_video set default="0" set timeout=30 -menuentry "Try Ubuntu FS without installing" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- +menuentry "Try Ubuntu Jammy 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 FS without installing (Experimental NVRAM writes)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- +menuentry "Try Ubuntu Jammy 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 FS without installing (Safe Graphics)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- +menuentry "Install Ubuntu Jammy" { + 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 "Try Ubuntu FS without installing (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 --- modprobe.blacklist=thunderbolt - initrd /casper/initrd -} -menuentry "Install Ubuntu FS" { - 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 --- - initrd /casper/initrd -} -menuentry "Install Ubuntu FS (Experimental NVRAM writes)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- - initrd /casper/initrd -} -menuentry "Install Ubuntu FS (Safe Graphics)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- - initrd /casper/initrd -} -menuentry "Install Ubuntu FS (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 --- modprobe.blacklist=thunderbolt +menuentry "Install Ubuntu Jammy (Safe Graphics)" { + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity nomodeset pcie_ports=compat intel_iommu=on iommu=pt --- initrd /casper/initrd } menuentry "Check disc for defects" { - linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat acpi=force --- - initrd /casper/initrd -} -menuentry "Check disc for defects (blacklist=thunderbolt)" { - linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat --- modprobe.blacklist=thunderbolt + linux /casper/vmlinuz boot=casper integrity-check enforcing=0 efi=noruntime pcie_ports=compat --- initrd /casper/initrd } From b0ca7dbebc139e449b28cd5e20412ff0f6bf4aee Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 20 May 2022 17:27:03 +0530 Subject: [PATCH 062/141] Remove lupin-casper --- files/chroot_build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 1e892be..9f0b48b 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -48,7 +48,6 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" ubuntu-standard \ sudo \ casper \ - lupin-casper \ discover \ laptop-detect \ os-prober \ From 31b9f711bbaa20089dd8bb52bba348b587669b84 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 20 May 2022 17:54:41 +0530 Subject: [PATCH 063/141] Change version to 22.04 --- 04_create_iso.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/04_create_iso.sh b/04_create_iso.sh index e039b74..0abbe28 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-20.04-${KERNEL_VERSION}.iso" \ + -output "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}.iso" \ -graft-points \ "." \ /boot/grub/bios.img=isolinux/bios.img \ From 0fbee31397fe2b77ddd2415e948e9f784887895f Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 20 May 2022 18:12:04 +0530 Subject: [PATCH 064/141] Change zip version to 22.04 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 094db3d..f146b7a 100755 --- a/build.sh +++ b/build.sh @@ -82,7 +82,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-20.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" + zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" done ## Calculate sha256 sums of built ISO sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256" From 3c4739a18bf10124f71643454a4715d35892adaa Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 21 May 2022 12:07:31 +0530 Subject: [PATCH 065/141] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2753d60..c5b4d68 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The ISO in from this repo should allow you to install ubuntu without using an ex **If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/marcosfad/mbp-ubuntu#credits) or [me](https://paypal.me/marcosfad).** -UBUNTU 20.04 ISO with Apple T2 patches built-in. +UBUNTU ISO with Apple T2 patches built-in. Apple T2 drivers are integrated with this iso. From 66470bb94a048d627d8a976acca545562176d9d4 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 1 Jun 2022 22:27:46 +0530 Subject: [PATCH 066/141] 5.18.1 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f146b7a..ef7b9e0 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=5.17.9 +KERNEL_VERSION=5.18.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 0ef1c6567c830916791f7a5d3e4704b9633e587e Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 1 Jul 2022 18:20:39 +0530 Subject: [PATCH 067/141] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5b4d68..cd4e378 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The ISO in from this repo should allow you to install ubuntu without using an external keyboard or mouse on a MacBook Pro. It work in my MacBook with T2. -[![CI](https://github.com/marcosfad/mbp-ubuntu/actions/workflows/CI.yml/badge.svg)](https://github.com/marcosfad/mbp-ubuntu/actions/workflows/CI.yml) +[![CI](https://github.com/AdityaGarg8/mbp-ubuntu/actions/workflows/CI.yml/badge.svg)](https://github.com/marcosfad/mbp-ubuntu/actions/workflows/CI.yml) **If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/marcosfad/mbp-ubuntu#credits) or [me](https://paypal.me/marcosfad).** From 07a840add7e40cf4b678ebed8d5f7c10f6b73bbd Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 1 Jul 2022 18:21:17 +0530 Subject: [PATCH 068/141] 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 1e3ca6e..67a1ae5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,6 +47,6 @@ jobs: tag_name: v22.04-${{ steps.tag.outputs.tag }} body: If you are facing blank screen after installation, try [booting using refind](https://wiki.t2linux.org/guides/refind/). draft: false - prerelease: true + prerelease: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0cfbe8a5b229f588421648330f9b096c24fe9441 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 1 Jul 2022 18:21:48 +0530 Subject: [PATCH 069/141] 5.18.8 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index ef7b9e0..3f1dece 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=5.18.1 +KERNEL_VERSION=5.18.8 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 c2f78e6cae3fd207179a693bc2a439829cc2a9c7 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 19 Aug 2022 16:01:50 +0530 Subject: [PATCH 070/141] 5.19.2 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3f1dece..f9f039c 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=5.18.8 +KERNEL_VERSION=5.19.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 df8f63484a380c1d320ec6a7245286738fee70aa Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 19 Aug 2022 16:07:39 +0530 Subject: [PATCH 071/141] 5.19.2 - rebuild --- files/chroot_build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 9f0b48b..a7cb302 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -71,9 +71,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-t2_KVER-PREL_amd64.deb > /tmp/headers.deb curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-t2_KVER-PREL_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 +apt install /tmp/headers.deb /tmp/image.deb echo >&2 "===]> Info: Install window manager... " From 253d7bf39dfe8b8c9e27b5df76eef085cfeca12c Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 23 Aug 2022 18:11:29 +0530 Subject: [PATCH 072/141] 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 67a1ae5..4691f92 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -45,7 +45,7 @@ jobs: with: files: ${{ github.workspace }}/*.iso tag_name: v22.04-${{ steps.tag.outputs.tag }} - body: If you are facing blank screen after installation, try [booting using refind](https://wiki.t2linux.org/guides/refind/). + body_path: ${{ github.workspace }}/.github/workflows/instructions.txt draft: false prerelease: false env: From de286017549846c90ece23ccd6879e640b608e87 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 23 Aug 2022 18:13:13 +0530 Subject: [PATCH 073/141] Create instructions.txt --- .github/workflows/instructions.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/workflows/instructions.txt diff --git a/.github/workflows/instructions.txt b/.github/workflows/instructions.txt new file mode 100644 index 0000000..0ceb760 --- /dev/null +++ b/.github/workflows/instructions.txt @@ -0,0 +1,3 @@ +If you are facing blank screen after installation, try [booting using refind](https://wiki.t2linux.org/guides/refind/). + +Follow [this guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) for Wi-Fi and Bluetooth to work. From fa99d8d05393940ff9a416b3c20737f323816dcd Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 23 Aug 2022 18:13:31 +0530 Subject: [PATCH 074/141] 5.19.3 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f9f039c..858aa6e 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=5.19.2 +KERNEL_VERSION=5.19.3 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 0c838a64efaaf5d19bf48e8ae6e27607507eec51 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 24 Aug 2022 10:17:43 +0530 Subject: [PATCH 075/141] Update README.md --- README.md | 62 +++++++++++++++---------------------------------------- 1 file changed, 17 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index cd4e378..d59c846 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ -# mbp-ubuntu +# T2-Ubuntu -The ISO in from this repo should allow you to install ubuntu without using an external keyboard or mouse on a MacBook Pro. It work in my MacBook with T2. +The ISOs from this repo should allow you to install Ubuntu without using an external keyboard or mouse on a T2 Mac. It works in my MacBook Pro 16 inch, 2019. [![CI](https://github.com/AdityaGarg8/mbp-ubuntu/actions/workflows/CI.yml/badge.svg)](https://github.com/marcosfad/mbp-ubuntu/actions/workflows/CI.yml) -**If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/marcosfad/mbp-ubuntu#credits) or [me](https://paypal.me/marcosfad).** +**If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/marcosfad/mbp-ubuntu#credits), [link](https://wiki.t2linux.org/contribute/). UBUNTU ISO with Apple T2 patches built-in. Apple T2 drivers are integrated with this iso. -This repo is a rework of the great work done by [@mikeeq](https://github.com/mikeeq/mbp-fedora) +This repo is a rework of the great work done by [@mikeeq](https://github.com/mikeeq/mbp-fedora) and [@marcosfad](https://github.com/marcosfad/mbp-ubuntu) -I'm using the Kernel from - +I'm using the Kernel from - Using additional drivers: - [Apple T2 (apple-bce) (audio, keyboard, touchpad)](https://github.com/t2linux/apple-bce-drv) @@ -20,16 +20,10 @@ Using additional drivers: Bootloader is configure correctly out of the box. No workaround needed. -## Before I begin, what version should I use? "mbp" or "mbp-16x-wifi"? - -The difference between the two is that the mbp-16x-wifi version includes a different version of the brcmfmac wifi driver, made by corellium for M1 macs. This version of the wifi driver works on some models that the brcmfmac driver included with the mbp version doesn't support. Refer to the table on [this page](https://wiki.t2linux.org/guides/wifi/) to figure out which versions will work (Look at the "Firmware Options" column, Mojave means you can use the "mbp" version, and Big Sur means you can use the "mbp-16x-wifi" version). - -**!! Please note that as of the v20.04-5.10.52 release, the mbp-16x-wifi iso does not support wifi on models with the BCM4377 chipset. For now, you can install a kernel from [here](https://github.com/AdityaGarg8/mbp-16.x-ubuntu-kernel/releases/tag/v5.13.12-1) after installing ubuntu if you have the BCM4377 chipset.** - ## Installation 1. Reduce the size of the mac partition in MacOS -2. Download ISO file from releases. (Use the command line to unzip (`unzip /path/to/file.zip`) or "The Unarchiver" app) +2. Download ISO file from releases. 3. Copy it to a USB using dd (or gdd if installed over brew): ```bash diskutil list # found which number has the USB @@ -42,12 +36,11 @@ sudo gdd bs=4M if=ubuntu-20.04-5.6.10-mbp.iso of=/dev/diskX conv=fdatasync statu 7. Launch Ubuntu Live 8. Use Ubiquity to install (just click on it) 9. Select the options that work for you and use for the partition the following setup: - * Leave the efi boot as preselected by the installer. Your Mac will keep on working with out problems. - * Add a ext4 partition and mounted as `/boot` (1024MB). - * Add a ext4 partition and monted as `/` (rest). - * Select the `/boot` partition as a target for GRUB installation, otherwise the system won't boot. -10. Run the installer (In my case it had some problem removing some packages at the end, but this is no real problem) -11. Shutdown and remove the USB Drive + * Leave the efi boot as preselected by the installer, unless you require a [separate efi partition](https://wiki.t2linux.org/guides/windows/#using-seperate-efi-partitions). + * Add a ext4 partition and monted as `/`. + * Swap and other partitions are optional. +10. Run the installer. +11. Shutdown and remove the USB Drive. 12. Start again using the option key. Select the new efi boot. 13. Enjoy. @@ -62,8 +55,6 @@ sudo gdd bs=4M if=ubuntu-20.04-5.6.10-mbp.iso of=/dev/diskX conv=fdatasync statu options hid_apple swap_fn_leftctrl=1 options hid_apple swap_opt_cmd=1 ``` -- I switch the touchbar to show f* by default. If you like another configuration, change /etc/modprobe.d/apple-tb.conf or remove it. -- To update grub, run: `grub-mkconfig -o /boot/grub/grub.cfg` ## MISC @@ -79,46 +70,26 @@ and then: ## Update to newer kernels -**IF YOU UPDATE THE KERNEL, REMEMBER TO ADD THE REQUIRED DRIVERS AGAIN.** - -### The easy way: - -The live cd includes dkms and will automatically run when a new kernel is installed. You can use `dkms status` to see it. - -If you are upgrading from 5.7.19 to a newer kernel version (5.10+), you will need updated versions of these kernel modules. Instructions for installing updated ones are [here](https://wiki.t2linux.org/guides/dkms/). - -### Another way: - -Check to see how it is done. +Follow [this guide](https://github.com/t2linux/T2-Ubuntu-Kernel#pre-installation-steps). ## Know issues -- Sound is not working after the install. Follow the instructions detailed by @kevineinarsson: -On MBP 16,1, you might also need to disable realtime scheduling if the above gist doesn't work, because the pulseaudio server might get killed if the realtime budget is exceeded (). Just add `realtime-scheduling = no` to `/etc/pulse/daemon.conf`. -- Checksum is failing for 2 files: md5sum.txt and /boot/grub/bios.img -- I'm having troubles shutting down ubuntu. Screen is black but fan keeps on working. I have to force shutdown. +- Checksum is failing for 2 files: md5sum.txt and /boot/grub/bios.img ## Not working (Following the mikeeq/mbp-fedora) - Dynamic audio input/output change (on connecting/disconnecting headphones jack) -- TouchID - (@MCMrARM is working on it - https://github.com/Dunedan/mbp-2016-linux/issues/71#issuecomment-528545490) +- TouchID - Thunderbolt (is disabled, because driver was causing kernel panics (not tested with 5.5 kernel)) - Microphone (it's recognised with new apple t2 sound driver, but there is a low mic volume amp) -## TODO +## Known issues -- ISO is using gzip initramfs. It would be great to change it lz4 -- Optimize the software installed. - -## Known issues (Following the mikeeq/mbp-fedora) - -- Kernel/Mac related issues are mentioned in kernel repo -- `ctrl+x` is not working in GRUB, so if you are trying to change kernel parameters - start your OS by clicking `ctrl+shift+f10` on external keyboard +- `ctrl+x` is not working in GRUB, so if you are trying to change kernel parameters - start your OS by pressing `F10` on external keyboard ## Docs - Discord: Shout out to the great community support. If you are not there yet, you must definitely join us. -- WiFi firmware: - Linux on a MBP Late 2016: - Repack Bootable ISO: - @@ -148,6 +119,7 @@ On MBP 16,1, you might also need to disable realtime scheduling if the above gis ## Credits - @mikeeq - thanks for the amazing work in mbp-fedora +- @marcosfad - thanks for the original work in mbp-ubuntu - @MCMrARM - thanks for all RE work - @ozbenh - thanks for submitting NVME patch - @roadrunner2 - thanks for SPI (touchbar) driver From 8a9919a9f9515d20b876e6d1373495e6310fb566 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 24 Aug 2022 10:19:09 +0530 Subject: [PATCH 076/141] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d59c846..1b5a3f7 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ The ISOs from this repo should allow you to install Ubuntu without using an exte [![CI](https://github.com/AdityaGarg8/mbp-ubuntu/actions/workflows/CI.yml/badge.svg)](https://github.com/marcosfad/mbp-ubuntu/actions/workflows/CI.yml) -**If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/marcosfad/mbp-ubuntu#credits), [link](https://wiki.t2linux.org/contribute/). +**If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/AdityaGarg8/T2-Ubuntu#credits), [link](https://wiki.t2linux.org/contribute/). UBUNTU ISO with Apple T2 patches built-in. From b33dea36180cc9ed359e24ef3f00dc419a742128 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 28 Aug 2022 21:07:23 +0530 Subject: [PATCH 077/141] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b5a3f7..e630c3a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ The ISOs from this repo should allow you to install Ubuntu without using an exte [![CI](https://github.com/AdityaGarg8/mbp-ubuntu/actions/workflows/CI.yml/badge.svg)](https://github.com/marcosfad/mbp-ubuntu/actions/workflows/CI.yml) -**If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/AdityaGarg8/T2-Ubuntu#credits), [link](https://wiki.t2linux.org/contribute/). +**If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/AdityaGarg8/T2-Ubuntu#credits), [link](https://wiki.t2linux.org/contribute/).** UBUNTU ISO with Apple T2 patches built-in. From 4f07fc92c4d42c1e4f1dae59c63903b42a0acf74 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 28 Aug 2022 21:07:57 +0530 Subject: [PATCH 078/141] 5.19.4 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 858aa6e..fae5495 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=5.19.3 +KERNEL_VERSION=5.19.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 From 58509766b5d9cbfca79d1a6bcdfec30036addefe Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 22 Sep 2022 19:50:18 +0530 Subject: [PATCH 079/141] 5.19.10 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index fae5495..010bb8b 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=5.19.4 +KERNEL_VERSION=5.19.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 a1897e0f62d642238593ba5233b309489ddb7e9e Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 29 Sep 2022 18:55:08 +0530 Subject: [PATCH 080/141] Use update apt repo + add sound files --- files/chroot_build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index a7cb302..bf39e61 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -30,8 +30,8 @@ echo >&2 "===]> Info: Install systemd and Ubuntu MBP Repo... " apt-get install -y systemd-sysv gnupg curl wget mkdir -p /etc/apt/sources.list.d -echo "deb https://mbp-ubuntu-kernel.herokuapp.com/ /" >/etc/apt/sources.list.d/mbp-ubuntu-kernel.list -curl -L https://mbp-ubuntu-kernel.herokuapp.com/KEY.gpg | apt-key add - +curl -s --compressed "https://adityagarg8.github.io/t2-ubuntu-repo/KEY.gpg" | gpg --dearmor | tee /etc/apt/trusted.gpg.d/t2-ubuntu-repo.gpg >/dev/null +curl -s --compressed -o /etc/apt/sources.list.d/t2.list "https://adityagarg8.github.io/t2-ubuntu-repo/t2.list" apt-get update echo >&2 "===]> Info: Configure machine-id and divert... " @@ -91,7 +91,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" ubiquity-slideshow-ubuntu \ ubiquity-ubuntu-artwork -echo >&2 "===]> Info: Install useful applications... " +echo >&2 "===]> Info: Install useful applications and sound configuration... " apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ git \ @@ -100,7 +100,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" make \ gcc \ dkms \ - iwd + iwd \ + apple-t2-audio-config echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" From d7d9cc10a5a568667fc1f6634f04eaaba95e8987 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 29 Sep 2022 18:55:51 +0530 Subject: [PATCH 081/141] 5.19.12 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 010bb8b..f72e459 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=5.19.10 +KERNEL_VERSION=5.19.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 84e732fe9d115d886a009d9e4d0f7e73690eaab1 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 1 Oct 2022 23:10:40 +0530 Subject: [PATCH 082/141] Update mbp.seed --- files/preseed/mbp.seed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/preseed/mbp.seed b/files/preseed/mbp.seed index 4c56c7b..a15c7db 100644 --- a/files/preseed/mbp.seed +++ b/files/preseed/mbp.seed @@ -8,4 +8,4 @@ # well keep them installed. #ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org -d-i debian-installer/add-kernel-opts string efi=noruntime pcie_ports=compat acpi=force +d-i debian-installer/add-kernel-opts string pcie_ports=compat intel_iommu=on iommu=pt From 7a8b8818106080347d85bc5bf210da9ec727ae20 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 1 Oct 2022 23:17:35 +0530 Subject: [PATCH 083/141] Update grub.cfg --- files/grub/grub.cfg | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 892790e..c31253d 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -6,22 +6,18 @@ insmod all_video set default="0" set timeout=30 -menuentry "Try Ubuntu Jammy without installing" { +menuentry "Try Ubuntu Jammy Jellyfish 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 without installing (Safe Graphics)" { +menuentry "Try Ubuntu Jammy Jellyfish 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" { +menuentry "Install Ubuntu Jammy Jellyfish" { 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 Jammy (Safe Graphics)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity nomodeset pcie_ports=compat intel_iommu=on iommu=pt --- - 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 c4cf038fad46f215975a4c327f5c2e879a8c8a44 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 2 Oct 2022 01:09:54 +0530 Subject: [PATCH 084/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f72e459..ad7621b 100755 --- a/build.sh +++ b/build.sh @@ -82,7 +82,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.04-${KERNEL_VERSION}-${ALTERNATIVE}-silent-boot.iso" done ## Calculate sha256 sums of built ISO sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256" From 9c1243621a7e59c7e1731db067fc787a4004dbc4 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 2 Oct 2022 01:10:43 +0530 Subject: [PATCH 085/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index ad7621b..f72e459 100755 --- a/build.sh +++ b/build.sh @@ -82,7 +82,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}-silent-boot.iso" + zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" done ## Calculate sha256 sums of built ISO sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256" From 48ab9715ee448c45d251fe5adafe60a10cd4a65b Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 2 Oct 2022 15:44:09 +0530 Subject: [PATCH 086/141] 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 0ceb760..39673b1 100644 --- a/.github/workflows/instructions.txt +++ b/.github/workflows/instructions.txt @@ -1,3 +1,5 @@ If you are facing blank screen after installation, try [booting using refind](https://wiki.t2linux.org/guides/refind/). Follow [this guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) for Wi-Fi and Bluetooth to work. + +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. From ef07a37e43a4ea81e4f37a781188099cf01d14b5 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 2 Oct 2022 15:45:08 +0530 Subject: [PATCH 087/141] 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 39673b1..b25c04d 100644 --- a/.github/workflows/instructions.txt +++ b/.github/workflows/instructions.txt @@ -2,4 +2,4 @@ If you are facing blank screen after installation, try [booting using refind](ht Follow [this guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) for Wi-Fi and Bluetooth to work. -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. +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. From 961289b77fdce5afcbdce3e3990e3f7c1a998ba9 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 5 Oct 2022 12:06:02 +0530 Subject: [PATCH 088/141] 5.19.13 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f72e459..055959d 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=5.19.12 +KERNEL_VERSION=5.19.13 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 aefa0fabd968da4dbd1683b6f84b072568850883 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 17 Oct 2022 22:03:21 +0530 Subject: [PATCH 089/141] 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 bf39e61..704c314 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::=" # This is not ideal, but it should work until the apt repo gets updated. -curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-t2_KVER-PREL_amd64.deb > /tmp/headers.deb -curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-t2_KVER-PREL_amd64.deb > /tmp/image.deb +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 file /tmp/* apt install /tmp/headers.deb /tmp/image.deb From 6775a578166686099f75a44bd2722b86373d0bf7 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 17 Oct 2022 22:03:43 +0530 Subject: [PATCH 090/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 055959d..e9e7e45 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=5.19.13 +KERNEL_VERSION=6.0.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 4f1d5ac8519d16bd604adf96f118d3be3a20010e Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 17 Oct 2022 22:10:55 +0530 Subject: [PATCH 091/141] Update build.sh --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index e9e7e45..3622ce5 100755 --- a/build.sh +++ b/build.sh @@ -47,6 +47,7 @@ do CHROOT_PATH=${CHROOT_PATH}_${ALTERNATIVE} \\ IMAGE_PATH=${IMAGE_PATH} \\ KERNEL_VERSION=${KERNEL_VERSION}-${ALTERNATIVE} \\ + ALTERNATIVE=${ALTERNATIVE} \\ ${ROOT_PATH}/01_build_file_system.sh " @@ -57,6 +58,7 @@ do CHROOT_PATH=${CHROOT_PATH}_${ALTERNATIVE} \\ IMAGE_PATH=${IMAGE_PATH} \\ KERNEL_VERSION=${KERNEL_VERSION}-${ALTERNATIVE} \\ + ALTERNATIVE=${ALTERNATIVE} \\ ${ROOT_PATH}/02_build_image.sh " @@ -73,6 +75,7 @@ do IMAGE_PATH=${IMAGE_PATH} \\ CHROOT_PATH=${CHROOT_PATH}_${ALTERNATIVE} \\ KERNEL_VERSION=${KERNEL_VERSION}-${ALTERNATIVE} \\ + ALTERNATIVE=${ALTERNATIVE} \\ ${ROOT_PATH}/04_create_iso.sh " livecd_exitcode=$? From cf383cda7b17dab87f5d203ca09fd09529051291 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Tue, 18 Oct 2022 18:30:39 +0530 Subject: [PATCH 092/141] Add ISO variant for external SSD installation --- .github/workflows/.ymllint | 3 ++ .github/workflows/CI.yml | 58 ++++++++++++++++++++++++++++-- .github/workflows/instructions.txt | 2 ++ build.sh | 2 +- files/chroot_build.sh | 8 +++-- 5 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/.ymllint diff --git a/.github/workflows/.ymllint b/.github/workflows/.ymllint new file mode 100644 index 0000000..b96cefb --- /dev/null +++ b/.github/workflows/.ymllint @@ -0,0 +1,3 @@ +rules: + + line-length: disable diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4691f92..e109f76 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,13 +5,55 @@ on: [push] jobs: - build: + 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@v2 + - 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 "::set-output name=tag::${VERSION}-${REL}" + sudo apt install git + mkdir /tmp/artifacts + git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git + sed -i "s/LOCALVERSION=-t2/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 -r /root/work + sudo rm /tmp/artifacts/*dbg* + sudo rm /tmp/artifacts/*libc-dev* + - name: Release + if: github.ref == 'refs/heads/jammy' + uses: softprops/action-gh-release@v1 + with: + files: | + /tmp/artifacts/*.deb + tag_name: v${{ steps.build.outputs.tag }}-kernel + draft: false + prerelease: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + ISO: + needs: [Kernel] + runs-on: ubuntu-22.04 + steps: - name: Build - run: sudo ./build.sh + run: | + cd ${{ github.workspace }} + sudo rm -r ${{ github.workspace }}/T2-Ubuntu-Kernel + sudo ./build.sh - name: print sha256sum run: cat output/sha256 @@ -20,8 +62,9 @@ jobs: id: tag run: | VER=$(egrep ^KERNEL_VERSION build.sh|cut -d= -f2) + REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2) echo Version is $VER - echo "::set-output name=tag::${VER}" + echo "::set-output name=tag::${VER}-${REL}" - name: Upload iso artifact uses: actions/upload-artifact@v2 @@ -50,3 +93,12 @@ jobs: prerelease: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Delete kernel from releases + if: github.ref == 'refs/heads/jammy' + uses: dev-drprasad/delete-tag-and-release@v0.2.0 + with: + delete_release: true + tag_name: v${{ steps.build.outputs.tag }}-kernel + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/instructions.txt b/.github/workflows/instructions.txt index b25c04d..09dfa5f 100644 --- a/.github/workflows/instructions.txt +++ b/.github/workflows/instructions.txt @@ -3,3 +3,5 @@ If you are facing blank screen after installation, try [booting using refind](ht Follow [this guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) for Wi-Fi and Bluetooth to work. 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 by running `update_t2_kernel` to a **t2** kernel which shall bring back external SSD support. diff --git a/build.sh b/build.sh index 3622ce5..f1ff7d0 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 +for ALTERNATIVE in t2 t2-external do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 704c314..1648a6a 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -67,10 +67,14 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" grub2 \ nautilus-admin -# This is not ideal, but it should work until the apt repo gets updated. - +if [[ ${ALTERNATIVE} = t2-external ]] +then +curl -L https://github.com/t2linux/T2-Ubuntu/releases/download/vKVER-PREL-kernel/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb +curl -L https://github.com/t2linux/T2-Ubuntu/releases/download/vKVER-PREL-kernel/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 80c5e2e932ea1c0cdb332dd82afecca0818af464 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 18 Oct 2022 18:43:09 +0530 Subject: [PATCH 093/141] Update CI.yml --- .github/workflows/CI.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e109f76..00a0107 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,7 +30,6 @@ jobs: wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch cd ${{ github.workspace }}/T2-Ubuntu-Kernel sudo ./build.sh - sudo rm -r /root/work sudo rm /tmp/artifacts/*dbg* sudo rm /tmp/artifacts/*libc-dev* - name: Release From db4df243144b980ad7c24115fb4437a152dc5360 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 18 Oct 2022 22:04:10 +0530 Subject: [PATCH 094/141] Update CI.yml --- .github/workflows/CI.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 00a0107..67c1143 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,7 +21,7 @@ jobs: run: | VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2) REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2) - echo "::set-output name=tag::${VERSION}-${REL}" + echo "kerneltag=${VERSION}-${REL}" >> $GITHUB_ENV sudo apt install git mkdir /tmp/artifacts git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git @@ -38,7 +38,7 @@ jobs: with: files: | /tmp/artifacts/*.deb - tag_name: v${{ steps.build.outputs.tag }}-kernel + tag_name: v${{ env.kerneltag }}-kernel draft: false prerelease: true env: @@ -49,10 +49,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Build - run: | - cd ${{ github.workspace }} - sudo rm -r ${{ github.workspace }}/T2-Ubuntu-Kernel - sudo ./build.sh + run: sudo ./build.sh - name: print sha256sum run: cat output/sha256 @@ -63,7 +60,7 @@ jobs: VER=$(egrep ^KERNEL_VERSION build.sh|cut -d= -f2) REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2) echo Version is $VER - echo "::set-output name=tag::${VER}-${REL}" + echo "isotag=${VER}-${REL}" >> $GITHUB_ENV - name: Upload iso artifact uses: actions/upload-artifact@v2 @@ -77,7 +74,7 @@ jobs: Download all the artifacts, and put them in a folder without other files. Then run:" unzip "*.z??.zip" - cat livecd-${{ steps.tag.outputs.tag }}-t2.z?? > cd.zip + cat livecd-${{ env.isotag }}-t2.z?? > cd.zip echo unzip cd.zip EOF @@ -86,7 +83,7 @@ jobs: uses: softprops/action-gh-release@v1 with: files: ${{ github.workspace }}/*.iso - tag_name: v22.04-${{ steps.tag.outputs.tag }} + tag_name: v22.04-${{ env.isotag }} body_path: ${{ github.workspace }}/.github/workflows/instructions.txt draft: false prerelease: false @@ -98,6 +95,6 @@ jobs: uses: dev-drprasad/delete-tag-and-release@v0.2.0 with: delete_release: true - tag_name: v${{ steps.build.outputs.tag }}-kernel + tag_name: v${{ env.isotag }}-kernel env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From a4bb80f72f54a18d6d0c6df2faf172fcab53622c Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 19 Oct 2022 01:11:29 +0530 Subject: [PATCH 095/141] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e630c3a..3e3ca41 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The ISOs from this repo should allow you to install Ubuntu without using an external keyboard or mouse on a T2 Mac. It works in my MacBook Pro 16 inch, 2019. -[![CI](https://github.com/AdityaGarg8/mbp-ubuntu/actions/workflows/CI.yml/badge.svg)](https://github.com/marcosfad/mbp-ubuntu/actions/workflows/CI.yml) +![CI](https://github.com/AdityaGarg8/T2-Ubuntu/actions/workflows/CI.yml/badge.svg?branch=jammy) **If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/AdityaGarg8/T2-Ubuntu#credits), [link](https://wiki.t2linux.org/contribute/).** From 8c4ad055c79124de63839543da00e170bfeb6162 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 19 Oct 2022 02:06:22 +0530 Subject: [PATCH 096/141] Update CI.yml --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 67c1143..6f77ee3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,6 +48,8 @@ jobs: needs: [Kernel] runs-on: ubuntu-22.04 steps: + - uses: actions/checkout@v2 + - name: Build run: sudo ./build.sh From 1007bbfd77ddbd914ce1b3464c83008e92d4417f Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 19 Oct 2022 08:10:43 +0530 Subject: [PATCH 097/141] 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 1648a6a..35f457a 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/t2linux/T2-Ubuntu/releases/download/vKVER-PREL-kernel/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb -curl -L https://github.com/t2linux/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/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 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 09b07e8fdaa2977bad5507e6e63c12a927e3e4e0 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 19 Oct 2022 17:29:47 +0530 Subject: [PATCH 098/141] 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 09dfa5f..b0016fd 100644 --- a/.github/workflows/instructions.txt +++ b/.github/workflows/instructions.txt @@ -4,4 +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 in an external SSD. After installation, you can update your kernel by running `update_t2_kernel` to a **t2** kernel which shall bring back external SSD support. +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 by running `update_t2_kernel` to a **t2** kernel which shall bring back internal SSD support. From 75c2f9b79cc0334fa1da4f9c35153ed4c3f46879 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 20 Oct 2022 20:04:33 +0530 Subject: [PATCH 099/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f1ff7d0..082a6cd 100755 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ WORKING_PATH=/root/work CHROOT_PATH="${WORKING_PATH}/chroot" IMAGE_PATH="${WORKING_PATH}/image" KERNEL_VERSION=6.0.2 -PKGREL=1 +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 72004bd6d2e9fec0e59ecd03472b0ba230084072 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 21 Oct 2022 00:53:56 +0530 Subject: [PATCH 100/141] Add t2-kernel-script --- 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 35f457a..8f3079c 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -105,7 +105,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" gcc \ dkms \ iwd \ - apple-t2-audio-config + apple-t2-audio-config \ + t2-kernel-script echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" From 4b7eac2f8f5d82b9bb1f5fa151e5231b4815b7e7 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 21 Oct 2022 22:16:47 +0530 Subject: [PATCH 101/141] Update CI.yml --- .github/workflows/CI.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6f77ee3..eff9072 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,7 +15,7 @@ jobs: remove-dotnet: 'true' remove-haskell: 'false' - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build kernel with internal SSD removed run: | @@ -32,6 +32,13 @@ jobs: sudo ./build.sh sudo rm /tmp/artifacts/*dbg* sudo rm /tmp/artifacts/*libc-dev* + + - name: Upload package artifact + uses: actions/upload-artifact@v2 + with: + name: kernel-${{ env.kerneltag }} + path: /tmp/artifacts/* + - name: Release if: github.ref == 'refs/heads/jammy' uses: softprops/action-gh-release@v1 @@ -48,7 +55,7 @@ jobs: needs: [Kernel] runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build run: sudo ./build.sh From b325817a5ee251d0a429337e8016fd430cbb832a Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 21 Oct 2022 22:42:37 +0530 Subject: [PATCH 102/141] Update CI.yml --- .github/workflows/CI.yml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index eff9072..b498b32 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,7 +50,40 @@ jobs: prerelease: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + + Safe-graphics: + needs: [Kernel] + runs-on: ubuntu-22.04 + steps: + - name: 'Checkout Jammy Repo' + uses: actions/checkout@v3 + + - name: Get version + run: | + VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2) + REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2) + echo "ver=${VERSION}" >> $GITHUB_ENV + echo "release=${REL}" >> $GITHUB_ENV + + - name: 'Checkout jammy-16,4 Repo' + uses: actions/checkout@v3 + with: + ref: jammy-16,4 + + - name: 'Push new version to jammy-16,4' + id: publish + run: | + sed -i "s/KERNEL_VERSION=.*/KERNEL_VERSION=${{ env.ver }}/g" build.sh + sed -i "s/PKGREL=.*/PKGREL=${{ env.release }}/g" build.sh + git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" + git commit -m "${{ env.ver }}-${{ env.release }}" -a + - name: Push changes to the repo + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: jammy-16,4 + ISO: needs: [Kernel] runs-on: ubuntu-22.04 From 914573e1914cdc2784a09cdaafb19742c7e848fa Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 21 Oct 2022 22:44:00 +0530 Subject: [PATCH 103/141] 6.0.3-1 --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 082a6cd..4865166 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.0.2 -PKGREL=2 +KERNEL_VERSION=6.0.3 +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 dca1a23cc06206e9589d4765f6475b313bcfdab5 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 22 Oct 2022 09:29:32 +0530 Subject: [PATCH 104/141] 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 b498b32..5d227d1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -73,7 +73,7 @@ jobs: - name: 'Push new version to jammy-16,4' id: publish run: | - sed -i "s/KERNEL_VERSION=.*/KERNEL_VERSION=${{ env.ver }}/g" build.sh + sed -i "s/KERNEL_VERSION=6.*/KERNEL_VERSION=${{ env.ver }}/g" build.sh sed -i "s/PKGREL=.*/PKGREL=${{ env.release }}/g" build.sh git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" From 9088972b3265490952acb9e0d06b8ef486f9886c Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 22 Oct 2022 09:38:05 +0530 Subject: [PATCH 105/141] Update CI.yml --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5d227d1..73b2390 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -69,6 +69,7 @@ jobs: uses: actions/checkout@v3 with: ref: jammy-16,4 + persist-credentials: false - name: 'Push new version to jammy-16,4' id: publish @@ -81,7 +82,7 @@ jobs: - name: Push changes to the repo uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.PAT }} branch: jammy-16,4 ISO: From b744bc5e165d13bffb87d8dc435fe7951d861c0c Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:42:00 +0530 Subject: [PATCH 106/141] Update build.sh --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 4865166..39e5931 100755 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ WORKING_PATH=/root/work CHROOT_PATH="${WORKING_PATH}/chroot" IMAGE_PATH="${WORKING_PATH}/image" KERNEL_VERSION=6.0.3 -PKGREL=1 +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 @@ -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 t2-external +for ALTERNATIVE in t2-jammy t2-external do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " From 2954d7a574a8a8d80cff9c2b92e37aabd17d99c8 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:43:25 +0530 Subject: [PATCH 107/141] 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 73b2390..e6cceca 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,7 +25,7 @@ jobs: sudo apt install git mkdir /tmp/artifacts git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git - sed -i "s/LOCALVERSION=-t2/LOCALVERSION=-t2-external/g" ${{ github.workspace }}/T2-Ubuntu-Kernel/build.sh + sed -i "s/LOCALVERSION=-t2.*/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 From 7e2125a972e10112fbebb402df204b132e5aabdc Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:51:05 +0530 Subject: [PATCH 108/141] 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 e6cceca..8829dfd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,7 +25,7 @@ jobs: sudo apt install git mkdir /tmp/artifacts git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git - sed -i "s/LOCALVERSION=-t2.*/LOCALVERSION=-t2-external/g" ${{ github.workspace }}/T2-Ubuntu-Kernel/build.sh + 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 From 2c6ffd1a2ecf2fe395527719d24e4e5eb0940b3e Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 29 Oct 2022 23:41:59 +0530 Subject: [PATCH 109/141] 6.0.6 --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 39e5931..b817e86 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.0.3 -PKGREL=2 +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 cc1e14ecce7f386292774ca4c919044adc4f67a4 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 30 Oct 2022 11:45:08 +0530 Subject: [PATCH 110/141] 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 b0016fd..979ee8b 100644 --- a/.github/workflows/instructions.txt +++ b/.github/workflows/instructions.txt @@ -4,4 +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 in an external SSD. After installation, you can update your kernel by running `update_t2_kernel` to a **t2** kernel 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 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. From e05e94964be151bd766fb2e094624d4bf7326b64 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 2 Nov 2022 20:30:37 +0530 Subject: [PATCH 111/141] Update chroot_build.sh --- files/chroot_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 8f3079c..45e01a0 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -117,7 +117,7 @@ echo >&2 "===]> Info: Configure drivers... " #printf '\nblacklist thunderbolt' >>/etc/modprobe.d/blacklist.conf printf 'apple-bce' >>/etc/modules-load.d/t2.conf -printf '\n### apple-bce start ###\nhid-apple\nsnd-seq\napple-bce\n### apple-bce end ###' >>/etc/initramfs-tools/modules +printf '\n### apple-bce start ###\nsnd\nsnd_pcm\napple-bce\n### apple-bce end ###' >>/etc/initramfs-tools/modules 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 From 8f1d39cf041ad8a5dbc5d457d2e682ec4ce73a27 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Sun, 6 Nov 2022 17:14:05 +0530 Subject: [PATCH 112/141] 6.0.7 --- build.sh | 2 +- files/chroot_build.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index b817e86..57f85f3 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 diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 45e01a0..2229392 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -105,8 +105,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" gcc \ dkms \ iwd \ - apple-t2-audio-config \ - t2-kernel-script + apple-t2-audio-config echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" From 308b6b2bf24f3a5f50855c5e220ae63f44725af9 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 7 Nov 2022 16:07:47 +0530 Subject: [PATCH 113/141] 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 8829dfd..30e1192 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,5 +1,5 @@ --- -name: CI +name: CI - Jammy # yamllint disable-line rule:truthy on: [push] From 1624a94fcf06a4f155b2fcf70d2c41168f4afaa3 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 7 Nov 2022 16:13:12 +0530 Subject: [PATCH 114/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 57f85f3..b817e86 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 29de41b594a8b073dc558f4ceefd4eaaf7bf8c28 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 7 Nov 2022 16:31:35 +0530 Subject: [PATCH 115/141] Update CI.yml --- .github/workflows/CI.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 30e1192..f445bd5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,6 +5,39 @@ on: [push] jobs: + Kinetic: + runs-on: ubuntu-22.04 + steps: + - name: 'Checkout Jammy Repo' + uses: actions/checkout@v3 + + - name: Get version + run: | + VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2) + REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2) + echo "ver=${VERSION}" >> $GITHUB_ENV + echo "release=${REL}" >> $GITHUB_ENV + + - name: 'Checkout kinetic Repo' + uses: actions/checkout@v3 + with: + ref: kinetic + persist-credentials: false + + - name: 'Push new version to kinetic' + id: publish + run: | + sed -i "s/KERNEL_VERSION=6.*/KERNEL_VERSION=${{ env.ver }}/g" build.sh + sed -i "s/PKGREL=.*/PKGREL=${{ env.release }}/g" build.sh + git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" + git commit -m "${{ env.ver }}-${{ env.release }}" -a + - name: Push changes to the repo + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.PAT }} + branch: kinetic + Kernel: runs-on: ubuntu-22.04 steps: From 7583bd4cc26e138806f9c8587f43640b064b3fdd Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 7 Nov 2022 16:32:51 +0530 Subject: [PATCH 116/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b817e86..57f85f3 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 bec59a6b1b98cecec90a74a4770e7826584996dc Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 7 Nov 2022 16:34:26 +0530 Subject: [PATCH 117/141] 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 f445bd5..05462f6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -159,7 +159,7 @@ jobs: 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 From d9c654e80f1d50f8c7173621ca6c6d684f8ad95c Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Tue, 8 Nov 2022 11:48:06 +0530 Subject: [PATCH 118/141] 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 05462f6..2c86729 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -159,7 +159,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 5fe31dc62b14ceb6a72d4011e2b2300326543738 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 16 Nov 2022 20:22:08 +0530 Subject: [PATCH 119/141] 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 998302e0d016aacca24615ec3f3a32aaf58b7810 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 16 Nov 2022 20:23:58 +0530 Subject: [PATCH 120/141] 6.0.9 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 57f85f3..42827cf 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 10566f05231bdd1c57de36e123f9227779f82877 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Thu, 17 Nov 2022 11:30:06 +0530 Subject: [PATCH 121/141] 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 2229392..6d4f118 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -120,26 +120,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 ed6415206d9c507a46e43a0d29699c617b46f488 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 25 Nov 2022 13:48:42 +0530 Subject: [PATCH 122/141] 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 7940627437aff05d9855bdab797208a4001d7d62 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 25 Nov 2022 13:52:02 +0530 Subject: [PATCH 123/141] 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 1d63085684fb085a7d0b90cd19845eeb9068bed9 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 27 Nov 2022 12:24:57 +0530 Subject: [PATCH 124/141] 6.0.10 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 42827cf..84bf215 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 73ca6799650d04f77869813c1511e3333a67d45f Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Tue, 20 Dec 2022 14:57:08 +0530 Subject: [PATCH 125/141] Remove t2 external --- .github/workflows/CI.yml | 55 ------------------------------ .github/workflows/instructions.txt | 2 -- build.sh | 2 +- files/chroot_build.sh | 6 ---- 4 files changed, 1 insertion(+), 64 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2c86729..711b8fd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,52 +38,6 @@ jobs: github_token: ${{ secrets.PAT }} branch: kinetic - 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 - 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* - - - name: Upload package artifact - uses: actions/upload-artifact@v2 - with: - name: kernel-${{ env.kerneltag }} - path: /tmp/artifacts/* - - - name: Release - if: github.ref == 'refs/heads/jammy' - uses: softprops/action-gh-release@v1 - with: - files: | - /tmp/artifacts/*.deb - tag_name: v${{ env.kerneltag }}-kernel - draft: false - prerelease: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - Safe-graphics: needs: [Kernel] runs-on: ubuntu-22.04 @@ -165,12 +119,3 @@ jobs: prerelease: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Delete kernel from releases - if: github.ref == 'refs/heads/jammy' - uses: dev-drprasad/delete-tag-and-release@v0.2.0 - with: - delete_release: true - tag_name: v${{ env.isotag }}-kernel - 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 84bf215..fc5d454 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-jammy do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 6d4f118..a2d2b84 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/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 -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 bd984cf00c0ce8952dad9547307ede55e367c9c4 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 20 Dec 2022 15:01:25 +0530 Subject: [PATCH 126/141] 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 711b8fd..a781681 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,5 +1,5 @@ --- -name: CI - Jammy +name: CI # yamllint disable-line rule:truthy on: [push] From ea0bef0a11089da8e0fe4ebdb31f1b1aba581ec1 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 20 Dec 2022 15:02:58 +0530 Subject: [PATCH 127/141] 6.0.12 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index fc5d454..3c6ab99 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 a7b01a0cc72d35948c60df2f88cbe6d1758d876e Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 20 Dec 2022 15:03:53 +0530 Subject: [PATCH 128/141] 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 a781681..43e45bd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,7 +39,6 @@ jobs: branch: kinetic Safe-graphics: - needs: [Kernel] runs-on: ubuntu-22.04 steps: - name: 'Checkout Jammy Repo' @@ -73,7 +72,6 @@ jobs: branch: jammy-16,4 ISO: - needs: [Kernel] runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 From a708380447a319d0bec58a7cf6a3d521ba20a527 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 20 Dec 2022 15:06:48 +0530 Subject: [PATCH 129/141] Push to trigger ci --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3c6ab99..0e8d8a5 100755 --- a/build.sh +++ b/build.sh @@ -83,7 +83,7 @@ do echo "Error building ${KERNEL_VERSION}-${ALTERNATIVE}" exit "${livecd_exitcode}" fi - ### Zip iso and split it into multiple parts - github max size of release attachment is 2GB, where ISO is sometimes bigger than that + ### 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" done From 9ffbf4b3501e5a07ccdb6a8ff2c0660bce725489 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 20 Dec 2022 15:12:51 +0530 Subject: [PATCH 130/141] 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 c31253d..e9c439e 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -14,10 +14,18 @@ menuentry "Try Ubuntu Jammy Jellyfish 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 Jammy Jellyfish 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 Jammy Jellyfish" { 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 Jammy Jellyfish (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 bed18455ccf42f9e5d2ade7dd9b3575cf84a00c9 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 30 Dec 2022 23:37:07 +0530 Subject: [PATCH 131/141] 6.1.1 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 0e8d8a5..2ab6ec2 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 6f11b785dfe2b40895cd2c9c360fa1f47f1f65cb Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 30 Dec 2022 23:37:53 +0530 Subject: [PATCH 132/141] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2ab6ec2..e973906 100755 --- a/build.sh +++ b/build.sh @@ -83,7 +83,7 @@ do echo "Error building ${KERNEL_VERSION}-${ALTERNATIVE}" exit "${livecd_exitcode}" fi - ### Zip iso and split it into multiple parts - GitHub max size of release attachment is 2GB, where ISO is sometimes bigger than that + ## 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" done From 7df2e0a1f09dcdb4ce1b8a3475814b6959c94900 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Mon, 2 Jan 2023 17:03:36 +0530 Subject: [PATCH 133/141] 6.1.2 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index e973906..138a02f 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 5fb181ce9c898e8bebe3dde30d37115ee28c753d Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Fri, 13 Jan 2023 04:10:53 +0530 Subject: [PATCH 134/141] 6.1.5 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 138a02f..fa548f2 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 f9008a3de794b0f9ec6ed51a52acfbb622457969 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 18 Jan 2023 15:35:50 +0530 Subject: [PATCH 135/141] 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 a2d2b84..0a2b33e 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 031da3682346c610c495e82eebe67d95329974a8 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 18 Jan 2023 15:37:25 +0530 Subject: [PATCH 136/141] 6.1.6-2 --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index fa548f2..ef0d95f 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 13166bc387124836dc912d6856a0cb3e42df8ed5 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Wed, 18 Jan 2023 15:38:18 +0530 Subject: [PATCH 137/141] Push to trigger ci --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index ef0d95f..2905f0b 100755 --- a/build.sh +++ b/build.sh @@ -83,7 +83,7 @@ do echo "Error building ${KERNEL_VERSION}-${ALTERNATIVE}" exit "${livecd_exitcode}" fi - ## Zip iso and split it into multiple parts - GitHub max size of release attachment is 2GB, where ISO is sometimes bigger than that + ## 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" done From 21f7dc756842006e3827498903de73147d291a39 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 28 Jan 2023 16:15:26 +0530 Subject: [PATCH 138/141] 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 265e0ae..fbd5800 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 7553eae5461a7122b631bb0aff3c7017aa8c5ef7 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 28 Jan 2023 16:17:41 +0530 Subject: [PATCH 139/141] 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 fb3c3f6df200f790ad901eadb59d1adfe068b9cd Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sat, 28 Jan 2023 19:32:32 +0530 Subject: [PATCH 140/141] 6.1.8-2 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2905f0b..675a5f6 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 2464b1f8adb35ee6a2ca0cd153997d0cbd0f524a Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Wed, 1 Feb 2023 21:24:21 +0530 Subject: [PATCH 141/141] 6.1.9-1 --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 675a5f6..a52c290 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