diff --git a/Dockerfile b/Dockerfile index 906d0ad..f035f4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM fedora:38 ARG RPMBUILD_PATH=/root/rpmbuild -ARG FEDORA_KERNEL_VERSION=6.2.13-300.fc38 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f38 +ARG FEDORA_KERNEL_VERSION=6.3.3-200.fc38 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f38 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 0919ab8..09d9c87 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.2.13-f38" update_kernel_mbp +KERNEL_VERSION="6.3.3-f38" 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.2.13-f38" UPDATE_SCRIPT_BRANCH="v6.2-f38" update_kernel_mbp +KERNEL_VERSION="6.3.3-f38" UPDATE_SCRIPT_BRANCH="v6.3-f38" 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 633695a..7fd9a4f 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.2.13-300.fc38 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f38 +FEDORA_KERNEL_VERSION=6.3.3-200.fc38 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f38 REPO_PWD=$(pwd) ### Debug commands diff --git a/kernel_patches.sh b/kernel_patches.sh index 6314df5..46060c4 100755 --- a/kernel_patches.sh +++ b/kernel_patches.sh @@ -10,7 +10,7 @@ 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=main -APPLE_SMC_DRIVER_COMMIT_HASH=3a43f2fa1c4afec28f1bffe2aa13e3f4366ecce1 +APPLE_SMC_DRIVER_COMMIT_HASH=d0e70c9396db0c97b47155a649838bb7ba82a690 TMP_DIR=/tmp/tmp_dir REPO_PWD=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) diff --git a/update_kernel_mbp.sh b/update_kernel_mbp.sh index 49b6a85..4ab4865 100755 --- a/update_kernel_mbp.sh +++ b/update_kernel_mbp.sh @@ -4,7 +4,7 @@ set -eu -o pipefail KERNEL_PATCH_PATH=/tmp/kernel_patch -UPDATE_SCRIPT_BRANCH=${UPDATE_SCRIPT_BRANCH:-v6.2-f38} +UPDATE_SCRIPT_BRANCH=${UPDATE_SCRIPT_BRANCH:-v6.3-f38} MBP_FEDORA_BRANCH=f38 if [ "$EUID" -ne 0 ]; then diff --git a/yum-repo/Dockerfile b/yum-repo/Dockerfile index 5c8f17c..1b555ff 100644 --- a/yum-repo/Dockerfile +++ b/yum-repo/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:38 -ARG RELEASE_VERSION=6.2.13-f38 +ARG RELEASE_VERSION=6.3.3-f38 WORKDIR /var/repo diff --git a/yum-repo/specs/mbp-fedora-t2-config.spec b/yum-repo/specs/mbp-fedora-t2-config.spec index 9ffe425..1f13bdb 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.2.13 +Version: 6.3.3 Release: 1%{?dist} Summary: System configuration for mbp-fedora on Apple T2 Macs.