瀏覽代碼

Bump kernel package releases

Maximilian Luz 2 年之前
父節點
當前提交
7a660b73c6

+ 1 - 1
.github/workflows/debian.yml

@@ -8,7 +8,7 @@ name: Debian
 env:
 env:
   GPG_KEY_ID: 56C464BAAC421453
   GPG_KEY_ID: 56C464BAAC421453
   KERNEL_VERSION: 6.1.12
   KERNEL_VERSION: 6.1.12
-  KERNEL_REVISION: 1
+  KERNEL_REVISION: 2
   LOCALVERSION: -surface
   LOCALVERSION: -surface
   MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
   MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
   MAINLINE_BRANCH: cod/mainline
   MAINLINE_BRANCH: cod/mainline

+ 0 - 1
pkg/arch/kernel/0010-cameras.patch

@@ -1 +0,0 @@
-../../../patches/6.1/0010-cameras.patch

+ 1 - 0
pkg/arch/kernel/0010-surface-shutdown.patch

@@ -0,0 +1 @@
+../../../patches/6.1/0010-surface-shutdown.patch

+ 0 - 1
pkg/arch/kernel/0011-amd-gpio.patch

@@ -1 +0,0 @@
-../../../patches/6.1/0011-amd-gpio.patch

+ 1 - 0
pkg/arch/kernel/0011-cameras.patch

@@ -0,0 +1 @@
+../../../patches/6.1/0011-cameras.patch

+ 1 - 0
pkg/arch/kernel/0012-amd-gpio.patch

@@ -0,0 +1 @@
+../../../patches/6.1/0012-amd-gpio.patch

+ 0 - 1
pkg/arch/kernel/0012-rtc.patch

@@ -1 +0,0 @@
-../../../patches/6.1/0012-rtc.patch

+ 1 - 0
pkg/arch/kernel/0013-rtc.patch

@@ -0,0 +1 @@
+../../../patches/6.1/0013-rtc.patch

+ 13 - 11
pkg/arch/kernel/PKGBUILD

@@ -4,7 +4,7 @@
 
 
 pkgbase=linux-surface
 pkgbase=linux-surface
 pkgver=6.1.12.arch1
 pkgver=6.1.12.arch1
-pkgrel=1
+pkgrel=2
 pkgdesc='Linux'
 pkgdesc='Linux'
 _shortver=${pkgver%.*}
 _shortver=${pkgver%.*}
 _fullver=${pkgver%.*}-${pkgver##*.}
 _fullver=${pkgver%.*}-${pkgver##*.}
@@ -39,9 +39,10 @@ source=(
   0007-surface-sam-over-hid.patch
   0007-surface-sam-over-hid.patch
   0008-surface-button.patch
   0008-surface-button.patch
   0009-surface-typecover.patch
   0009-surface-typecover.patch
-  0010-cameras.patch
-  0011-amd-gpio.patch
-  0012-rtc.patch
+  0010-surface-shutdown.patch
+  0011-cameras.patch
+  0012-amd-gpio.patch
+  0013-rtc.patch
 )
 )
 validpgpkeys=(
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -57,13 +58,14 @@ sha256sums=('SKIP'
             'bc590cef29474375788dd59c1eb16bf88290768a60da47a22b7be8176303ab7e'
             'bc590cef29474375788dd59c1eb16bf88290768a60da47a22b7be8176303ab7e'
             '0a44f437b67b747edfab3d9548b701f71976ebf50b38837d75d15ef06473b0f1'
             '0a44f437b67b747edfab3d9548b701f71976ebf50b38837d75d15ef06473b0f1'
             'f776871f76e01006390e44ff5eda6dd6d6f249a99672d8a5b286d93c910791cd'
             'f776871f76e01006390e44ff5eda6dd6d6f249a99672d8a5b286d93c910791cd'
-            'b74ca66fd5f6ad6fac7b5ba4da6836af1ceb891d4ec8ac1d168349a34d52c3d5'
-            'c7b7a03c602a41f29dfccb5c50c7d85337c832bd3ce9e863cd946d49476f7405'
-            'b370a5046875f7925bea9a2b2d7d316e764aa01b646680417ef7b56b5e20f527'
-            '1dc9f6ee084f34739fddad8388f8356f2497363b553eb8d91a4a73bbab813e2a'
-            '5be353a41d131d1fed2c09e8f9a543091b51b18c8a680b1239d55bd5cd4ffd67'
-            'd51451d6fc098c27b5dc28db69a1ea4836d2b814ec3ccc90f655888bddca4e1d'
-            '53486d5e31b295200b06b7ecc2a5a07f3698dff47118107660965a1627346686')
+            'f41c0940d09c7c0961c6885df8898eb6937e807ed11cb40836c1f7bdb2d70380'
+            'a326e5b3e2b1cb6614de0b171f713b92f650a4fa28c7ba365500a17734c84699'
+            'b6c4996e3a22509519532a10f5772e82ba1b2fa3be20572fd6c24b57611124b2'
+            '4ef3e8f22117a1f6740723e4c807989dc3c5bde20ac7b80ee2125da227b143ed'
+            '9c720debb5f7cfb0cd160d45cf899fea9f3f9204bf6493d150e79196d55e3cfd'
+            'f5a5202df9e4fc15a32d35e4bf31f84c86ffd9a4b311eaa85d4ba02bee38cf45'
+            '6babc749fc6fca71a54025e7e0cb136a2c72614b0581739489cd2ae0d7852bff'
+            'b844d817b39e75a279c0025414b8d79a07e626161d7ff4fb71bfa48685f614ca')
 
 
 
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_HOST=archlinux

+ 7 - 6
pkg/fedora/kernel-surface/kernel-surface.spec

@@ -5,8 +5,8 @@
 %global kernel_tag_fc37 kernel-6.1.12-200.fc37
 %global kernel_tag_fc37 kernel-6.1.12-200.fc37
 %global kernel_tag_fc36 kernel-6.1.12-100.fc36
 %global kernel_tag_fc36 kernel-6.1.12-100.fc36
 
 
-%global kernel_release_fc37 1
-%global kernel_release_fc36 1
+%global kernel_release_fc37 2
+%global kernel_release_fc36 2
 
 
 # This is what is printed in the GRUB menu. These cannot be fetched from the
 # 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
 # buildhost, because in a container this will also say container. To get the
@@ -14,7 +14,7 @@
 %global fedora_title_fc37 37 (Thirty Seven)
 %global fedora_title_fc37 37 (Thirty Seven)
 %global fedora_title_fc36 36 (Thirty Six)
 %global fedora_title_fc36 36 (Thirty Six)
 
 
-%global ls_patches_commit 0ee6e0d694a85817c7cbe56482cf6bd55a9253f3
+%global ls_patches_commit 90f0d914260faf094ab488945e2654279be999a1
 
 
 %global sb_crt surface.crt
 %global sb_crt surface.crt
 %global sb_key surface.key
 %global sb_key surface.key
@@ -103,9 +103,10 @@ Patch5:     %{surface_source}/%{kernel_patches}/0006-surface-sam.patch
 Patch6:     %{surface_source}/%{kernel_patches}/0007-surface-sam-over-hid.patch
 Patch6:     %{surface_source}/%{kernel_patches}/0007-surface-sam-over-hid.patch
 Patch7:     %{surface_source}/%{kernel_patches}/0008-surface-button.patch
 Patch7:     %{surface_source}/%{kernel_patches}/0008-surface-button.patch
 Patch8:     %{surface_source}/%{kernel_patches}/0009-surface-typecover.patch
 Patch8:     %{surface_source}/%{kernel_patches}/0009-surface-typecover.patch
-Patch9:     %{surface_source}/%{kernel_patches}/0010-cameras.patch
-Patch10:    %{surface_source}/%{kernel_patches}/0011-amd-gpio.patch
-Patch11:    %{surface_source}/%{kernel_patches}/0012-rtc.patch
+Patch9:     %{surface_source}/%{kernel_patches}/0010-surface-shutdown.patch
+Patch10:    %{surface_source}/%{kernel_patches}/0011-cameras.patch
+Patch11:    %{surface_source}/%{kernel_patches}/0012-amd-gpio.patch
+Patch12:    %{surface_source}/%{kernel_patches}/0013-rtc.patch
 
 
 Patch100:   0001-Add-secureboot-pre-signing-to-the-kernel.patch
 Patch100:   0001-Add-secureboot-pre-signing-to-the-kernel.patch