summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOriginCode2020-04-09 00:09:05 +0800
committerOriginCode2020-04-09 00:09:05 +0800
commitabe1ee86afc9399914230554d5b5d8663b3d5569 (patch)
tree0ab5eb1d53ce7df0ee0800e33402d4c8d10cd8d5
parenteb2fff2fb827a8aa1ed219593f828205096e89bd (diff)
downloadaur-abe1ee86afc9399914230554d5b5d8663b3d5569.tar.gz
update
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD8
-rw-r--r--config8
-rw-r--r--sphinx-workaround.patch13
4 files changed, 29 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ff53733d66d..3c813021197 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-froidzen
pkgdesc = Linux ZEN with Patches
- pkgver = 5.6.2.zen1
- pkgrel = 3
- url = https://github.com/zen-kernel/zen-kernel/commits/v5.6.2-zen1
+ pkgver = 5.6.3.zen1
+ pkgrel = 1
+ url = https://github.com/zen-kernel/zen-kernel/commits/v5.6.3-zen1
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,15 +15,17 @@ pkgbase = linux-froidzen
makedepends = imagemagick
makedepends = git
options = !strip
- source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.6.2-zen1
+ source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.6.3-zen1
source = config
+ source = sphinx-workaround.patch
source = aosc-univt.patch::https://raw.githubusercontent.com/AOSC-Dev/aosc-os-abbs/testing/extra-kernel/linux-kernel/autobuild/patches/8000-aosc-feature-univt.patch
source = https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.6.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = e09c8bba54dbf62792a1842ee8ef5caf7d6b23949b89d9ee0d49d20f6117b34d
+ sha256sums = 0dd347ae6e569be9a6e110a018565020e11b8003ffd33b2f16b06d73ada41d84
+ sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = 2b499db6a7ba4926619dfc854dbd947f3e9720b39b7c2f6902b7a7b70eb856f2
sha256sums = 38044055a721c9c5a7bb67e5d1ba95d0585f63c83cc41af429efa60d6e0c718a
diff --git a/PKGBUILD b/PKGBUILD
index 88aa7192e92..1d114d2b819 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-froidzen
-pkgver=5.6.2.zen1
-pkgrel=3
+pkgver=5.6.3.zen1
+pkgrel=1
pkgdesc='Linux ZEN with Patches'
_srctag=v${pkgver%.*}-${pkgver##*.}
url="https://github.com/zen-kernel/zen-kernel/commits/$_srctag"
@@ -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/testing/extra-kernel/linux-kernel/autobuild/patches/8000-aosc-feature-univt.patch" # CJK Patch
"https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.6.patch" # UKSM Patch
)
@@ -27,7 +28,8 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- 'e09c8bba54dbf62792a1842ee8ef5caf7d6b23949b89d9ee0d49d20f6117b34d'
+ '0dd347ae6e569be9a6e110a018565020e11b8003ffd33b2f16b06d73ada41d84'
+ '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
'2b499db6a7ba4926619dfc854dbd947f3e9720b39b7c2f6902b7a7b70eb856f2'
'38044055a721c9c5a7bb67e5d1ba95d0585f63c83cc41af429efa60d6e0c718a')
diff --git a/config b/config
index 6d851d85878..eb1f4482e14 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.2-zen1 Kernel Configuration
+# Linux/x86 5.6.3-zen1 Kernel Configuration
#
#
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_SCHED_MUQSS is not set
+CONFIG_SCHED_MUQSS=y
CONFIG_ZEN_INTERACTIVE=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
@@ -6718,7 +6718,7 @@ CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_DEBUG=y
# CONFIG_SND_DEBUG_VERBOSE is not set
# CONFIG_SND_PCM_XRUN_DEBUG is not set
-CONFIG_SND_CTL_VALIDATION=y
+# CONFIG_SND_CTL_VALIDATION is not set
CONFIG_SND_VMASTER=y
CONFIG_SND_DMA_SGBUF=y
CONFIG_SND_SEQUENCER=m
@@ -10052,7 +10052,7 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="yama"
+CONFIG_LSM="lockdown,yama"
#
# Kernel hardening options
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']
+