summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2020-04-08 15:42:56 +0200
committerPiotr Gorski2020-04-08 15:42:56 +0200
commit3aad2a140a4aaf39ad6d9c8df6f72a68610e19bc (patch)
tree0ce3a07e8c5a2ce293268c97b8b8b3504847d097
parent610dfbdfba0b3b13d117ba68d88a24b0493ba603 (diff)
downloadaur-3aad2a140a4aaf39ad6d9c8df6f72a68610e19bc.tar.gz
Bump to 5.6.3-1
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD16
-rw-r--r--config4
-rw-r--r--sphinx-workaround.patch13
4 files changed, 37 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a492d28dfe3f..999950969f01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-bfq
pkgdesc = Linux BFQ-dev
- pkgver = 5.6.2
- pkgrel = 3
+ pkgver = 5.6.3
+ pkgrel = 1
url = https://github.com/sirlucjan/bfq-mq-lucjan
arch = x86_64
license = GPL2
@@ -13,20 +13,24 @@ pkgbase = linux-bfq
makedepends = graphviz
makedepends = imagemagick
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.2.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.2.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.3.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.3.tar.sign
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.6/bfq-dev-lucjan/5.6-bfq-dev-lucjan-v11-r2K200330.patch
source = https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v5.5+.patch
- source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.6/arch-patches-v4/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.6/arch-patches-v5-sep/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.6/arch-patches-v5-sep/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch
+ source = sphinx-workaround.patch
source = config
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha512sums = 174e085eb14c64dedb15ea2186d0103baafce0653fe287b057b650e51cc3e5faa375a9224c046f2b2d3da995e1d79469c04d9ad666c91548790253b2078e2be7
+ sha512sums = d518a6451f8fe35d1baf01f7d831f8ce90665ab1793849c885b4efc873583f50f07d81b98b922c45817f6ed091b06e17cfc9c9dd291fbbc52ca2c544b7d6e089
sha512sums = SKIP
sha512sums = bb6892612524d0cd667048d4a3d8352b04fca0e65398dc96964cc29241c7167f5f3e7d8a1a10c8afa7167a374611f2f3dd57dab04ed351cbedc4fcac4103669c
sha512sums = 52b14ef834769d2b4567e756a4485995acd2e3f5b989cbb53f9b113b42ff67b736bbcb284b95fe15c9efb846fd12320a26a131e4ce9af50b521114d274b472f1
- sha512sums = 080850eb686f4b8162e348eacc54d6407c810e4430f574a0da009ff851f89e7bc442cfd107a4a4edf009de6dbd83f1cd9ce1c75a2140554b34f35ff0a81c8779
- sha512sums = 593bc1d9d6b43bb37d884fdaa073d024856c19f0002aae0f9bcace1f546c08e09dfced00caf7b6098750134ef166e5cbbebffcf7300c28085a37ec0da1160252
+ sha512sums = 8064aa16172a42a3f23cff6278056a5c2ff7fa6560f3b975e4a7dfd7ce5d00f15af851fd4ef1f40a78707aeaad5a1eef3012ef5f7fb9242ca584b3a230d343cd
+ sha512sums = e0b39955fd3a7d558aea0ad72ebcd59eb649c47d9270deea3130f7a3703aa4e319727ab97a95cd365e1e7fad0a9ab31fd0787b36a22858012af5f337153ab48f
+ sha512sums = 98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be
+ sha512sums = fb9188c7e5a2330eef2216bfb190585a0d1e624068f7a14ded774075428c927d54a5364ae2622ac08e51393f9ab2d7e62a41bb9245c0bd9cb61b4317bc0943ea
pkgname = linux-bfq
pkgdesc = The Linux BFQ-dev kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 14909d413935..7ea9fd63ec9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,10 +48,10 @@ _1k_HZ_ticks=
pkgbase=linux-bfq
# pkgname=('linux-bfq' 'linux-bfq-headers' 'linux-bfq-docs')
_major=5.6
-_minor=2
+_minor=3
pkgver=${_major}.${_minor}
_srcname=linux-${pkgver}
-pkgrel=3
+pkgrel=1
pkgdesc='Linux BFQ-dev'
arch=('x86_64')
url="https://github.com/sirlucjan/bfq-mq-lucjan"
@@ -78,7 +78,9 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
#"${_lucjanpath}/${_bfq_rev_path}/${_bfq_rev_patch}"
"${_lucjanpath}/${_bfq_path}/${_bfq_patch}"
"${_gcc_path}/${_gcc_patch}"
- "${_lucjanpath}/arch-patches-v4/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
+ "${_lucjanpath}/arch-patches-v5-sep/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
+ "${_lucjanpath}/arch-patches-v5-sep/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch"
+ 'sphinx-workaround.patch'
# the main kernel config files
'config')
@@ -320,12 +322,14 @@ for _p in "${pkgname[@]}"; do
}"
done
-sha512sums=('174e085eb14c64dedb15ea2186d0103baafce0653fe287b057b650e51cc3e5faa375a9224c046f2b2d3da995e1d79469c04d9ad666c91548790253b2078e2be7'
+sha512sums=('d518a6451f8fe35d1baf01f7d831f8ce90665ab1793849c885b4efc873583f50f07d81b98b922c45817f6ed091b06e17cfc9c9dd291fbbc52ca2c544b7d6e089'
'SKIP'
'bb6892612524d0cd667048d4a3d8352b04fca0e65398dc96964cc29241c7167f5f3e7d8a1a10c8afa7167a374611f2f3dd57dab04ed351cbedc4fcac4103669c'
'52b14ef834769d2b4567e756a4485995acd2e3f5b989cbb53f9b113b42ff67b736bbcb284b95fe15c9efb846fd12320a26a131e4ce9af50b521114d274b472f1'
- '080850eb686f4b8162e348eacc54d6407c810e4430f574a0da009ff851f89e7bc442cfd107a4a4edf009de6dbd83f1cd9ce1c75a2140554b34f35ff0a81c8779'
- '593bc1d9d6b43bb37d884fdaa073d024856c19f0002aae0f9bcace1f546c08e09dfced00caf7b6098750134ef166e5cbbebffcf7300c28085a37ec0da1160252')
+ '8064aa16172a42a3f23cff6278056a5c2ff7fa6560f3b975e4a7dfd7ce5d00f15af851fd4ef1f40a78707aeaad5a1eef3012ef5f7fb9242ca584b3a230d343cd'
+ 'e0b39955fd3a7d558aea0ad72ebcd59eb649c47d9270deea3130f7a3703aa4e319727ab97a95cd365e1e7fad0a9ab31fd0787b36a22858012af5f337153ab48f'
+ '98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be'
+ 'fb9188c7e5a2330eef2216bfb190585a0d1e624068f7a14ded774075428c927d54a5364ae2622ac08e51393f9ab2d7e62a41bb9245c0bd9cb61b4317bc0943ea')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
diff --git a/config b/config
index ab30a8f34aa9..41de943d83e0 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.2-arch1 Kernel Configuration
+# Linux/x86 5.6.3-arch1 Kernel Configuration
#
#
@@ -6709,7 +6709,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
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
new file mode 100644
index 000000000000..1aa3f1c8f66e
--- /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']
+