From f62f84309ed7f65bf3929df065936f3c2f902fc3 Mon Sep 17 00:00:00 2001
From: graysky <therealgraysky@proton.me>
Date: Sun, 25 Aug 2024 06:45:34 -0400
Subject: [PATCH] core/linux-rpi to 6.6.47-2

Build CONFIG_NETFILTER_XT_MATCH_CGROUP as module.
https://archlinuxarm.org/forum/viewtopic.php?f=23&t=17045
---
 core/linux-rpi/PKGBUILD           | 8 ++++----
 core/linux-rpi/archarm.diffconfig | 1 +
 core/linux-rpi/config             | 2 +-
 core/linux-rpi/config8            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/linux-rpi/PKGBUILD b/core/linux-rpi/PKGBUILD
index c526f09d1..775f737e5 100644
--- a/core/linux-rpi/PKGBUILD
+++ b/core/linux-rpi/PKGBUILD
@@ -10,7 +10,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _regen=
 pkgver=6.6.47
-pkgrel=1
+pkgrel=2
 pkgdesc='Linux'
 url="https://github.com/raspberrypi/linux"
 arch=(armv7h aarch64)
@@ -35,9 +35,9 @@ md5sums=('d9086a6018ff7f3c94cd037862c3d26f'
          '16c484af9f72b9275afcf83a6b8eab36'
          'a157c5bfc0f03d0728c92bd953b06265'
          '8b93b6ca167f70c60277f352f7b78024'
-         '87526ee83367947d179edb373009a7d6')
-md5sums_armv7h=('5b1669dbd61452d7820b0ab2cbf30a99')
-md5sums_aarch64=('27e826732ed8bc2c02ae400a44b46f19')
+         '467709b52aff45a30b6e379e175026a9')
+md5sums_armv7h=('affc230a509bb13f4841b80263b19636')
+md5sums_aarch64=('0ef68c3b1c09c011bbb8df9892219a07')
 
 # setup vars
 if [[ $CARCH == "armv7h" ]]; then
diff --git a/core/linux-rpi/archarm.diffconfig b/core/linux-rpi/archarm.diffconfig
index 84b6be3a8..4b52d5e17 100644
--- a/core/linux-rpi/archarm.diffconfig
+++ b/core/linux-rpi/archarm.diffconfig
@@ -177,3 +177,4 @@ CONFIG_PGTABLE_LEVELS=4
 # CONFIG_ARM64_VA_BITS_39 is not set
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_ARM64_VA_BITS=48
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
diff --git a/core/linux-rpi/config b/core/linux-rpi/config
index dacb6217f..991e52f38 100644
--- a/core/linux-rpi/config
+++ b/core/linux-rpi/config
@@ -1141,7 +1141,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 #
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_BPF=m
-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
diff --git a/core/linux-rpi/config8 b/core/linux-rpi/config8
index 548b129fb..aab4625d7 100644
--- a/core/linux-rpi/config8
+++ b/core/linux-rpi/config8
@@ -1225,7 +1225,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 #
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_BPF=m
-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m