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... "