Merge branch 'feature/githubActions' of github.com-turkosdata:marcosfad/mbp-ubuntu-kernel into feature/githubActions

Author: marcosfad

.github/workflows/build.yml

@@ -0,0 +1,57 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Build Kernel Package
+
+# Controls when the action will run. 
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# 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
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - 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)
+          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
+        uses: actions/upload-artifact@v2
+        with:
+          name: linux-mbp-16x-wifi-${{ steps.build.outputs.tag }}
+          path: /tmp/artifacts/*
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            /tmp/artifacts/Packages.gz
+            /tmp/artifacts/sha256
+            /tmp/artifacts/*.deb
+          tag_name: v${{ steps.build.outputs.tag }}
+          draft: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

build.sh

@@ -4,7 +4,8 @@ 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.9.7
+KERNEL_VERSION=5.13
+PKGREL=1
 #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)
@@ -19,17 +20,18 @@ echo "CPU threads: $(nproc --all)"
 grep 'model name' /proc/cpuinfo | uniq
 
 get_next_version () {
-  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))"
+  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))"
 }
 
 ### Clean up
@@ -68,7 +70,7 @@ echo >&2 "===]> Info: Applying patches... "
 while IFS= read -r file; do
   echo "==> Adding $file"
   patch -p1 <"$file"
-done < <(find "${WORKING_PATH}/patches" -type f -name "*.patch" | grep -vE '[2]00[0-9]' | sort)
+done < <(find "${WORKING_PATH}/patches" -type f -name "*.patch" | sort)
 
 chmod a+x "${KERNEL_PATH}"/debian/rules
 chmod a+x "${KERNEL_PATH}"/debian/scripts/*
@@ -85,22 +87,7 @@ make olddefconfig
 echo "" >"${KERNEL_PATH}"/.scmversion
 
 # Build Deb packages
-make -j "$(getconf _NPROCESSORS_ONLN)" deb-pkg LOCALVERSION=-mbp KDEB_PKGVERSION="$(make kernelversion)-$(get_next_version mbp-alt)"
-
-# Create alternative Kernel
-echo >&2 "===]> Info: Create alternative kernel ... "
-make distclean
-make clean
-while IFS= read -r file; do
-  echo "==> Adding $file"
-  patch -p1 <"$file"
-done < <(find "${WORKING_PATH}/patches" -type f -name "*.patch" | grep -E '[2]00[0-9]' | sort)
-cp "${WORKING_PATH}/templates/default-config" "${KERNEL_PATH}/.config"
-make olddefconfig
-echo "" >"${KERNEL_PATH}"/.scmversion
-
-# Build Deb packages
-make -j "$(getconf _NPROCESSORS_ONLN)" deb-pkg LOCALVERSION=-mbp-alt KDEB_PKGVERSION="$(make kernelversion)-$(get_next_version mbp)"
+make -j "$(getconf _NPROCESSORS_ONLN)" deb-pkg LOCALVERSION=-mbp-16x-wifi KDEB_PKGVERSION="$(make kernelversion)-$(get_next_version)"
 
 #### Copy artifacts to shared volume
 echo >&2 "===]> Info: Copying debs and calculating SHA256 ... "

patch_driver.sh

@@ -6,9 +6,9 @@ BUILD_PATH=/tmp/build-kernel
 
 ### Apple T2 drivers commit hashes
 # Patches
-APPLE_SMC_DRIVER_GIT_URL=https://github.com/marcosfad/linux-mbp-arch.git
-APPLE_SMC_DRIVER_BRANCH_NAME=release/5.9
-APPLE_SMC_DRIVER_COMMIT_HASH=01519664be9474c1cf5b92e37bd87a8d98283915
+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
 ## BCE
 #APPLE_BCE_DRIVER_GIT_URL=https://github.com/aunali1/mbp2018-bridge-drv.git
 #APPLE_BCE_DRIVER_BRANCH_NAME=aur