Fix

2 files changed, 13 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12d792202d00..d5038182bde2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Jul 27 19:20:34 UTC 2016
+# Thu Jul 28 14:21:02 UTC 2016
 pkgbase = linux-rt-bfq
 	pkgver = 4.6.4_rt8
-	pkgrel = 1
+	pkgrel = 2
 	url = http://algo.ing.unimo.it
 	arch = i686
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = linux-rt-bfq
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.6.0.patch
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.6.0.patch
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
-	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0004-blkck-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8-for-4.patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.6.0-v8/0004-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8-for-4.patch
 	source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
 	source = linux-rt-bfq.preset
 	source = change-default-console-loglevel.patch
diff --git a/PKGBUILD b/PKGBUILD
index 6beb084b124a..ac97b2e10e56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -55,7 +55,7 @@ _srcname=linux-4.6
 _pkgver=4.6.4
 _rtpatchver=rt8
 pkgver=${_pkgver}_${_rtpatchver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://algo.ing.unimo.it"
 license=('GPL2')
@@ -76,7 +76,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         "${_bfqpath}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfqrel}-4.6.0.patch"
         "${_bfqpath}/0002-block-introduce-the-BFQ-${_bfqrel}-I-O-sched-for-4.6.0.patch"
         "${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfqrel}-for.patch"
-        "${_bfqpath}/0004-blkck-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-${_bfqver}-for-4.patch"
+        "${_bfqpath}/0004-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-${_bfqver}-for-4.patch"
         "http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz"
         'linux-rt-bfq.preset'
         'change-default-console-loglevel.patch'
@@ -107,7 +107,7 @@ prepare() {
 
     ### Patch source with BFQ
         msg "Patching source with BFQ patches"
-        for p in "${srcdir}"/000{1,2,3,4}-bl*.patch; do
+        for p in "${srcdir}"/000{1,2,3,4}-block*.patch; do
         msg " $p"
         patch -Np1 -i "$p"
         done
@@ -316,7 +316,7 @@ package_linux-rt-bfq-headers() {
 	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include"
 
 	for i in acpi asm-generic config crypto drm generated keys linux math-emu \
-		media net pcmcia scsi sound trace uapi video xen; do
+		media net pcmcia scsi soc sound trace uapi video xen; do
 	cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
 	done
 
@@ -404,6 +404,12 @@ package_linux-rt-bfq-headers() {
 		mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'`
 		cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}"
 	done
+	
+	# add objtool for external module building and enabled VALIDATION_STACK option
+        if [ -f tools/objtool/objtool ];  then
+        mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool"
+        cp -a tools/objtool/objtool ${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool/ 
+        fi
 
 	chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build"
 	find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \;