summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOriginCode2020-06-18 08:57:57 +0800
committerOriginCode2020-06-18 08:57:57 +0800
commit516fd1741358a48cd152836f780a571acc6c7cfa (patch)
tree3f4793374ae7f16646f429583956d7b1503e51b8
parentdc95c9e732d6ae183bb57a71c1e67a077579da49 (diff)
downloadaur-516fd1741358a48cd152836f780a571acc6c7cfa.tar.gz
linux-froidzen: 5.7.3-zen1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD6
-rw-r--r--config3
-rw-r--r--sphinx-workaround.patch13
4 files changed, 25 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 093fc3ef555..86bec97c372 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-froidzen
pkgdesc = Linux ZEN with Patches
- pkgver = 5.7.2.zen1
+ pkgver = 5.7.3.zen1
pkgrel = 1
- url = https://github.com/zen-kernel/zen-kernel/commits/v5.7.2-zen1
+ url = https://github.com/zen-kernel/zen-kernel/commits/v5.7.3-zen1
arch = x86_64
license = GPL2
makedepends = bc
@@ -16,15 +16,17 @@ pkgbase = linux-froidzen
makedepends = imagemagick
makedepends = git
options = !strip
- source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.7.2-zen1
+ source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.7.3-zen1
source = config
+ source = sphinx-workaround.patch
source = aosc-univt.patch::https://raw.githubusercontent.com/AOSC-Dev/aosc-os-abbs/stable-proposed/extra-kernel/linux-kernel/autobuild/patches/8000-aosc-feature-univt.patch
source = https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.7.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP
- sha256sums = 761ee8a79e82e0e89190e3c1c7d6b7fe64be4338f614ae6a9b2da8683a31d03d
+ sha256sums = 8ced8898bdc2cab62be943495721a75a1b6b8f469b3e0b590cdd3f42184595e5
+ sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = 2d827875db540356c18b604f9f9ac7178bcf0ec605672e29d99d7eeb1ae9721d
sha256sums = c28dc0d30bba3eedae9f5cf98a686bdfb25a0326df4e8c417d37a36597d21b37
diff --git a/PKGBUILD b/PKGBUILD
index aa43ead843d..56a1fd20e20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: OriginCode <self@origincode.me>
pkgbase=linux-froidzen
-pkgver=5.7.2.zen1
+pkgver=5.7.3.zen1
pkgrel=1
pkgdesc='Linux ZEN with Patches'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -18,6 +18,7 @@ _srcname=zen-kernel
source=(
"$_srcname::git+https://github.com/zen-kernel/zen-kernel?signed#tag=$_srctag"
config # the main kernel config file
+ sphinx-workaround.patch
"aosc-univt.patch::https://raw.githubusercontent.com/AOSC-Dev/aosc-os-abbs/stable-proposed/extra-kernel/linux-kernel/autobuild/patches/8000-aosc-feature-univt.patch" # CJK Patch
"https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.7.patch" # UKSM Patch
)
@@ -27,7 +28,8 @@ validpgpkeys=(
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- '761ee8a79e82e0e89190e3c1c7d6b7fe64be4338f614ae6a9b2da8683a31d03d'
+ '8ced8898bdc2cab62be943495721a75a1b6b8f469b3e0b590cdd3f42184595e5'
+ '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
'2d827875db540356c18b604f9f9ac7178bcf0ec605672e29d99d7eeb1ae9721d'
'c28dc0d30bba3eedae9f5cf98a686bdfb25a0326df4e8c417d37a36597d21b37')
diff --git a/config b/config
index 93bb9c8587c..1c6c4d51bc3 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.7.1-zen1 Kernel Configuration
+# Linux/x86 5.7.3-zen1 Kernel Configuration
#
#
@@ -4447,6 +4447,7 @@ CONFIG_I2C_ISCH=m
CONFIG_I2C_ISMT=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_CHT_WC=m
+CONFIG_I2C_NCT6775=m
CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_NVIDIA_GPU=m
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
new file mode 100644
index 00000000000..1aa3f1c8f66
--- /dev/null
+++ b/sphinx-workaround.patch
@@ -0,0 +1,13 @@
+diff --git i/Documentation/conf.py w/Documentation/conf.py
+index 3c7bdf4cd31f..9a0ced58a3e9 100644
+--- i/Documentation/conf.py
++++ w/Documentation/conf.py
+@@ -36,7 +36,7 @@ needs_sphinx = '1.3'
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
+ 'kfigure', 'sphinx.ext.ifconfig', 'automarkup',
+ 'maintainers_include']
+