diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 4.14-npfeiler-task_struct-mm_segment_t.patch | 12 | ||||
-rw-r--r-- | PKGBUILD | 13 |
3 files changed, 26 insertions, 7 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Sun Jan 21 20:27:03 UTC 2018 pkgbase = catalyst-generator pkgdesc = AMD/ATI drivers. Generator of catalyst-{kernver} packages with fglrx module inside. pkgver = 15.9 - pkgrel = 17 + pkgrel = 18 url = http://www.amd.com install = catalyst-generator.install arch = i686 @@ -13,7 +15,7 @@ pkgbase = catalyst-generator depends = make depends = patch depends = linux>=3.0 - depends = linux<4.14 + depends = linux<4.15 depends = linux-headers optdepends = linux-headers: to build the fglrx module for the linux kernel optdepends = linux-lts-headers: to build the fglrx module for the linux-lts kernel @@ -53,6 +55,7 @@ pkgbase = catalyst-generator source = 4.12-arch-remove_clts.patch source = 4.12-npfeiler-movsl_mask.patch source = 4.13-npfeiler-wait_queue_t.patch + source = 4.14-npfeiler-task_struct-mm_segment_t.patch md5sums = d2de2df6946b452c266a3c892e6e46ff md5sums = 543e818f543f2897beca49101226e460 md5sums = a555dc9a3eb062d7ca4efbf7e0713a3a @@ -79,6 +82,7 @@ pkgbase = catalyst-generator md5sums = 782769206ed12ded10c347be3e476729 md5sums = cb25bc7fbb7d5cb1c07d2f3fa5fda826 md5sums = 0a725f40bc980d578cbed3e57a05b765 + md5sums = 5ba3bf9f58aa63c1849b056cf23022c9 pkgname = catalyst-generator diff --git a/4.14-npfeiler-task_struct-mm_segment_t.patch b/4.14-npfeiler-task_struct-mm_segment_t.patch new file mode 100644 index 000000000000..d90d4f3c509a --- /dev/null +++ b/4.14-npfeiler-task_struct-mm_segment_t.patch @@ -0,0 +1,12 @@ +--- archive_files/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2017-12-05 16:21:41.450899943 +0100
++++ archive_filesb/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2017-12-05 16:24:04.919602271 +0100
+@@ -31,7 +31,9 @@
+ */
+
+ #include <linux/cache.h>
++#include <linux/sched.h> // for task_struct in asm/current.h
+ #include <linux/version.h>
++#include <asm/processor.h> // for mm_segment_t in asm/uaccess.h
+ #include <asm/uaccess.h>
+
+ #ifdef __x86_64__
@@ -13,19 +13,19 @@ # Contributor: gentoo (part of 4.3 kernel patches) # Contributor: Philip Muller @ Manjaro (4.4 kernel patch) # Contributor: sling00 (4.10 kernel patch) -# Contributor: npfeiler (4.11, 4.12 and 4.13 kernel patch) +# Contributor: npfeiler (4.11, 4.12, 4.13 and 4.14 kernel patch) pkgname=catalyst-generator pkgver=15.9 -pkgrel=17 +pkgrel=18 _amdver=15.201.1151 pkgdesc="AMD/ATI drivers. Generator of catalyst-{kernver} packages with fglrx module inside." arch=('i686' 'x86_64') url="http://www.amd.com" license=('custom') options=('staticlibs' 'libtool' '!strip' '!upx') -depends=('catalyst-utils' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'linux>=3.0' 'linux<4.14' 'linux-headers') +depends=('catalyst-utils' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'linux>=3.0' 'linux<4.15' 'linux-headers') optdepends=('linux-headers: to build the fglrx module for the linux kernel' 'linux-lts-headers: to build the fglrx module for the linux-lts kernel') conflicts=('catalyst-test' 'catalyst-hook' 'catalyst' 'catalyst-daemon' 'catalyst-dkms') @@ -61,7 +61,8 @@ source=( 4.12-npfeiler-PUD_OFFSET.patch 4.12-arch-remove_clts.patch 4.12-npfeiler-movsl_mask.patch - 4.13-npfeiler-wait_queue_t.patch) + 4.13-npfeiler-wait_queue_t.patch + 4.14-npfeiler-task_struct-mm_segment_t.patch) md5sums=('d2de2df6946b452c266a3c892e6e46ff' '543e818f543f2897beca49101226e460' @@ -88,7 +89,8 @@ md5sums=('d2de2df6946b452c266a3c892e6e46ff' 'f090e47160403e4ba65d1e0de69973c9' '782769206ed12ded10c347be3e476729' 'cb25bc7fbb7d5cb1c07d2f3fa5fda826' - '0a725f40bc980d578cbed3e57a05b765') + '0a725f40bc980d578cbed3e57a05b765' + '5ba3bf9f58aa63c1849b056cf23022c9') build() { @@ -120,6 +122,7 @@ package() { patch -Np1 -i ../4.12-arch-remove_clts.patch patch -Np1 -i ../4.12-npfeiler-movsl_mask.patch patch -Np1 -i ../4.13-npfeiler-wait_queue_t.patch + patch -Np1 -i ../4.14-npfeiler-task_struct-mm_segment_t.patch # Prepare modules source files _archdir=x86_64 |