diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-03-08 12:45:35 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-03-08 12:45:35 -0800 |
| commit | 378560eab44be87c0595bbd91c7a817f55f6d3c6 (patch) | |
| tree | bcb41542841f9fd5a69af798aee534e4fa69746a | |
| parent | Updated to 5.11.3 (diff) | |
| download | linux-378560eab44be87c0595bbd91c7a817f55f6d3c6.tar.xz | |
Updated to 5.11.4
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | sphinx-workaround.patch | 19 |
2 files changed, 4 insertions, 26 deletions
@@ -15,8 +15,8 @@ pkgbase=linux _supver=5 _majver=11 -_minver=3 -_gccpatchver='20201113' +_minver=4 +_gccpatchver='20210307' _gccpatchger='10.1' _gccpatchker='5.8' if [ "$_minver" == "0" ]; then @@ -39,7 +39,6 @@ _srcname=linux-${pkgver} source=( https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign} config # the main kernel config file - sphinx-workaround.patch # Sphinx 3.5 broke the build again 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch @@ -50,12 +49,11 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -b2sums=('9451bda48221ea58096682a4ce107194580a6fcaccb15d62b881c2ba8eddadbd46b010b20e2fa8e723674de0d29dd0a12749c9245db39b521659bc6cf2f270c5' +b2sums=('6d1cf5f10442c3d7c849f89d27eb92704d1b5c0b449d1ab8b332a373387a0f9cdf971c1ab0d83b3c911aad18c097908bd73c7c478da238da7b6396a434df7816' 'SKIP' 'f75aaf855288bed1d0d6ecaba834aa8d6309511317ac7d55b1954ca5a97e2cd9e14e58ec2ef7d76e8779c564ddcf813e6ac03d5b9297007012d8b9dca58b0e98' - 'db64b425139c107c69f44624901ae50b5e604d4c9fdfe84f78c298f8ed7a7739033a72ec678c5c3c0e82e59809d97799d0c25f96c64ef5ae79910cb890fc7bfb' '2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f' - '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127' + 'e1daf14455f2fda1610be7ef0bcee630c9735ef32b2d879483a312f66490d990afd5179d203ee5d6678127ff358961b9c00292719df041339cdbaa7167da3e87' 'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a') @@ -76,7 +74,6 @@ prepare() { # Hotfixes echo "Applying hotfixes" patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - patch -p1 -i ../sphinx-workaround.patch # graysky gcc patch diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch deleted file mode 100644 index a6e2c49..0000000 --- a/sphinx-workaround.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git i/Documentation/conf.py w/Documentation/conf.py -index 6a767294887e..d1d145759fed 100644 ---- i/Documentation/conf.py -+++ w/Documentation/conf.py -@@ -267,11 +267,9 @@ except ImportError: - - html_static_path = ['sphinx-static'] - --html_context = { -- 'css_files': [ -- '_static/theme_overrides.css', -- ], --} -+html_css_files = [ -+ '_static/theme_overrides.css', -+] - - # Add any extra paths that contain custom files (such as robots.txt or - # .htaccess) here, relative to this directory. These files are copied |