summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
2 files changed, 10 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6228ea82a63c..005d3814dae3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-rt-bfq
pkgver = 4.16.15.7
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Algodev-github/bfq-mq/
arch = x86_64
license = GPL2
@@ -15,7 +15,7 @@ pkgbase = linux-rt-bfq
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.15.sign
source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.15-rt7.patch.xz
source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.15-rt7.patch.sign
- source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/4.16-bfq-sq-mq-git-20180531-v2.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/bfq-sq-mq/4.16-bfq-sq-mq-v8r12-2K180531-v3.patch
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/0006-include-linux-add-gcc8-support.patch
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/0100-Check-presence-on-tree-of-every-entity-after-every-a.patch
source = kernel_gcc_patch-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz
@@ -39,7 +39,7 @@ pkgbase = linux-rt-bfq
sha512sums = SKIP
sha512sums = 72e3418d30a1818921647543c150c634a492395aee86f581606be6ae91e9bb2e712c5fc1154f584b40639a0e84c8c40c0113db1bfedb664e308153caa89305cb
sha512sums = SKIP
- sha512sums = eac92c83cee6907f155434f8373a0ef2dbff9095d3aa7b8b0bd383d6dda03fe52c8f79cf6933e55e6b668cb762b3babbfc40fe801d2a2440e92d3200ced2b4e0
+ sha512sums = c3a9975f301a3eb54a4a56d7d9ffbe2d3d886047d8a12460ccd6a6dfc13c25482055018f47d5f3fb1b77e4d467a583f4eec11e264ed5408bd1114b04454feb48
sha512sums = 9737f30e748e043a1b6ab56bd0df6dc9607b4a2749243e599f5563b157aaf339ad43020a526a11a6fc809cc1abe50ac1cb12188bf5b367f6458fa0dbc2c1824d
sha512sums = 0f96fa9ad784709973b32eea82075ceb3e9dc2482df6441a4607612806f069254e63508b1b562279622394e4a1fbebef1b87af8401c0b1210d5d0de9954245c8
sha512sums = a0f37a9b8dbd11f8ef4450b06afee0a6e5519cb5a5cd78f84896812b007ef645bcb9c733ae9817c24d1f4a4c2114258015abceb5a94c7e08d2bb00531a6f04c7
diff --git a/PKGBUILD b/PKGBUILD
index af44d40c0b52..b222ca98915e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,14 +64,16 @@ _rtver=7
pkgver=${_major}.${_minor}.${_rtver}
_pkgver=${_major}.${_minor}
_rtpatchver=rt${_rtver}
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url="https://github.com/Algodev-github/bfq-mq/"
license=('GPL2')
options=('!strip')
makedepends=('kmod' 'inetutils' 'bc' 'libelf')
-_bfq_sq_mq_ver='20180531-v2'
-_bfq_sq_mq_patch="${_major}-bfq-sq-mq-git-${_bfq_sq_mq_ver}.patch"
+_bfq_sq_mq_path="bfq-sq-mq"
+_bfq_sq_mq_ver='v8r12'
+_bfq_sq_mq_rel='2K180531-v3'
+_bfq_sq_mq_patch="${_major}-bfq-sq-mq-${_bfq_sq_mq_ver}-${_bfq_sq_mq_rel}.patch"
#_lucjanpath="https://raw.githubusercontent.com/sirlucjan/kernel-patches/master/${_major}"
_lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/${_major}"
_gcc_name="kernel_gcc_patch"
@@ -85,7 +87,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${_pkgver}.sign"
"http://www.kernel.org/pub/linux/kernel/projects/rt/${_major}/patch-${_pkgver}-${_rtpatchver}.patch.xz"
"http://www.kernel.org/pub/linux/kernel/projects/rt/${_major}/patch-${_pkgver}-${_rtpatchver}.patch.sign"
- "${_lucjanpath}/${_bfq_sq_mq_patch}"
+ "${_lucjanpath}/${_bfq_sq_mq_path}/${_bfq_sq_mq_patch}"
"${_lucjanpath}/0006-include-linux-add-gcc8-support.patch"
"${_lucjanpath}/0100-Check-presence-on-tree-of-every-entity-after-every-a.patch"
"${_gcc_name}-${_gcc_rel}.tar.gz::${_gcc_path}/${_gcc_rel}.tar.gz"
@@ -140,11 +142,6 @@ prepare() {
patch -p1 -i ../fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch
### Patch source with BFQ-SQ-MQ
- _ver="$(cat Makefile | grep -m1 -e SUBLEVEL | grep -o "[[:digit:]]*")"
- msg "Fix naming schema in BFQ-SQ-MQ patch"
- sed -i -e "s|SUBLEVEL = 0|SUBLEVEL = ${_ver}|g" \
- -i -e "s|EXTRAVERSION = -bfq|EXTRAVERSION =|g" \
- -i -e "s|EXTRAVERSION =-mq|EXTRAVERSION =|g" ../${_bfq_sq_mq_patch}
msg "Patching source with BFQ-SQ-MQ patches"
patch -Np1 -i ../${_bfq_sq_mq_patch}
@@ -423,7 +420,7 @@ sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2
'SKIP'
'72e3418d30a1818921647543c150c634a492395aee86f581606be6ae91e9bb2e712c5fc1154f584b40639a0e84c8c40c0113db1bfedb664e308153caa89305cb'
'SKIP'
- 'eac92c83cee6907f155434f8373a0ef2dbff9095d3aa7b8b0bd383d6dda03fe52c8f79cf6933e55e6b668cb762b3babbfc40fe801d2a2440e92d3200ced2b4e0'
+ 'c3a9975f301a3eb54a4a56d7d9ffbe2d3d886047d8a12460ccd6a6dfc13c25482055018f47d5f3fb1b77e4d467a583f4eec11e264ed5408bd1114b04454feb48'
'9737f30e748e043a1b6ab56bd0df6dc9607b4a2749243e599f5563b157aaf339ad43020a526a11a6fc809cc1abe50ac1cb12188bf5b367f6458fa0dbc2c1824d'
'0f96fa9ad784709973b32eea82075ceb3e9dc2482df6441a4607612806f069254e63508b1b562279622394e4a1fbebef1b87af8401c0b1210d5d0de9954245c8'
'a0f37a9b8dbd11f8ef4450b06afee0a6e5519cb5a5cd78f84896812b007ef645bcb9c733ae9817c24d1f4a4c2114258015abceb5a94c7e08d2bb00531a6f04c7'