[PATCH] mixin-alt-server.mk: drop the "System" checkbox

Michael Shigorin mike at altlinux.org
Fri Oct 14 18:32:29 MSK 2022


...for good; it was deeply unneeded in the first place,
and a two-checkbox combo that would fall apart on non-
{X86,aarch64} resulting in an empty toplevel "System"
one sitting on the top of the installer's list is
a shame to be honest.

Let's put lsb-core into the base install as reasonably
proposed by antohami@ in the related bug as its deps
are pretty reasonable to me too.

See-also: http://bugzilla.altlinux.org/show_bug.cgi?id=42268#c4
See-also: http://lists.altlinux.org/pipermail/devel-distro/2022-October/002895.html
---
 conf.d/mixin-alt-server.mk                  | 4 ++--
 pkg.in/groups/centaurus/00-system.directory | 7 -------
 pkg.in/groups/centaurus/lsb-core.directory  | 8 --------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkg.in/groups/centaurus/00-system.directory
 delete mode 100644 pkg.in/groups/centaurus/lsb-core.directory

diff --git a/conf.d/mixin-alt-server.mk b/conf.d/mixin-alt-server.mk
index 7447e52a6..36b530563 100644
--- a/conf.d/mixin-alt-server.mk
+++ b/conf.d/mixin-alt-server.mk
@@ -1,5 +1,5 @@
 mixin/alt-server: server_groups = $(addprefix centaurus/,\
-	00-system 10-alterator 20-server-apps 50-freeipa 70-dev 901-net-if-mgt \
+	10-alterator 20-server-apps 50-freeipa 70-dev 901-net-if-mgt \
 	sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a \
 	mail-server-a owncloud domain-server freeipa-client nm-daemon \
 	systemd-networkd openuds openuds-tunnel admc)
@@ -35,13 +35,13 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
 	@$(call add,BASE_KMODULES,drm)
 	@$(call add,MAIN_GROUPS,centaurus/proxmox-backup-server)
-	@$(call add,MAIN_GROUPS,centaurus/lsb-core)
 	@$(call add,MAIN_GROUPS,centaurus/token)
 	@$(call add,MAIN_PACKAGES,mate-reduced-resource)
 endif
 	@$(call add,MAIN_KMODULES,$(server_main_kmodules))
 	@$(call add,BASE_LISTS,centaurus/base)
 	@$(call add,BASE_LISTS,centaurus/base-server)
+	@$(call add,BASE_LISTS,centaurus/lsb-core)
 	@$(call add,LIVE_LISTS,centaurus/live)
 	@$(call add,LIVE_LISTS,centaurus/remmina)
 	@$(call add,LIVE_LISTS,centaurus/cups)
diff --git a/pkg.in/groups/centaurus/00-system.directory b/pkg.in/groups/centaurus/00-system.directory
deleted file mode 100644
index 21bf4f4f7..000000000
--- a/pkg.in/groups/centaurus/00-system.directory
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=System
-X-Alterator-PackageList=centaurus/zero
-X-Alterator-Required=no
-Name[ru_RU]=óÉÓÔÅÍÁ
diff --git a/pkg.in/groups/centaurus/lsb-core.directory b/pkg.in/groups/centaurus/lsb-core.directory
deleted file mode 100644
index 994c5067f..000000000
--- a/pkg.in/groups/centaurus/lsb-core.directory
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=Core module of the Linux Standard Base (LSB), ISO/IEC 23360 Part 1
-X-Alterator-PackageList=centaurus/lsb-core
-X-Alterator-Required=no
-X-Alterator-Parent=centaurus/00-system
-Name[ru_RU]=âÁÚÏ×ÙÊ ÍÏÄÕÌØ Linux Standard Base (LSB), ISO/IEC 23360, ÞÁÓÔØ 1
-- 
2.33.3


--G4iJoqBmSsgzjUCe--


More information about the devel-distro mailing list