From d2c3cda89746b7ce3e36af842e7e328a33e69f2a Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 4 Jun 2024 22:32:48 +0530
Subject: [PATCH] swmodd: config option to select swmodd-cgroups

---
 swmodd/Config.in | 8 ++++++++
 swmodd/Makefile  | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/swmodd/Config.in b/swmodd/Config.in
index 164c92b04..850629d7f 100644
--- a/swmodd/Config.in
+++ b/swmodd/Config.in
@@ -81,3 +81,11 @@ config SWMODD_NETWORKING
 	select PACKAGE_kmod-macvlan
 	help
 	  Enable "veth pair device" and "macvlan"
+
+config SWMODD_LEGACY_CGROUPS
+	bool "Enables CGroups V1 Support"
+	depends on PACKAGE_swmodd
+	default y
+	help
+	  If this option is selected, it selects swmod-cgroup package, which mounts
+	  GGroupV1 hierarchy on system start
diff --git a/swmodd/Makefile b/swmodd/Makefile
index a91de5c2e..48d0fe749 100755
--- a/swmodd/Makefile
+++ b/swmodd/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.5.7
+PKG_VERSION:=2.5.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -33,7 +33,10 @@ define Package/swmodd
   DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
 	    +PACKAGE_lxc:lxc +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
-	    +swmodd-cgroup +jq +libbbfdm-api
+	    +jq +libbbfdm-api +@CONFIG_KERNEL_CGROUPS
+ifeq ($(CONFIG_SWMODD_LEGACY_CGROUPS),y)
+  DEPENDS+=+swmodd-cgroup
+endif
 endef
 
 define Package/swmodd/description
@@ -49,7 +52,6 @@ define Package/swmodd-cgroup
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:= Cgroup mount handler for Software modules daemon
-  DEPENDS:=+@CONFIG_KERNEL_CGROUPS
 endef
 
 TARGET_CFLAGS += \