فهرست منبع

Update to kernel 5.10.6

Except for Fedora 32, that isnt rebased yet

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
Dorian Stoll 4 سال پیش
والد
کامیت
cdbe9d7e5a
3فایلهای تغییر یافته به همراه14 افزوده شده و 6 حذف شده
  1. 1 1
      .github/workflows/debian.yml
  2. 2 2
      pkg/arch/kernel/PKGBUILD
  3. 11 3
      pkg/fedora/kernel-surface/kernel-surface.spec

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

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

+ 2 - 2
pkg/arch/kernel/PKGBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-surface
-pkgver=5.10.5.arch1
+pkgver=5.10.6.arch1
 pkgrel=1
 pkgdesc='Linux'
 _shortver=${pkgver%.*}
@@ -42,7 +42,7 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
   'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
 )
-sha256sums=('5462a06bac4235c73db20f8fecd51b93652d6e23b980a3e9fd87369f04649487'
+sha256sums=('a7756153abaff9107bb626a273aa252df65cc96a2800e4886bf6722c506feea7'
             '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a'
             '1d5a8adeccac83eba0c86fa553b7907add1c5b343e45a8b92daf654e07ccd299'
             '8cd2b019aac6d3807a5cdcbbbe0aad81e63193ff3e8dffd7a79d4a1421b858f6'

+ 11 - 3
pkg/fedora/kernel-surface/kernel-surface.spec

@@ -2,7 +2,7 @@
 # Definitions to configure the kernel we want to build
 #
 
-%global kernel_tag_fc33 kernel-5.9.16-200.fc33
+%global kernel_tag_fc33 kernel-5.10.6-200.fc33
 %global kernel_tag_fc32 kernel-5.9.16-100.fc32
 
 %global kernel_release_fc33 1
@@ -11,7 +11,7 @@
 %global fedora_title_fc33 33 (Thirty Three)
 %global fedora_title_fc32 32 (Thirty Two)
 
-%global ls_patches_commit 819ca444a9abdbc8ff741b6ece336aca51e548f9
+%global ls_patches_commit de9f91813811dbc8349ee1af72b662142b2a82ec
 
 %global sb_crt surface.crt
 %global sb_key surface.key
@@ -93,6 +93,10 @@ Patch5:     %{surface_source}/%{kernel_patches}/0006-surface-sam.patch
 Patch6:     %{surface_source}/%{kernel_patches}/0007-surface-hotplug.patch
 Patch7:     %{surface_source}/%{kernel_patches}/0008-surface-typecover.patch
 
+%if "%{kernel_majorver}" == "5.10"
+Patch8:     %{surface_source}/%{kernel_patches}/0009-cameras.patch
+%endif
+
 Patch100:   0001-Add-secureboot-pre-signing-to-the-kernel.patch
 
 ExclusiveArch: x86_64
@@ -115,7 +119,7 @@ This package provides kernel headers and makefiles sufficient to build modules
 against the kernel-surface package.
 
 %prep
-%autosetup -S git -n linux-fedora-%{kernel_tag}
+%autosetup -S git_am -n linux-fedora-%{kernel_tag}
 
 scripts/kconfig/merge_config.sh         \
 	fedora/configs/%{kernel_config} \
@@ -152,7 +156,11 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
 	tools/perf/scripts/python/stat-cpi.py \
 	tools/perf/scripts/python/sched-migration.py \
 	Documentation \
+%if "%{kernel_majorver}" == "5.10"
+	scripts/clang-tools
+%else
 	scripts/gen_compile_commands.py
+%endif
 
 %build