Kernel: update to 5.10.47

Author: marcosfad

.github/workflows/BuildKernel.yml

@@ -1,49 +1,57 @@
-# This is a basic workflow to help you get started with Actions
-
+---
 name: Build Kernel Package
 
-# Controls when the action will run. 
+# yamllint disable-line rule:truthy
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+  [push, pull_request]
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+  lint:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: 'Checkout repo'
+        uses: actions/checkout@v2
+      - name: 'Set up Python 3.9'
+        uses: actions/setup-python@v2
+      - name: 'Install dependencies'
+        run: |
+          python -m pip install --upgrade pip
+          pip install yamllint
+          sudo apt-get install shellcheck bash
+      - name: 'Analysing the code'
+        run: |
+          yamllint .
+          shellcheck ./*.sh
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
+  build:
+    runs-on: ubuntu-20.04
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - name: 'Checkout Repo'
+        uses: actions/checkout@v2
 
       - name: Build script
         id: build
         run: |
           mkdir /tmp/artifacts
           VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2)
-          REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2)
-          #REL=$( git tag |grep -F $VERSION|sort -r|head -n1|tr -d v)
+          REL=$(./next_version.sh mbp)
           echo Building $VERSION-$REL
           echo "::set-output name=tag::${VERSION}-${REL}"
           sudo ./build.sh
           cd /tmp/artifacts
           ls -l
           dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
           ls -l
-          
+
       - name: Upload package artifact
+        if: github.ref == 'refs/heads/master'
         uses: actions/upload-artifact@v2
         with:
-          name: linux-mbp-16x-wifi-${{ steps.build.outputs.tag }}
+          name: linux-mbp-${{ steps.build.outputs.tag }}
           path: /tmp/artifacts/*
 
       - name: Release
+        if: github.ref == 'refs/heads/master'
         uses: softprops/action-gh-release@v1
         with:
           files: |
@@ -54,4 +62,3 @@ jobs:
           draft: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

.github/workflows/CreateRelease.yml

@@ -4,8 +4,7 @@ set -eu -o pipefail
 
 ## Update docker image tag, because kernel build is using `uname -r` when defining package version variable
 # KERNEL_VERSION=$(curl -s https://www.kernel.org | grep '<strong>' | head -3 | tail -1 | cut -d'>' -f3 | cut -d'<' -f1)
-KERNEL_VERSION=5.13
-PKGREL=1
+KERNEL_VERSION=5.10.47
 #KERNEL_REPOSITORY=git://kernel.ubuntu.com/virgin/linux-stable.git
 KERNEL_REPOSITORY=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
 REPO_PATH=$(pwd)
@@ -20,18 +19,7 @@ echo "CPU threads: $(nproc --all)"
 grep 'model name' /proc/cpuinfo | uniq
 
 get_next_version () {
-  echo $PKGREL
-  #curl -s https://mbp-ubuntu-kernel.herokuapp.com/ -L | grep "linux-image-${KERNEL_VERSION}-${1}" > /dev/null
-  #OLD_BUILD_EXIST=$?
-  #if test $OLD_BUILD_EXIST -eq 0
-  #then
-  #  LATEST_BUILD=$(curl -s https://mbp-ubuntu-kernel.herokuapp.com/ -L | grep "linux-image-${KERNEL_VERSION}-${1}" |
-  #    grep a | cut -d'>' -f2 | cut -d'<' -f1 |
-  #    sort -r | head -n 1 | cut -d'-' -f6 | cut -d'_' -f1)
-  #else
-  #  LATEST_BUILD=0
-  #fi
-  #echo "$((LATEST_BUILD+1))"
+  "${REPO_PATH}"/next_version.sh "${1}"
 }
 
 ### Clean up
@@ -87,12 +75,10 @@ make olddefconfig
 echo "" >"${KERNEL_PATH}"/.scmversion
 
 # Build Deb packages
-make -j "$(getconf _NPROCESSORS_ONLN)" deb-pkg LOCALVERSION=-mbp-16x-wifi KDEB_PKGVERSION="$(make kernelversion)-$(get_next_version)"
+make -j "$(getconf _NPROCESSORS_ONLN)" deb-pkg LOCALVERSION=-mbp KDEB_PKGVERSION="${KERNEL_VERSION}-$(get_next_version mbp)"
 
 #### Copy artifacts to shared volume
 echo >&2 "===]> Info: Copying debs and calculating SHA256 ... "
-#cp -rfv ../*.deb "${REPO_PATH}/"
-#cp -rfv "${KERNEL_PATH}/.config" "${REPO_PATH}/kernel_config_${KERNEL_VERSION}"
 cp -rfv "${KERNEL_PATH}/.config" "/tmp/artifacts/kernel_config_${KERNEL_VERSION}"
 cp -rfv ../*.deb /tmp/artifacts/
 sha256sum ../*.deb >/tmp/artifacts/sha256

.github/workflows/build.yml

@@ -0,0 +1,12 @@
+#!/bin/bash
+curl -s https://mbp-ubuntu-kernel.herokuapp.com/ -L | grep "linux-image-${KERNEL_VERSION}-§" > /dev/null
+OLD_BUILD_EXIST=$?
+if test $OLD_BUILD_EXIST -eq 0
+then
+  LATEST_BUILD=$(curl -s https://mbp-ubuntu-kernel.herokuapp.com/ -L | grep "linux-image-${KERNEL_VERSION}-${1}" |
+    grep a | cut -d'>' -f2 | cut -d'<' -f1 |
+    sort -r | head -n 1 | cut -d'-' -f6 | cut -d'_' -f1)
+else
+  LATEST_BUILD=0
+fi
+echo "$((LATEST_BUILD+1))"

build.sh

@@ -6,9 +6,9 @@ BUILD_PATH=/tmp/build-kernel
 
 ### Apple T2 drivers commit hashes
 # Patches
-APPLE_SMC_DRIVER_GIT_URL=https://github.com/jamlam/mbp-16.1-linux-wifi.git
-APPLE_SMC_DRIVER_BRANCH_NAME=main
-APPLE_SMC_DRIVER_COMMIT_HASH=4c8b393ed7a874e3d9e44a2a467c1b7c74af1260
+APPLE_SMC_DRIVER_GIT_URL=https://github.com/aunali1/linux-mbp-arch.git
+APPLE_SMC_DRIVER_BRANCH_NAME=master
+APPLE_SMC_DRIVER_COMMIT_HASH=1faa37d704798bc04104a88f620e4f55b3466de0
 ## BCE
 #APPLE_BCE_DRIVER_GIT_URL=https://github.com/aunali1/mbp2018-bridge-drv.git
 #APPLE_BCE_DRIVER_BRANCH_NAME=aur