Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fedora Linux v6.5.11 #97

Open
wants to merge 7 commits into
base: v6.5-f39
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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.11-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 \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.11-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.11-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
Expand Down
7 changes: 4 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.11-300.fc39 # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=f39
REPO_PWD=$(pwd)

### Debug commands
Expand Down Expand Up @@ -49,8 +49,9 @@ echo >&2 "===]> Info: Applying kconfig changes... ";
{
echo "CONFIG_APPLE_BCE=m"
echo "CONFIG_BT_HCIBCM4377=m"
echo "CONFIG_HID_APPLE_IBRIDGE=m"
echo "CONFIG_HID_APPLE_TOUCHBAR=m"
echo "CONFIG_HID_APPLETB_BL=m"
echo "CONFIG_HID_APPLETB_KBD=m"
echo "CONFIG_DRM_APPLETBDRM=m"
echo "CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m"
} >> "${RPMBUILD_PATH}/SOURCES/kernel-local"

Expand Down
6 changes: 3 additions & 3 deletions build_in_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions kernel_patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=main
APPLE_SMC_DRIVER_COMMIT_HASH=c908e506346681139a844d41c40b295cfad17ea8
APPLE_SMC_DRIVER_BRANCH_NAME=revert_urb_partial_fix
APPLE_SMC_DRIVER_COMMIT_HASH=83ff92b6ee601be94e29295475fc7d70ff686a02

TMP_DIR=/tmp/tmp_dir
REPO_PWD=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
Expand Down
4 changes: 2 additions & 2 deletions update_kernel_mbp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions yum-repo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM fedora:38
FROM fedora:39

ARG RELEASE_VERSION=6.4.4-f38
ARG RELEASE_VERSION=6.5.11-f39

WORKDIR /var/repo

Expand Down
2 changes: 1 addition & 1 deletion yum-repo/specs/mbp-fedora-t2-config.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: mbp-fedora-t2-config
Version: 6.4.4
Version: 6.5.11
Release: 1%{?dist}
Summary: System configuration for mbp-fedora on Apple T2 Macs.

Expand Down
Loading