check 5.12.11 build with patch command F2

mikeeq · Jun 21, 2021 · 4bf18d8 · 4bf18d8
1 parent 5843b43
commit 4bf18d8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -4,7 +4,7 @@ set -eu -o pipefail
 
 ## Update fedora docker image tag, because kernel build is using `uname -r` when defining package version variable
 RPMBUILD_PATH=/root/rpmbuild
-FEDORA_KERNEL_VERSION=5.11.21-300.fc34      # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=F34
+FEDORA_KERNEL_VERSION=5.12.11-300.fc34      # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=F34
 REPO_PWD=$(pwd)
 
 ### Debug commands

diff --git a/patch_driver.sh b/patch_driver.sh
@@ -7,7 +7,7 @@ set -eu -o pipefail
 ### Apple T2 drivers commit hashes
 APPLE_SMC_DRIVER_GIT_URL=https://github.com/aunali1/linux-mbp-arch
 APPLE_SMC_DRIVER_BRANCH_NAME=master
-APPLE_SMC_DRIVER_COMMIT_HASH=763c20a12ce19a9dc2d3421c65c9a0e328728e38
+APPLE_SMC_DRIVER_COMMIT_HASH=199a1512d80e228587852d5789e083cec281f223
 APPLE_WIFI_BIGSUR_PATCH_GIT_COMMIT_HASH=dd219cf1626bf61a91ce61377a27052562ba930e        # https://github.com/jamlam/mbp-16.1-linux-wifi
 APPLE_WIFI_BIGSUR_PATCH_GIT_URL=https://raw.githubusercontent.com/jamlam/mbp-16.1-linux-wifi/${APPLE_WIFI_BIGSUR_PATCH_GIT_COMMIT_HASH}/wifi-bigsur.patch
 # TMP_DIR=~/temp_dir

diff --git a/patch_kernel.sh b/patch_kernel.sh
@@ -43,6 +43,7 @@ NPATCH_ID=$(($LPATCH_ID + 1 ))
 # Add patch with new id at the end of the list of patches
 sed -i "/^Patch$LPATCH_ID:\ /a#\ $DESC\nPatch$NPATCH_ID:\ $PATCH" $SPECFILE
 sed -i "/^ApplyOptionalPatch[[:space:]]p/i ApplyOptionalPatch\ $PATCH" $SPECFILE
+sed -i "s/patch_command='patch -p1 -F1 -s'/patch_command='patch -p1 -F2 -s'/g" $SPECFILE
 
 # Add it to git
 # git add $PATCH