basealt.mk: shift to pkglists

The distro description grew package by package and started resembling a pile of those; let's finally reorganize it with lists and generally improve layout (should be no-op otherwise). See the discussion of the changes in basealt.mk package lists in preceding commits touching it.

basealt.mk: shift to pkglists
235208b9 · Michael Shigorin · e878cad9 · 235208b9 · 235208b9 · 235208b9
Commit 235208b9 authored Nov 14, 2016 by Michael Shigorin
Showing with 53 additions and 35 deletions

basealt.mk conf.d/basealt.mk +16 -35

base.pkgs pkg.in/lists/workstation/base.pkgs +9 -0

live.pkgs pkg.in/lists/workstation/live.pkgs +4 -0

the.pkgs pkg.in/lists/workstation/the.pkgs +24 -0

No files found.
--- a/conf.d/basealt.mk
+++ b/conf.d/basealt.mk
@@ -28,57 +28,38 @@ distro/alt-workstation: distro/.base use/luks  \
 	use/x11/lightdm/gtk use/docs/manual use/x11/gtk/nm +nm \
 	use/fonts/ttf/google use/domain-client/full \
 	use/browser/firefox use/browser/firefox/esr
-	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
-	@$(call add,THE_PACKAGES,alterator-notes)
-	@$(call add,THE_PACKAGES,imagewriter)
-	@$(call add,THE_PACKAGES,mintmenu)
-	@$(call add,THE_PACKAGES,firefox-esr-ru)
-	@$(call add,THE_PACKAGES,systemd-udev-console-fb)
-	@$(call add,THE_PACKAGES,gnome-bluetooth)
-	@$(call add,THE_PACKAGES,qwebcam dvd+rw-tools pv)
-	@$(call add,THE_PACKAGES,fdisk net-tools mtr tcpdump ipcalc)
-	@$(call add,THE_PACKAGES,rpminstall)
-	@$(call add,THE_BRANDING,graphics)
+	@$(call set,BRANDING,alt-workstation)
+	@$(call add,THE_BRANDING,graphics mate-settings)
 	@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
 	@$(call add,THE_BRANDING,notes slideshow)
+	@$(call set,INSTALLER,altlinux-desktop)
 	@$(call add,INSTALL2_BRANDING,notes slideshow)
-	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,INSTALL2_PACKAGES,alterator-notes)
-	@$(call add,THE_LISTS,$(call tags,regular desktop))
+	@$(call add,INSTALL2_PACKAGES,volumes-profile-regular)
+	@$(call add,INSTALL2_PACKAGES,open-iscsi)
+	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,MAIN_PACKAGES,solaar)
 	@$(call add,MAIN_GROUPS,$(workstation_groups))
 	@$(call add,MAIN_LISTS,workstation/extras)
 	@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
+	@$(call add,BASE_LISTS,workstation/base.pkgs)
 	@$(call add,BASE_LISTS,$(call tags,desktop cups))
+	@$(call add,LIVE_LISTS,workstation/live.pkgs)
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_LISTS,$(call tags,desktop office))
 	@$(call add,THE_LISTS,workstation/mate)
+	@$(call add,THE_LISTS,workstation/the.pkgs)
+	@$(call add,THE_LISTS,$(call tags,regular desktop))
+	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,THE_LISTS,$(call tags,base l10n))
 	@$(call add,THE_LISTS,$(call tags,base desktop))
 	@$(call add,THE_LISTS,$(call tags,archive extra))
 	@$(call add,THE_LISTS,$(call tags,mobile mate))
-	@$(call add,LIVE_PACKAGES,virt-viewer vlc)
-	@$(call add,LIVE_PACKAGES,volumes-profile-regular)
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-regular)
-	@$(call add,INSTALL2_PACKAGES,open-iscsi)
-	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
-	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez rpminstall)
-	@$(call add,BASE_PACKAGES,installer-feature-centaurus-keyring)
-	@$(call add,BASE_PACKAGES,task-auth-ad)
-	@$(call add,BASE_PACKAGES,alterator-x11)
-	@$(call add,BASE_PACKAGES,chromium chromium-gnome)
-	@$(call add,BASE_PACKAGES,apt-indicator)
-	@$(call add,BASE_PACKAGES,recoll-extras)
-	@$(call add,MAIN_PACKAGES,solaar)
-	@$(call add,COMMON_PACKAGES,vim-console)
-	@$(call add,LIVE_PACKAGES,xterm-)
-	@$(call add,CLEANUP_PACKAGES,xterm)
-	@$(call add,BASE_KMODULES,kvm virtualbox)
 	@$(call add,THE_KMODULES,staging)
-	@$(call add,THE_BRANDING,mate-settings)
-	@$(call set,BRANDING,alt-workstation)
-	@$(call set,INSTALLER,altlinux-desktop)
-	@$(call set,DOCS,alt-workstation)
+	@$(call add,BASE_KMODULES,kvm virtualbox)
+	@$(call add,CLEANUP_PACKAGES,xterm)
+	@$(call add,EFI_BOOTARGS,lang=ru_RU)
 	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
 	@$(call add,CONTROL,xdg-user-dirs:enabled)
 	@$(call add,SERVICES_ENABLE,sshd)
@@ -89,6 +70,6 @@ distro/alt-workstation: distro/.base use/luks  \
 	@$(call set,META_VOL_SET,ALT)
 	@$(call set,META_VOL_ID,ALT Workstation)
 	@$(call set,META_APP_ID,8.1/$(ARCH))
-	@$(call add,EFI_BOOTARGS,lang=ru_RU)
+	@$(call set,DOCS,alt-workstation)

 endif
--- a/pkg.in/lists/workstation/base.pkgs
+++ b/pkg.in/lists/workstation/base.pkgs
+installer-feature-centaurus-keyring
+
+alterator-x11
+task-auth-ad
+
+chromium chromium-gnome
+
+apt-indicator
+recoll-extras
--- a/pkg.in/lists/workstation/live.pkgs
+++ b/pkg.in/lists/workstation/live.pkgs
+volumes-profile-regular
+virt-viewer
+vlc
+xterm-
--- a/pkg.in/lists/workstation/the.pkgs
+++ b/pkg.in/lists/workstation/the.pkgs
+installer-feature-desktop-other-fs-stage2
+alterator-notes
+
+rpminstall
+imagewriter
+mintmenu
+firefox-esr-ru
+
+systemd-udev-console-fb
+disable-usb-autosuspend
+
+bluez
+pulseaudio-bluez
+gnome-bluetooth
+
+fdisk
+dvd+rw-tools
+qwebcam
+
+pv
+mtr
+net-tools
+tcpdump
+ipcalc