From 9c3e761bc46a963ef8d30586e4e5ba98eb57b3f0 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Wed, 19 May 2021 08:42:19 +0200 Subject: [PATCH] Update to 5.12.4 / 5.11.21, second attempt Signed-off-by: Dorian Stoll --- .github/workflows/debian.yml | 2 +- pkg/arch/kernel/0007-surface-hotplug.patch | 1 - pkg/arch/kernel/0007-surface-typecover.patch | 1 + pkg/arch/kernel/0008-cameras.patch | 1 + pkg/arch/kernel/0008-surface-typecover.patch | 1 - pkg/arch/kernel/0009-cameras.patch | 1 - pkg/arch/kernel/PKGBUILD | 24 +++++++++---------- pkg/fedora/kernel-surface/kernel-surface.spec | 8 +++---- 8 files changed, 18 insertions(+), 21 deletions(-) delete mode 120000 pkg/arch/kernel/0007-surface-hotplug.patch create mode 120000 pkg/arch/kernel/0007-surface-typecover.patch create mode 120000 pkg/arch/kernel/0008-cameras.patch delete mode 120000 pkg/arch/kernel/0008-surface-typecover.patch delete mode 120000 pkg/arch/kernel/0009-cameras.patch diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 036d9a543..5bd23ec45 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -8,7 +8,7 @@ name: Debian env: GPG_KEY_ID: 56C464BAAC421453 KERNEL_VERSION: 5.12.4 - 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 diff --git a/pkg/arch/kernel/0007-surface-hotplug.patch b/pkg/arch/kernel/0007-surface-hotplug.patch deleted file mode 120000 index fb2b2d5f7..000000000 --- a/pkg/arch/kernel/0007-surface-hotplug.patch +++ /dev/null @@ -1 +0,0 @@ -../../../patches/5.12/0007-surface-hotplug.patch \ No newline at end of file diff --git a/pkg/arch/kernel/0007-surface-typecover.patch b/pkg/arch/kernel/0007-surface-typecover.patch new file mode 120000 index 000000000..df649acfe --- /dev/null +++ b/pkg/arch/kernel/0007-surface-typecover.patch @@ -0,0 +1 @@ +../../../patches/5.12/0007-surface-typecover.patch \ No newline at end of file diff --git a/pkg/arch/kernel/0008-cameras.patch b/pkg/arch/kernel/0008-cameras.patch new file mode 120000 index 000000000..7d2996fb8 --- /dev/null +++ b/pkg/arch/kernel/0008-cameras.patch @@ -0,0 +1 @@ +../../../patches/5.12/0008-cameras.patch \ No newline at end of file diff --git a/pkg/arch/kernel/0008-surface-typecover.patch b/pkg/arch/kernel/0008-surface-typecover.patch deleted file mode 120000 index 58533566c..000000000 --- a/pkg/arch/kernel/0008-surface-typecover.patch +++ /dev/null @@ -1 +0,0 @@ -../../../patches/5.12/0008-surface-typecover.patch \ No newline at end of file diff --git a/pkg/arch/kernel/0009-cameras.patch b/pkg/arch/kernel/0009-cameras.patch deleted file mode 120000 index 5495db285..000000000 --- a/pkg/arch/kernel/0009-cameras.patch +++ /dev/null @@ -1 +0,0 @@ -../../../patches/5.12/0009-cameras.patch \ No newline at end of file diff --git a/pkg/arch/kernel/PKGBUILD b/pkg/arch/kernel/PKGBUILD index ad5ebb6aa..16183da81 100644 --- a/pkg/arch/kernel/PKGBUILD +++ b/pkg/arch/kernel/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=linux-surface pkgver=5.12.4.arch2 -pkgrel=1 +pkgrel=2 pkgdesc='Linux' _shortver=${pkgver%.*} _fullver=${pkgver%.*}-${pkgver##*.} @@ -33,9 +33,8 @@ source=( 0004-ipts.patch 0005-surface-sam-over-hid.patch 0006-surface-sam.patch - 0007-surface-hotplug.patch - 0008-surface-typecover.patch - 0009-cameras.patch + 0007-surface-typecover.patch + 0008-cameras.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -46,15 +45,14 @@ sha256sums=('ad6c408fefce32fa9589d273599afdff21205724ea41763bec58745aa42083b7' '55c4cb76754b1db234a0994806106d8481c171d4e3fead12793f0083a48511d4' '252c7a78ffb1efe9751aabc93cc79031ef69dbc95baa7970cbaabcd5474fe7d8' '9474de18769968c5558fedda5be354fe0babf1365541d4d0ac8e1ac47d4bbb88' - 'a7be143e4bebeef77fe00da86e35ce9edee2c69b48d4638b062223746891a448' - '3b303b719c9da626f697c0e1f2d9a41b752b3929e09dcce00ed82b15ff623654' - 'a5af883d39fefb763f783382f17c91d2b804bf0a2fbfb2c328be49ef0eec5ca2' - 'cfabc368b6b8152919836b62205c47c8f61c191e0558af156b7a981f0da85505' - '4c5863744ec27cbdfbd748cc56d274ce4979a63356180df7fa54098c85923929' - '0a89fca44c8046bb0d0984ab55b7767c9b8383ad8209577aaf052b070d76e6da' - '10549a5c0853927c1b18b15a783ee63a24eb56254eee3cbfe05ca4e75b127a17' - '979f712ac8f4f1bf47c43f69fdea66cae610402356e5dd2bb6cff5c077c4a6af' - '6b66f0052d43dec816d6ca3c2be830edff5616e537a67696217586c2886067a4') + 'c573886e220db0ba64d3b53e317f38a8cdbb79da4a0536186436f7edc862a68c' + '54ca159b7e829ea9e2b8de061773521f9c4cf49ffff2ee1aa235d4c7ea302ac4' + '9bd561f50fa93c84a842ef9cb7ee83fadb3c6c5ee893836b4f0e8433767cd2ba' + 'a90795cb503ea7762b9b309e7fd3428940a67572b793b4a9914082b71dc4b44c' + '3561140af7e82419df978589a530ac75903bbe17615b03d4939a408ea2eab537' + '7d2b51b79f0868fc984e893607a3574ee3a273593a901f7ee8c9cbc211f6b0fe' + 'eaf882c116a2bde9c866ce62809fb36fd226380daa508bdd29966cc879a5f950' + '4c3aeb469544e780118b1c95044ae5f430327f2a1ff7fe3306a9c28f98fb60ee') export KBUILD_BUILD_HOST=archlinux diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec index 8010a9872..3989976fa 100755 --- a/pkg/fedora/kernel-surface/kernel-surface.spec +++ b/pkg/fedora/kernel-surface/kernel-surface.spec @@ -6,9 +6,9 @@ %global kernel_tag_fc33 kernel-5.11.21-200.fc33 %global kernel_tag_fc32 kernel-5.11.21-100.fc32 -%global kernel_release_fc34 1 -%global kernel_release_fc33 1 -%global kernel_release_fc32 1 +%global kernel_release_fc34 2 +%global kernel_release_fc33 2 +%global kernel_release_fc32 2 # This is what is printed in the GRUB menu. These cannot be fetched from the # buildhost, because in a container this will also say container. To get the @@ -17,7 +17,7 @@ %global fedora_title_fc33 33 (Thirty Three) %global fedora_title_fc32 32 (Thirty Two) -%global ls_patches_commit de116c5fd57bc2e1908615d9924d8859961726ae +%global ls_patches_commit ad369a7e6dbca0a091dcc41485ea59426f93fb37 %global sb_crt surface.crt %global sb_key surface.key