summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2018-04-27 00:29:12 +0200
committerPiotr Gorski2018-04-27 00:29:12 +0200
commit041eb79a4416e616295e494c6b35657f418e2cb5 (patch)
treea5b413c99d146e513c2e3211511b711a07720d66
parentb168260850b564becac48aee6c6ea31ffd86f370 (diff)
downloadaur-041eb79a4416e616295e494c6b35657f418e2cb5.tar.gz
Fixed apply error from SUBLEVEL version
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cfbaf5ba840e..cd8b59c21197 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-rt-bfq
pkgver = 4.14.34.27
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Algodev-github/bfq-mq/
arch = x86_64
license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index b893bc0ac924..8210f90a7503 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,9 +64,8 @@ _srcname=linux-4.14
_pkgver=4.14.34
_rtver=27
_rtpatchver=rt${_rtver}
-_srcpatch="${_pkgver##*\.*\.}"
pkgver=${_pkgver}.${_rtver}
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url="https://github.com/Algodev-github/bfq-mq/"
license=('GPL2')
@@ -138,11 +137,13 @@ prepare() {
patch -p1 -i ../fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch
### Patch source with BFQ-SQ-MQ
+ _ver1="$(cat Makefile | grep -m1 -e PATCHLEVEL | grep -o "[[:digit:]]*")"
+ _ver2="$(cat Makefile | grep -m1 -e SUBLEVEL | grep -o "[[:digit:]]*")"
msg "Fix patching with 20180109"
patch -Np1 -i ../0009-bfq-sq-mq-fix-patching-error-with-20180109.patch
msg "Fix naming schema in BFQ-SQ-MQ patch"
- sed -i -e "s|PATCHLEVEL = 15|PATCHLEVEL = 14|g" \
- -i -e "s|SUBLEVEL = 0|SUBLEVEL = ${_srcpatch}|g" \
+ sed -i -e "s|PATCHLEVEL = 15|PATCHLEVEL = ${_ver1}|g" \
+ -i -e "s|SUBLEVEL = 0|SUBLEVEL = ${_ver2}|g" \
-i -e "s|EXTRAVERSION = -bfq|EXTRAVERSION =|g" \
-i -e "s|EXTRAVERSION =-mq|EXTRAVERSION =|g" \
-i -e "s|NAME = Fearless Coyote|NAME = Petit Gorille|g" ../${_bfq_sq_mq_patch}