Merge to master

.drone.yml

@@ -2,29 +2,43 @@
 kind: pipeline
 name: mbp-fedora-kernel
 
+trigger:
+  event:
+    exclude:
+      - pull_request
+
 steps:
-- name: build
-  image: fedora:31
-  pull: always
-  volumes:
-    - name: build-artifacts
-      path: /tmp/artifacts
-  commands:
-    - ./build.sh
+  - name: lint
+    image: alpine:3.13
+    pull: always
+    commands:
+      - apk add --no-cache shellcheck py-pip python3 bash
+      - pip3 install yamllint
+      - yamllint .
+      - shellcheck ./*.sh
+
+  - name: build
+    image: fedora:33
+    pull: always
+    volumes:
+      - name: build-artifacts
+        path: /tmp/artifacts
+    commands:
+      - ./build.sh
 
-- name: publish-github
-  image: plugins/github-release
-  volumes:
-    - name: build-artifacts
-      path: /tmp/artifacts
-  settings:
-    api_key:
-      from_secret: github_token
-    files: /tmp/artifacts/*
-    prerelease: yes
-  when:
-    event: tag
+  - name: publish-github
+    image: plugins/github-release
+    volumes:
+      - name: build-artifacts
+        path: /tmp/artifacts
+    settings:
+      api_key:
+        from_secret: github_token
+      files: /tmp/artifacts/*
+      prerelease: true
+    when:
+      event: tag
 
 volumes:
-- name: build-artifacts
-  temp: {}
+  - name: build-artifacts
+    temp: {}

Dockerfile

@@ -0,0 +1,12 @@
+FROM fedora:33
+
+ARG RPMBUILD_PATH=/root/rpmbuild
+ARG FEDORA_KERNEL_VERSION=5.11.20-300.fc34      # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=F34
+
+RUN dnf install -y fedpkg fedora-packager rpmdevtools ncurses-devel pesign git libkcapi libkcapi-devel libkcapi-static libkcapi-tools zip curl dwarves libbpf \
+    && rpmdev-setuptree \
+    && cd ${RPMBUILD_PATH}/SOURCES \
+    && koji download-build --arch=src kernel-${FEDORA_KERNEL_VERSION} \
+    && rpm -Uvh kernel-${FEDORA_KERNEL_VERSION}.src.rpm \
+    && cd ${RPMBUILD_PATH}/SPECS \
+    && dnf -y builddep kernel.spec

README.md

@@ -4,12 +4,25 @@ Fedora kernel with Apple T2 patches built-in (Macbooks produced >= 2018).
 
 Fedora ISO (with mbp-fedora-kernel builtin) - <https://github.com/mikeeq/mbp-fedora>
 
-There are multiple version of the kernel maintained on seperate branches (all compiled versions could be found in releases section):
+Drivers:
 
-- 5.4-f31 - <https://github.com/mikeeq/mbp-fedora-kernel/tree/v5.4-f31>
-- 5.3-f31 - <https://github.com/mikeeq/mbp-fedora-kernel/tree/v5.3-f31>
-- 5.3-f30 - <https://github.com/mikeeq/mbp-fedora-kernel/tree/v5.3-f30>
-- 5.1-f30 - <https://github.com/mikeeq/mbp-fedora-kernel/tree/v5.1>
+- Apple T2 (audio, keyboard, touchpad) - <https://github.com/MCMrARM/mbp2018-bridge-drv>
+- Apple SMC - <https://github.com/MCMrARM/mbp2018-etc>
+- Touchbar - <https://github.com/roadrunner2/macbook12-spi-driver/tree/mbp15>
+
+## How to update kernel-mbp
+
+```
+### First run
+sudo -i
+curl -L https://raw.githubusercontent.com/mikeeq/mbp-fedora-kernel/v5.6-f32/update_kernel_mbp.sh -o /usr/bin/update_kernel_mbp
+chmod +x /usr/bin/update_kernel_mbp
+update_kernel_mbp
+
+### Next ones
+sudo -i
+update_kernel_mbp
+```
 
 ## CI status
 
@@ -21,30 +34,22 @@ Travis kernel publish status - <http://fedora-mbp-repo.herokuapp.com/> :
 
 ## TODO
 
-- integrate `roadrunner2/macbook12-spi-driver` and `MCMrARM/mbp2018-bridge-drv` drivers
+- integrate `roadrunner2/macbook12-spi-driver` and `MCMrARM/mbp2018-bridge-drv` drivers into kernel
 - add `kernel-headers` rpm generation
 
 > Tested on: Macbook Pro 15,2 13" 2019 i5 TouchBar Z0WQ000AR MV972ZE/A/R1
 
 ```
 Boot ROM Version:	220.270.99.0.0 (iBridge: 16.16.6571.0.0,0)
-MacOS Mojave: 10.14.6 (18G103)
+macOS Mojave: 10.14.6 (18G103)
 ```
 
 ### Known issues
 
-- 5.2<= kernel random kernel panics - just disable thunderbolt driver
-
-  ```
-  ➜ cat /etc/modprobe.d/blacklist.conf
-  blacklist thunderbolt
-  ```
-
-  - it's working on 5.1, because 5.1 is failing to load thunderbolt firmware
+- Dynamic audio input/output change (on connecting/disconnecting headphones jack)
+- TouchID - (@MCMrARM is working on it - https://github.com/Dunedan/mbp-2016-linux/issues/71#issuecomment-528545490)
+- Thunderbolt (is disabled, because driver was causing kernel panics (not tested with 5.5 kernel))
 - Microphone (it's recognised with new apple t2 sound driver, but there is a low mic volume amp)
-- Dynamic audio outputs change (on connecting/disconnecting headphones jack)
-- Suspend/Resume (sleep mode)
-- Thunderbolt
 
 #### Working with upstream stable kernel 5.1
 
@@ -60,19 +65,7 @@ MacOS Mojave: 10.14.6 (18G103)
 - Camera
 - keyboard
 - touchpad (scroll, right click)
-- wifi
-  - you need to manually extract firmware from MacOS
-    - <https://github.com/Dunedan/mbp-2016-linux/issues/71#issuecomment-517444300>
-    - <https://github.com/Dunedan/mbp-2016-linux/issues/71#issuecomment-515401480>
-
-> The firmware files to use can be found by running `ioreg -l | grep C-4364` or `ioreg -l | grep RequestedFiles`, copy from `/usr/share/firmware/wifi` when being on MacOS
-
-```
-Put the firmware in the right place!
-The .trx file for your model goes to /lib/firmware/brcm/brcmfmac4364-pcie.bin,
-the .clmb goes to /lib/firmware/brcm/brcmfmac4364-pcie.clm_blob
-and the .txt to something like /lib/firmware/brcm/brcmfmac4364-pcie.Apple Inc.-MacBookPro15,2.txt
-```
+- wifi (see <https://wiki.t2linux.org/guides/wifi/>)
 
 #### Working with external drivers
 
@@ -86,10 +79,17 @@ and the .txt to something like /lib/firmware/brcm/brcmfmac4364-pcie.Apple Inc.-M
 #### Not tested
 
 - eGPU
+- Thunderbolt
 
 ## Docs
 
-- Discord: <https://discord.gg/39Rmjh>
+- Discord: <https://discord.gg/Uw56rqW>
+- WiFi firmware: <https://packages.aunali1.com/apple/wifi-fw/18G2022>
+- blog `Installing Fedora 31 on a 2018 Mac mini`: <https://linuxwit.ch/blog/2020/01/installing-fedora-on-mac-mini/>
+- iwd:
+  - <https://iwd.wiki.kernel.org/networkconfigurationsettings>
+  - <https://wiki.archlinux.org/index.php/Iwd>
+  - <https://www.vocal.com/secure-communication/eap-types/>
 
 ### Fedora
 
@@ -106,6 +106,7 @@ and the .txt to something like /lib/firmware/brcm/brcmfmac4364-pcie.Apple Inc.-M
 - TouchBar driver: <https://github.com/roadrunner2/macbook12-spi-driver/tree/mbp15>
 - Kernel patches (all are mentioned in github issue above): <https://github.com/aunali1/linux-mbp-arch>
 - ArchLinux kernel patches: <https://github.com/ppaulweber/linux-mba>
+- hid-apple-patched module for changing mappings of ctrl, fn, option keys: <https://github.com/free5lot/hid-apple-patched>
 
 ## Credits
 

build.sh

@@ -1,72 +1,68 @@
-#!/bin/sh
+#!/bin/bash
+
+set -eu -o pipefail
 
 ## Update fedora docker image tag, because kernel build is using `uname -r` when defining package version variable
-FEDORA_KERNEL_GIT_URL=https://src.fedoraproject.org/rpms/kernel.git
-FEDORA_KERNEL_VERSION=5.4.10
-FEDORA_KERNEL_BRANCH_NAME=f31
-FEDORA_KERNEL_COMMIT_HASH=34597fed7b4308339dbdd1761da4608444b4320e      # https://src.fedoraproject.org/rpms/kernel/commits/f31
+RPMBUILD_PATH=/root/rpmbuild
+FEDORA_KERNEL_VERSION=5.12.11-300.fc34      # https://bodhi.fedoraproject.org/updates/?search=&packages=kernel&releases=F34
+REPO_PWD=$(pwd)
 
 ### Debug commands
 echo "FEDORA_KERNEL_VERSION=$FEDORA_KERNEL_VERSION"
-echo "FEDORA_KERNEL_BRANCH_NAME=$FEDORA_KERNEL_BRANCH_NAME"
-echo "FEDORA_KERNEL_COMMIT_HASH=$FEDORA_KERNEL_COMMIT_HASH"
+
 pwd
-ls
 echo "CPU threads: $(nproc --all)"
-cat /proc/cpuinfo | grep 'model name' | uniq
-# git clone --depth 1 --single-branch --branch v5.1.19 git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+grep 'model name' /proc/cpuinfo | uniq
 
 ### Dependencies
-dnf install -y fedpkg fedora-packager rpmdevtools ncurses-devel pesign git libkcapi libkcapi-devel libkcapi-static libkcapi-tools zip curl
+dnf install -y fedpkg fedora-packager rpmdevtools ncurses-devel pesign git libkcapi libkcapi-devel libkcapi-static libkcapi-tools zip curl dwarves libbpf
 
-### Clone Fedora Kernel git repo
-git clone --single-branch --branch $FEDORA_KERNEL_BRANCH_NAME ${FEDORA_KERNEL_GIT_URL}
-cd kernel
-## Cleanup
-rm -rfv *.rpm
-rm -rf ~/rpmbuild/*
-git reset --hard $FEDORA_KERNEL_BRANCH_NAME
-git checkout $FEDORA_KERNEL_BRANCH_NAME
-git branch -d fedora_patch_src
-fedpkg clean
-## Change branch
-git checkout $FEDORA_KERNEL_COMMIT_HASH
-git reset --hard $FEDORA_KERNEL_COMMIT_HASH
-git checkout -b fedora_patch_src
-dnf -y builddep kernel.spec
+## Set home build directory
+rpmdev-setuptree
 
-### Fixes for kernel.spec
-# sed -i "s/Patch509/Patch516/g" kernel.spec
+## Install the kernel source and finish installing dependencies
+cd ${RPMBUILD_PATH}/SOURCES
+koji download-build --arch=src kernel-${FEDORA_KERNEL_VERSION}
+rpm -Uvh kernel-${FEDORA_KERNEL_VERSION}.src.rpm
+
+cd ${RPMBUILD_PATH}/SPECS
+dnf -y builddep kernel.spec
 
 ### Create patch file with custom drivers
-FEDORA_KERNEL_VERSION=${FEDORA_KERNEL_VERSION} ../patch_driver.sh
+echo >&2 "===]> Info: Creating patch file... ";
+FEDORA_KERNEL_VERSION=${FEDORA_KERNEL_VERSION} "${REPO_PWD}"/patch_driver.sh
 
 ### Apply patches
-for patch_file in $(ls ../patches)
+echo >&2 "===]> Info: Applying patches... ";
+mkdir -p "${REPO_PWD}"/patches
+while IFS= read -r file
 do
-  scripts/newpatch.sh ../patches/$patch_file
-done
+  echo "adding $file"
+  "${REPO_PWD}"/patch_kernel.sh "$file"
+done < <(find "${REPO_PWD}"/patches -type f -name "*.patch" | sort)
 
 ### Change buildid to mbp
-sed -i 's/%define buildid.*/%define buildid .mbp/' ./kernel.spec
-
-### Build src rpm
-fedpkg --release $FEDORA_KERNEL_BRANCH_NAME srpm
+echo >&2 "===]> Info: Setting kernel name... ";
+sed -i 's/# define buildid.*/%define buildid .mbp/' "${RPMBUILD_PATH}"/SPECS/kernel.spec
 
 ### Build non-debug rpms
-./scripts/fast-build.sh x86_64 $(ls | grep src.rpm)
+echo >&2 "===]> Info: Bulding kernel ... ";
+# cd ${RPMBUILD_PATH}/SOURCES
+# rpmbuild --target x86_64 --without debug --without debuginfo --without perf --without tools --rebuild kernel-${FEDORA_KERNEL_VERSION}.src.rpm
+cd "${RPMBUILD_PATH}"/SPECS
+# rpmbuild -bb --without debug --target=x86_64 kernel.spec
+rpmbuild -bb --without debug --without debuginfo --without perf --without tools --target=x86_64 kernel.spec
 rpmbuild_exitcode=$?
 
 ### Copy artifacts to shared volume
-find ~/rpmbuild/ | grep '\.rpm'
-cp -rfv ~/rpmbuild/RPMS/x86_64/*.rpm /tmp/artifacts/
-
-### Calculate sha256 sums of built RPMs
-sha256sum ~/rpmbuild/RPMS/x86_64/*.rpm > /tmp/artifacts/sha256
+echo >&2 "===]> Info: Copying rpms and calculating SHA256 ... ";
+cp -rfv ${RPMBUILD_PATH}/RPMS/x86_64/*.rpm /tmp/artifacts/
+sha256sum ${RPMBUILD_PATH}/RPMS/x86_64/*.rpm > /tmp/artifacts/sha256
 
 ### Add patches to artifacts
-cd ..
+cd "${REPO_PWD}" | exit
 zip -r patches.zip patches/
 cp -rfv patches.zip /tmp/artifacts/
+du -h /tmp/artifacts/
 
 exit $rpmbuild_exitcode

build_in_docker.sh

@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
-DOCKER_IMAGE=fedora:31
-RPMBUILD_HOST_PATH=/opt/rpmbuild
+set -eu -o pipefail
+
+# DOCKER_IMAGE=fedora:33
+DOCKER_IMAGE=fedora_build:33
+RPMBUILD_HOST_PATH=~/rpmbuild
 
 mkdir -p ${RPMBUILD_HOST_PATH}
 
-docker pull ${DOCKER_IMAGE}
+# docker pull ${DOCKER_IMAGE}
 docker run \
   -t \
   --rm \
-  -v $(pwd):/repo \
+  -v "$(pwd)":/repo \
   -v ${RPMBUILD_HOST_PATH}:/root/rpmbuild \
   ${DOCKER_IMAGE} \
   /bin/bash -c 'cd /repo && ./build.sh'