From 783e238e6dcbd1e154944330484b5521a53796b9 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 14 Jun 2020 19:31:39 +0200
Subject: [PATCH] Update packaging to new Ubuntu mainline PPA structure

---
 .github/workflows/debian.yml     | 31 ++++++++-----------------------
 .github/workflows/debian_lts.yml | 31 ++++++++-----------------------
 2 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 923136c1e..2176d1b14 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -10,6 +10,8 @@ env:
   KERNEL_VERSION: 5.6.15
   KDEB_PKGVERSION: 5.6.15-1
   LOCALVERSION: -surface
+  MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
+  MAINLINE_BRANCH: cod/mainline
 
 jobs:
   build:
@@ -31,37 +33,20 @@ jobs:
       run: |
         cd pkg/debian/kernel
 
-        # get ubuntu build patches (for config)
-        SOURCE_URL="https://kernel.ubuntu.com/~kernel-ppa/mainline/v$KERNEL_VERSION"
-        SOURCE_LIST="$SOURCE_URL/SOURCES"
+        # get ubuntu mainline source
+        # see https://kernel.ubuntu.com/~kernel-ppa/mainline
+        git clone "$MAINLINE_REPO" --branch "$MAINLINE_BRANCH/v$KERNEL_VERSION" --depth 1 linux
 
-        mkdir -p "ubuntu"
-        wget "$SOURCE_LIST" -O "ubuntu/SOURCES"
-        SOURCE_FILES="$(tail -n +2 "ubuntu/SOURCES")"
-
-        for f in $SOURCE_FILES; do
-          wget "$SOURCE_URL/$f" -O "ubuntu/$f"
-        done
-
-        # download kernel sources
-        wget https://cdn.kernel.org/pub/linux/kernel/v${KERNEL_VERSION%%.*}.x/linux-$KERNEL_VERSION.tar.xz
-        tar xf linux-$KERNEL_VERSION.tar.xz
-
-        mv linux-$KERNEL_VERSION linux && cd linux
-
-        # apply ubuntu build patches
-        for PATCH in ../ubuntu/*.patch; do
-          patch -p1 < ${PATCH}
-        done
+        cd linux
 
         # apply surface build patches
         for PATCH in ../*.patch; do
-          patch -p1 < ${PATCH}
+          git am ${PATCH}
         done
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          patch -p1 < ${PATCH}
+          git am ${PATCH}
         done
 
     - name: Configure
diff --git a/.github/workflows/debian_lts.yml b/.github/workflows/debian_lts.yml
index d3da09d8a..4c26d87cb 100644
--- a/.github/workflows/debian_lts.yml
+++ b/.github/workflows/debian_lts.yml
@@ -10,6 +10,8 @@ env:
   KERNEL_VERSION: 4.19.128
   KDEB_PKGVERSION: 4.19.128-1
   LOCALVERSION: -surface-lts
+  MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
+  MAINLINE_BRANCH: cod/mainline
 
 jobs:
   build:
@@ -31,37 +33,20 @@ jobs:
       run: |
         cd pkg/debian/kernel-lts
 
-        # get ubuntu build patches (for config)
-        SOURCE_URL="https://kernel.ubuntu.com/~kernel-ppa/mainline/v$KERNEL_VERSION"
-        SOURCE_LIST="$SOURCE_URL/SOURCES"
+        # get ubuntu mainline source
+        # see https://kernel.ubuntu.com/~kernel-ppa/mainline
+        git clone "$MAINLINE_REPO" --branch "$MAINLINE_BRANCH/v$KERNEL_VERSION" --depth 1 linux
 
-        mkdir -p "ubuntu"
-        wget "$SOURCE_LIST" -O "ubuntu/SOURCES"
-        SOURCE_FILES="$(tail -n +2 "ubuntu/SOURCES")"
-
-        for f in $SOURCE_FILES; do
-          wget "$SOURCE_URL/$f" -O "ubuntu/$f"
-        done
-
-        # download kernel sources
-        wget https://cdn.kernel.org/pub/linux/kernel/v${KERNEL_VERSION%%.*}.x/linux-$KERNEL_VERSION.tar.xz
-        tar xf linux-$KERNEL_VERSION.tar.xz
-
-        mv linux-$KERNEL_VERSION linux && cd linux
-
-        # apply ubuntu build patches
-        for PATCH in ../ubuntu/*.patch; do
-          patch -p1 < ${PATCH}
-        done
+        cd linux
 
         # apply surface build patches
         for PATCH in ../*.patch; do
-          patch -p1 < ${PATCH}
+          git am ${PATCH}
         done
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          patch -p1 < ${PATCH}
+          git am ${PATCH}
         done
 
     - name: Configure