diff --git a/Dockerfile b/Dockerfile index ae08b7d..0cfeff6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM fedora:38 +FROM fedora:39 ARG RPMBUILD_PATH=/root/rpmbuild -ARG FEDORA_KERNEL_VERSION=6.4.4-200.fc38 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f38 +ARG FEDORA_KERNEL_VERSION=6.5.2-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 b2c7f7e..c91a890 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ If the DNF fail, or you're updating your older `mbp-fedora`, you can still use p ```bash ### First run or if you want to update your copy of update_kernel_mbp script sudo -i -curl -L https://raw.githubusercontent.com/mikeeq/mbp-fedora-kernel/v6.4-f38/update_kernel_mbp.sh -o /usr/bin/update_kernel_mbp +curl -L https://raw.githubusercontent.com/mikeeq/mbp-fedora-kernel/v6.5-f39/update_kernel_mbp.sh -o /usr/bin/update_kernel_mbp chmod +x /usr/bin/update_kernel_mbp update_kernel_mbp @@ -42,13 +42,13 @@ update_kernel_mbp ### Update to specific version of kernel sudo -i -KERNEL_VERSION="6.4.4-f38" update_kernel_mbp +KERNEL_VERSION="6.5.2-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.4.4-f38" UPDATE_SCRIPT_BRANCH="v6.4-f38" update_kernel_mbp +KERNEL_VERSION="6.5.2-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 c2a0bdb..cea923a 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.4.4-200.fc38 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f38 +FEDORA_KERNEL_VERSION=6.5.2-300.fc39 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f39 REPO_PWD=$(pwd) ### Debug commands diff --git a/build_in_docker.sh b/build_in_docker.sh index 53c1144..5933c8e 100755 --- a/build_in_docker.sh +++ b/build_in_docker.sh @@ -2,10 +2,10 @@ set -eu -o pipefail -# DOCKER_IMAGE=fedora_build:38 -# docker build -t fedora_build:38 . +# DOCKER_IMAGE=fedora_build:39 +# docker build -t fedora_build:39 . -DOCKER_IMAGE=${DOCKER_IMAGE:-fedora:38} +DOCKER_IMAGE=${DOCKER_IMAGE:-fedora:39} RPMBUILD_HOST_PATH=~/rpmbuild mkdir -p ${RPMBUILD_HOST_PATH} diff --git a/kernel_patches.sh b/kernel_patches.sh index c29ff73..15dcb88 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=c908e506346681139a844d41c40b295cfad17ea8 +APPLE_SMC_DRIVER_COMMIT_HASH=3aeff9385079f5f362a5447cdb9f4e2b48962c92 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 eb430b3..2f568d5 100755 --- a/update_kernel_mbp.sh +++ b/update_kernel_mbp.sh @@ -4,8 +4,8 @@ set -eu -o pipefail KERNEL_PATCH_PATH=/tmp/kernel_patch -UPDATE_SCRIPT_BRANCH=${UPDATE_SCRIPT_BRANCH:-v6.4-f38} -MBP_FEDORA_BRANCH=f38 +UPDATE_SCRIPT_BRANCH=${UPDATE_SCRIPT_BRANCH:-v6.5-f39} +MBP_FEDORA_BRANCH=f39 if [ "$EUID" -ne 0 ]; then echo >&2 "===]> Please run as root --> sudo -i; update_kernel_mbp" diff --git a/yum-repo/Dockerfile b/yum-repo/Dockerfile index 569c741..36cdcf9 100644 --- a/yum-repo/Dockerfile +++ b/yum-repo/Dockerfile @@ -1,6 +1,6 @@ -FROM fedora:38 +FROM fedora:39 -ARG RELEASE_VERSION=6.4.4-f38 +ARG RELEASE_VERSION=6.5.2-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 1dadfd2..e54d304 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.4.4 +Version: 6.5.2 Release: 1%{?dist} Summary: System configuration for mbp-fedora on Apple T2 Macs.