From 61e79aad69015d71286d7b47f6bcccee20baf796 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Fri, 9 Jun 2023 13:28:11 +0800
Subject: [PATCH] selinux-python: Add default sections for Python and util
 packages

This also moves the python3-selinux dependency from the default section
into each util package.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---
 utils/selinux-python/Makefile | 39 +++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/utils/selinux-python/Makefile b/utils/selinux-python/Makefile
index e6f3f12c01..20d6b11066 100644
--- a/utils/selinux-python/Makefile
+++ b/utils/selinux-python/Makefile
@@ -27,10 +27,22 @@ include ../../lang/python/python3-package.mk
 #
 
 define Package/selinux-python/Default
-  SECTION:=utils
-  DEPENDS:=+python3 +python3-selinux
-  CATEGORY:=Utilities
   URL:=http://selinuxproject.org/page/Main_Page
+  DEPENDS:=+python3
+endef
+
+define Package/selinux-python/Default/python
+$(call Package/selinux-python/Default)
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  DEPENDS:=
+endef
+
+define Package/selinux-python/Default/util
+$(call Package/selinux-python/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
 endef
 
 define Package/selinux-python/Default/description
@@ -52,10 +64,7 @@ endef
 #
 
 define Package/python3-sepolgen
-$(call Package/selinux-python/Default)
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
+$(call Package/selinux-python/Default/python)
   TITLE:=python3-sepolgen
 endef
 
@@ -76,10 +85,7 @@ endef
 #
 
 define Package/python3-sepolicy
-$(call Package/selinux-python/Default)
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
+$(call Package/selinux-python/Default/python)
   TITLE:=python3-sepolicy
 endef
 
@@ -98,9 +104,9 @@ endef
 #
 
 define Package/selinux-audit2allow
-$(call Package/selinux-python/Default)
+$(call Package/selinux-python/Default/util)
   TITLE:=selinux-audit2allow
-  DEPENDS+=+python3-sepolgen +libselinux +libsepol
+  DEPENDS+= +python3-selinux +python3-sepolgen +libselinux +libsepol
 endef
 
 define Package/selinux-audit2allow/description
@@ -118,8 +124,9 @@ endef
 #
 
 define Package/selinux-chcat
-$(call Package/selinux-python/Default)
+$(call Package/selinux-python/Default/util)
   TITLE:=selinux-chcat
+  DEPENDS+= +python3-selinux
 endef
 
 define Package/selinux-chcat/description
@@ -137,9 +144,9 @@ endef
 #
 
 define Package/selinux-semanage
-$(call Package/selinux-python/Default)
+$(call Package/selinux-python/Default/util)
   TITLE:=selinux-semanage
-  DEPENDS+=+python3-sepolicy +python3-semanage +setools
+  DEPENDS+= +python3-selinux +python3-sepolicy +python3-semanage +setools
 endef
 
 define Package/selinux-semanage/description