From d741807f03ddf3389e4a2c89a22a8dc8ca14e420 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 29 Jan 2023 14:51:46 +0100
Subject: [PATCH] pkg/debian: Revert build container to 20.04

The newer build container (22.04) creates some problems when trying to
install external/DKMS modules on older distributions. So revert it back
to 20.04 and install the required Python version from a third-party PPA.
---
 .github/workflows/debian.yml    | 14 +++++++++++---
 pkg/debian/kernel/ubuntu.config |  9 ---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 0a846df50..0783ab403 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -8,7 +8,7 @@ name: Debian
 env:
   GPG_KEY_ID: 56C464BAAC421453
   KERNEL_VERSION: 6.1.6
-  KERNEL_REVISION: 1
+  KERNEL_REVISION: 2
   LOCALVERSION: -surface
   MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
   MAINLINE_BRANCH: cod/mainline
@@ -18,7 +18,7 @@ jobs:
   build:
     name: Build Kernel
     runs-on: ubuntu-latest
-    container: ubuntu:22.04
+    container: ubuntu:20.04
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -29,10 +29,18 @@ jobs:
         ln -snf /usr/share/zoneinfo/$TZ /etc/localtime
         echo $TZ > /etc/timezone
         apt-get -y update
-        apt-get -y install build-essential fakeroot rsync git wget python3-debian python-is-python3 \
+        apt-get -y install build-essential fakeroot rsync git wget software-properties-common \
             zstd lz4 sbsigntool debhelper dpkg-dev dpkg-sig
         apt-get -y build-dep linux
 
+        # install python 3.11, required for configuring the kernel via Ubuntu's annotation format
+        add-apt-repository -y ppa:deadsnakes
+        apt-get -y update
+        apt-get -y install python3.11
+        ln -s /usr/bin/python3.11 /usr/bin/python
+
+        apt-get -y upgrade
+
     - name: Prepare kernel source
       run: |
         cd pkg/debian/kernel
diff --git a/pkg/debian/kernel/ubuntu.config b/pkg/debian/kernel/ubuntu.config
index 62cce0cc8..4f8179f3b 100644
--- a/pkg/debian/kernel/ubuntu.config
+++ b/pkg/debian/kernel/ubuntu.config
@@ -78,12 +78,3 @@ CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 CONFIG_I2C_DESIGNWARE_PCI=y
 CONFIG_INTEL_SOC_PMIC=y
 CONFIG_PWM_CRC=y
-
-##
-## Disable some mitigations that aren't available on older gcc versions. This
-## is necessary to allow older gcc versions to be used for building kernel
-## modules.
-##
-
-# CONFIG_SLS is not set
-# CONFIG_ZERO_CALL_USED_REGS is not set