diff --git a/Dockerfile b/Dockerfile index d185cfa..6e4c31d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM fedora:39 ARG RPMBUILD_PATH=/root/rpmbuild -ARG FEDORA_KERNEL_VERSION=6.5.11-300.fc39 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f39 +ARG FEDORA_KERNEL_VERSION=6.5.4-300.fc39 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f39 RUN dnf install -y fedpkg fedora-packager rpmdevtools ncurses-devel pesign git libkcapi libkcapi-devel libkcapi-static libkcapi-tools zip curl dwarves libbpf rpm-sign \ && rpmdev-setuptree \ diff --git a/README.md b/README.md index e0d78e2..4866710 100644 --- a/README.md +++ b/README.md @@ -42,13 +42,13 @@ update_kernel_mbp ### Update to specific version of kernel sudo -i -KERNEL_VERSION="6.5.11-f39" update_kernel_mbp +KERNEL_VERSION="6.5.4-f39" update_kernel_mbp ### Update to specific version of kernel using specific version of update script #### Usually not needed, because scripts are shared between branches, but you can use it to update your update_kernel_mbp script ##### If the script fails, try to rerun it - it's due to self-upgrading feature of this script sudo -i -KERNEL_VERSION="6.5.11-f39" UPDATE_SCRIPT_BRANCH="v6.5-f39" update_kernel_mbp +KERNEL_VERSION="6.5.4-f39" UPDATE_SCRIPT_BRANCH="v6.5-f39" update_kernel_mbp ### If kernel update using dnf would file you can execute update_kernel_mbp script with `--github` argument, it will force it to use github to download kernel RPMs sudo -i diff --git a/build.sh b/build.sh index 581b285..1b8fcab 100755 --- a/build.sh +++ b/build.sh @@ -7,7 +7,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 MBP_VERSION=mbp -FEDORA_KERNEL_VERSION=6.5.11-300.fc39 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f39 +FEDORA_KERNEL_VERSION=6.5.4-300.fc39 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f39 REPO_PWD=$(pwd) ### Debug commands diff --git a/kernel_patches.sh b/kernel_patches.sh index f607409..2d93c7b 100755 --- a/kernel_patches.sh +++ b/kernel_patches.sh @@ -9,8 +9,8 @@ set -eu -o pipefail APPLE_SMC_DRIVER_GIT_URL=https://github.com/t2linux/linux-t2-patches APPLE_SMC_REPO_NAME=linux-t2-patches -APPLE_SMC_DRIVER_BRANCH_NAME=fix/2009_v6.5.11 -APPLE_SMC_DRIVER_COMMIT_HASH=07fc8e2ac766119ee6368d92b9e4237d46037598 +APPLE_SMC_DRIVER_BRANCH_NAME=main +APPLE_SMC_DRIVER_COMMIT_HASH=3e8b7ae9f37f1cee62b7a2712de9c049a1863c89 TMP_DIR=/tmp/tmp_dir REPO_PWD=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) diff --git a/yum-repo/Dockerfile b/yum-repo/Dockerfile index 89104d4..1d4782e 100644 --- a/yum-repo/Dockerfile +++ b/yum-repo/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:39 -ARG RELEASE_VERSION=6.5.11-f39 +ARG RELEASE_VERSION=6.5.4-f39 WORKDIR /var/repo diff --git a/yum-repo/specs/mbp-fedora-t2-config.spec b/yum-repo/specs/mbp-fedora-t2-config.spec index 262c6f3..dce6c91 100644 --- a/yum-repo/specs/mbp-fedora-t2-config.spec +++ b/yum-repo/specs/mbp-fedora-t2-config.spec @@ -1,5 +1,5 @@ Name: mbp-fedora-t2-config -Version: 6.5.11 +Version: 6.5.4 Release: 1%{?dist} Summary: System configuration for mbp-fedora on Apple T2 Macs.