config updated, patch updated

4 files changed, 22 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 687582c26c1f..b016ad7a068f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-raspberrypi4-cacule-stable
 	pkgdesc = Raspberry Pi 4 Kernel with the cacule schedeuler, aarch64 and armv7
 	pkgver = 5.11.11
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.kernel.org/
 	arch = armv7h
 	arch = aarch64
@@ -13,29 +13,29 @@ pkgbase = linux-raspberrypi4-cacule-stable
 	makedepends = bc
 	makedepends = git
 	options = !strip
-	source = https://github.com/raspberrypi/linux/archive/42498e202032b40765d184c1b9cb296dbe7fa614.tar.gz
+	source = https://github.com/raspberrypi/linux/archive/05ad8a29d5dadb2db0b809e6cc1ee3d8d6380f61.tar.gz
 	source = cmdline.txt
 	source = linux.preset
 	source = 60-linux.hook
 	source = 90-linux.hook
 	source = 0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
 	source = cacule-5.11.patch
-	source = cacule-32bit-converter.patch
-	md5sums = f60679863eb897ade6d0b70115e2073d
+	md5sums = 7d2fa3944b651baa54cc79823b09a6b3
 	md5sums = 31c02f4518d46deb5f0c2ad1f8b083cd
 	md5sums = 86d4a35722b5410e3b29fc92dae15d4b
 	md5sums = ce6c81ad1ad1f8b333fd6077d47abdaf
 	md5sums = 441ec084c47cddc53e592fb0cbce4edf
 	md5sums = f66a7ea3feb708d398ef57e4da4815e9
 	md5sums = b85d9c75a137a4278537386ca274da9d
-	md5sums = 02808e3fb2f6b142e0cd9f1ae50a8d46
 	source_armv7h = config
 	source_armv7h = config.txt
-	md5sums_armv7h = bd3a20eadf06cd78d4180fe9547078dd
+	source_armv7h = cacule-32bit-converter.patch
+	md5sums_armv7h = 700675c55dc17c9b56413b8736a6cad9
 	md5sums_armv7h = 9669d916a5929a2eedbd64477f83d99e
+	md5sums_armv7h = 02808e3fb2f6b142e0cd9f1ae50a8d46
 	source_aarch64 = config8
 	source_aarch64 = config8.txt
-	md5sums_aarch64 = 7f8fa6b39f7efcaa55c873e4263eb55a
+	md5sums_aarch64 = 5f5c0d40ad2f5010270905bb65e36886
 	md5sums_aarch64 = 9669d916a5929a2eedbd64477f83d99e
 
 pkgname = linux-raspberrypi4-cacule-stable
diff --git a/PKGBUILD b/PKGBUILD
index 148d2def699c..360708cb4677 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@
 buildarch=12
 
 pkgbase=linux-raspberrypi4-cacule-stable
-_commit=42498e202032b40765d184c1b9cb296dbe7fa614
+_commit=05ad8a29d5dadb2db0b809e6cc1ee3d8d6380f61
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi 4 with the cacule scheduler"
 pkgver=5.11.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Raspberry Pi 4 Kernel with the cacule schedeuler, aarch64 and armv7"
 arch=('armv7h' 'aarch64')
 url="http://www.kernel.org/"
@@ -26,21 +26,20 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         '90-linux.hook'
         '0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch'
         'cacule-5.11.patch'
-        'cacule-32bit-converter.patch' #only use if building for armv7
         )
-source_armv7h=('config' 'config.txt')
+source_armv7h=('config' 'config.txt' 'cacule-32bit-converter.patch')
 source_aarch64=('config8' 'config8.txt')
-md5sums=('f60679863eb897ade6d0b70115e2073d'
+md5sums=('7d2fa3944b651baa54cc79823b09a6b3'
          '31c02f4518d46deb5f0c2ad1f8b083cd'
          '86d4a35722b5410e3b29fc92dae15d4b'
          'ce6c81ad1ad1f8b333fd6077d47abdaf'
          '441ec084c47cddc53e592fb0cbce4edf'
          'f66a7ea3feb708d398ef57e4da4815e9'
-         'b85d9c75a137a4278537386ca274da9d'
-         '02808e3fb2f6b142e0cd9f1ae50a8d46')
-md5sums_armv7h=('bd3a20eadf06cd78d4180fe9547078dd'
-                '9669d916a5929a2eedbd64477f83d99e')
-md5sums_aarch64=('7f8fa6b39f7efcaa55c873e4263eb55a'
+         'b85d9c75a137a4278537386ca274da9d')
+md5sums_armv7h=('700675c55dc17c9b56413b8736a6cad9'
+                '9669d916a5929a2eedbd64477f83d99e'
+                '02808e3fb2f6b142e0cd9f1ae50a8d46')
+md5sums_aarch64=('5f5c0d40ad2f5010270905bb65e36886'
                  '9669d916a5929a2eedbd64477f83d99e')
 
 # setup vars
@@ -63,7 +62,9 @@ prepare() {
   patch -Np1 -i ../0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
   # cacule-scheduler
   patch -Np1 -i ../cacule-5.11.patch
+  if [[ $CARCH == "armv7h" ]]; then
   patch -Np1 -i ../cacule-32bit-converter.patch #only needed if building on armv6 or armv7
+  fi
 }
 
 build() {
diff --git a/config b/config
index 2e9a66454eee..6858fa89c6b4 100644
--- a/config
+++ b/config
@@ -143,8 +143,8 @@ CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=n
-CONFIG_CFS_BANDWIDTH=n
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
 CONFIG_CACULE_SCHED=y
 CONFIG_CACULE_RDB=n
 # CONFIG_RT_GROUP_SCHED is not set
diff --git a/config8 b/config8
index 1b7df7b6aa0d..4eedd4ab4493 100644
--- a/config8
+++ b/config8
@@ -142,8 +142,8 @@ CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=n
-CONFIG_CFS_BANDWIDTH=n
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
 CONFIG_CACULE_SCHED=y
 CONFIG_CACULE_RDB=n
 # CONFIG_RT_GROUP_SCHED is not set