1.2.3-alt1

- p8+
e2k.mk, mixin.mk: add more targets
2017-09-26 00:00:48 +03:00 · 2017-09-26 00:00:31 +03:00 · 2017-09-26 00:00:02 +03:00 · 2017-09-25 23:59:25 +03:00 · 2017-09-25 23:58:59 +03:00 · 2017-09-25 23:58:52 +03:00
23 changed files with 172 additions and 203 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.2.1
+Version: 1.2.3
 Release: alt1

 Summary: ALT based distribution metaprofile
@@ -128,6 +128,12 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif

 %changelog
+* Mon Sep 25 2017 Michael Shigorin <mike@altlinux.org> 1.2.3-alt1
+- p8+
+
+* Mon Sep 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.2-alt1
+- regular-engineering
+
 * Mon Aug 21 2017 Michael Shigorin <mike@altlinux.org> 1.2.1-alt1
 - seven years ago...

--- a/.gear/tags/0875fdb4c714d4f19ec72c95473f703ae87a85db
+++ b/.gear/tags/0875fdb4c714d4f19ec72c95473f703ae87a85db
@@ -0,0 +1,6 @@
+object 40fd44377b3381ae23a2ad8f260ad8151767fa72
+type commit
+tag v1.2.2
+tagger Michael Shigorin <mike@altlinux.org> 1505154337 +0300
+
+regular-engineering
--- a/.gear/tags/70aa8a363909d5cc70bf00fd7c2f679a452de4f7
+++ b/.gear/tags/70aa8a363909d5cc70bf00fd7c2f679a452de4f7
@@ -1,6 +0,0 @@
-object f1c4c6027238c2886573efc2aadfa443fe427a17
-type commit
-tag v1.2.0
-tagger Michael Shigorin <mike@altlinux.org> 1502132060 +0300
-
-v1.2.0
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-70aa8a363909d5cc70bf00fd7c2f679a452de4f7 v1.2.0
+0875fdb4c714d4f19ec72c95473f703ae87a85db v1.2.2
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -6,23 +6,11 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg

 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:

-mixin/desktop-installer: +net-eth +vmguest \
-	use/x11-autostart use/fonts/install2 use/sound
-	@$(call add,BASE_LISTS, \
-		$(call tags,(base || desktop) && (l10n || network)))
-	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
-	@$(call add,BASE_PACKAGES,os-prober)
-
 distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:

 distro/.desktop-extra:
 	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))

-distro/kde4-lite: distro/.desktop-mini \
-	distro/.desktop-network distro/.desktop-extra +kde4-lite
-	@$(call set,KFLAVOURS,std-def)
-
-distro/tde: distro/.desktop-network +tde; @:
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
--- a/conf.d/e2k.mk
+++ b/conf.d/e2k.mk
@@ -1,20 +1,28 @@
 ifeq (vm,$(IMAGE_CLASS))

-vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su
-	@$(call add,THE_PACKAGES,openssh)
+vm/.e2k-bare: vm/.bare use/e2k
+	@$(call add,BASE_PACKAGES,apt)
+
+vm/e2k-live: vm/.e2k-bare use/deflogin/live use/net-ssh use/control/sudo-su
 	@$(call add,THE_LISTS,$(call tags,ve tools))

-vm/e2k-rescue: vm/e2k-live use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
+vm/e2k-rescue: vm/e2k-live mixin/e2k-base use/services/lvm2-disable
 	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
 	@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)

-vm/e2k-xfce: vm/e2k-rescue use/e2k/sound use/e2k/x11 use/x11/xfce \
-	use/browser/firefox use/browser/firefox/esr use/browser/firefox/i18n \
-	use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_PACKAGES,xinit xterm mc)
-	@$(call add,THE_PACKAGES,fonts-bitmap-terminus pnmixer)
+vm/e2k-xfce: vm/e2k-rescue mixin/e2k-desktop use/x11/xfce
+	@$(call add,THE_PACKAGES,pnmixer)
+
+vm/e2k-lxqt: vm/e2k-rescue mixin/e2k-desktop
+	@$(call add,THE_LISTS,$(call tags,(lxqt desktop) && !extra))
+
+vm/e2k-mate: vm/systemd mixin/e2k-base mixin/e2k-desktop \
+	use/deflogin/live use/x11/mate; @:

 vm/e2k-builder: vm/e2k-rescue use/dev/builder/base; @:

+vm/e2k-samba-DC: vm/e2k-rescue
+	@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
+
 endif
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -107,8 +107,6 @@ distro/live-0ad: distro/.live-games
 	@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
 	@$(call try,HOMEPAGE,http://play0ad.com/)

-distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
-
 distro/live-gimp: distro/live-icewm use/live/ru
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -0,0 +1,78 @@
+### various mixins with their origin
+
+### desktop.mk
+mixin/desktop-installer: +net-eth +vmguest \
+	use/x11-autostart use/fonts/install2 use/sound
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (l10n || network)))
+	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
+	@$(call add,BASE_PACKAGES,os-prober)
+
+### e2k.mk
+mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
+
+mixin/e2k-desktop: use/e2k/x11 use/e2k/sound use/l10n/default/ru_RU \
+	use/browser/firefox/esr use/browser/firefox/i18n \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,xinit xterm mc)
+	@$(call add,THE_PACKAGES,fonts-bitmap-terminus)
+
+### regular.mk
+# common WM live/installer bits
+mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
+	@$(call add,THE_PACKAGES,pam-limits-desktop)
+	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
+	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
+	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
+	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
+	@$(call set,THE_IMAGEWRITER,imagewriter)
+
+mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
+	use/fonts/ttf/redhat use/x11/wmaker
+	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
+	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
+	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
+
+# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
+mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
+	use/browser/firefox/classic
+	@$(call add,THE_BRANDING,graphics)
+
+mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
+
+mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/x11/lightdm/gtk \
+	use/browser/firefox use/browser/firefox/classic \
+	use/browser/firefox/i18n use/browser/firefox/h264 \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
+
+mixin/regular-lxde: use/x11/lxde use/fonts/infinality \
+	use/x11/gtk/nm use/im +nm
+	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
+
+mixin/regular-tde: +tde \
+	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
+	@$(call add,THE_PACKAGES_REGEXP,kdeedu-kalzium.* kdeedu-ktouch.*)
+	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
+
+mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
+	use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+
+# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
+#     kernel cmdline resulting in method:disk instead of method:cdrom
+#     which will change propagator's behaviour to probe additional
+#     filesystems (ro but no loop) thus potentially writing to
+#     an unrecovered filesystem's journal
+mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
+	use/syslinux/ui/menu use/syslinux/timeout/600 \
+	use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
+
+### vm.mk
+mixin/cloud-init:
+	@$(call add,BASE_PACKAGES,cloud-init)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init cloud-init-local)
+
+mixin/icewm: use/x11/lightdm/gtk +icewm; @:
--- a/conf.d/p7.mk
+++ b/conf.d/p7.mk
@@ -1,49 +0,0 @@
-# p7 base kits
-
-mixin/p7: use/browser/firefox/esr
-	@$(call set,BRANDING,altlinux-starterkit)
-	@$(call set,IMAGE_FLAVOUR,$(subst altlinux-p7-,,$(IMAGE_NAME)))
-	@$(call set,META_VOL_ID,ALT Linux p7 $$(IMAGE_FLAVOUR)/$(ARCH))
-
-ifeq (distro,$(IMAGE_CLASS))
-
-### kludge compatibility: introspection stub for main.mk :-/
-distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
-distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
-distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @:
-distro/altlinux-p7-gnome3: distro/regular-gnome3 mixin/p7; @:
-distro/altlinux-p7-gnustep: distro/regular-gnustep mixin/p7; @:
-distro/altlinux-p7-kde4: distro/regular-kde4 mixin/p7; @:
-distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
-distro/altlinux-p7-lxqt: distro/regular-lxqt mixin/p7; @:
-distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @:
-distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @:
-distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
-distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
-distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @:
-distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @:
-distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
-distro/altlinux-p7-xfce-sysv: distro/regular-xfce-sysv mixin/p7; @:
-
-distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
-
-distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
-distro/altlinux-p7-jeos-ovz: distro/regular-jeos-ovz mixin/p7; @:
-distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
-distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
-distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
-distro/altlinux-p7-server-samba4: distro/regular-server-samba4 mixin/p7; @:
-
-distro/altlinux-p7-builder: distro/regular-builder mixin/p7; @:
-
-endif
-
-ifeq (ve,$(IMAGE_CLASS))
-ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
-ve/altlinux-p7-ovz-pgsql94: ve/pgsql94 mixin/p7; @:
-endif
-
-ifeq (vm,$(IMAGE_CLASS))
-vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
-vm/altlinux-p7-vagrant: vm/vagrant-base mixin/p7; @:
-endif
--- a/conf.d/p8.mk
+++ b/conf.d/p8.mk
@@ -39,6 +39,7 @@ distro/alt-p8-server-pve: distro/regular-server-pve mixin/p8; @:

 distro/alt-p8-builder: distro/regular-builder mixin/p8; @:

+distro/alt-p8-engineering: distro/regular-engineering mixin/p8; @:
 endif

 ifeq (ve,$(IMAGE_CLASS))
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -21,15 +21,6 @@ distro/.regular-x11: distro/.regular-base +vmguest +wireless \
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
 	@$(call add,EFI_BOOTARGS,live_rw)

-# common WM live/installer bits
-mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
-	@$(call add,THE_PACKAGES,pam-limits-desktop)
-	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
-	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
-	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
-	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
-	@$(call set,THE_IMAGEWRITER,imagewriter)
-
 # WM base target
 distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:

@@ -116,47 +107,23 @@ distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm \
 	@$(call add,LIVE_PACKAGES,icewm-startup-networkmanager)
 	@$(call set,KFLAVOURS,un-def)

-mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
-	use/fonts/ttf/redhat use/x11/wmaker
-	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
-	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
-	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
-
 # wdm can't do autologin so add standalone one for livecd
 distro/regular-wmaker: distro/.regular-sysv \
 	mixin/regular-wmaker use/live/autologin use/browser/palemoon/i18n
 	@$(call add,LIVE_PACKAGES,wdm wmxkbru)

-# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
-mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
-	use/browser/firefox/classic
-	@$(call add,THE_BRANDING,graphics)
-
 distro/regular-gnustep: distro/.regular-sysv \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:

-mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
-
 distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
 	use/x11/xfce/full use/domain-client
 	@$(call set,KFLAVOURS,un-def)

-mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
-	use/x11/lightdm/gtk \
-	use/browser/firefox use/browser/firefox/classic \
-	use/browser/firefox/i18n use/browser/firefox/h264 \
-	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
-
 distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
 	mixin/regular-xfce mixin/regular-xfce-sysv; @:

-mixin/regular-lxde: use/x11/lxde use/fonts/infinality \
-	use/x11/gtk/nm use/im +nm
-	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
-
 distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde
 	@$(call add,THE_PACKAGES,lxde)

@@ -172,8 +139,6 @@ distro/regular-mate: distro/.regular-gtk +nm \
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_LISTS,$(call tags,base smartcard))

-distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
-
 distro/regular-enlightenment: distro/.regular-gtk \
 	use/x11/enlightenment use/fonts/infinality; @:

@@ -191,13 +156,7 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
 	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
-	@$(call add,LIVE_PACKAGES,gnome-flashback)
-
-# reusable bits
-mixin/regular-tde: +tde \
-	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
-	@$(call add,THE_PACKAGES,kdeedu)
-	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
+	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)

 distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
 	use/x11/gtk/nm use/net/nm/mmgui
@@ -213,20 +172,11 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)

-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
-
 distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:

 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp use/efi/refind; @:

-distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
-
-distro/regular-leechcraft: distro/.regular-desktop \
-	use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
-
 distro/regular-kde5: distro/.regular-desktop \
 	use/x11/kde5 use/x11/sddm use/domain-client \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
@@ -234,15 +184,6 @@ distro/regular-kde5: distro/.regular-desktop \
 	@$(call add,THE_PACKAGES,kde5-telepathy)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

-# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
-#     kernel cmdline resulting in method:disk instead of method:cdrom
-#     which will change propagator's behaviour to probe additional
-#     filesystems (ro but no loop) thus potentially writing to
-#     an unrecovered filesystem's journal
-mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
-	use/syslinux/ui/menu use/syslinux/timeout/600 \
-	use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
-
 distro/regular-rescue: distro/.regular-base mixin/regular-rescue  \
 	use/rescue/rw use/efi/refind use/efi/shell use/efi/memtest86 \
 	use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
@@ -336,4 +277,17 @@ distro/regular-server-samba4: distro/.regular-server-managed
 	@$(call add,THE_PACKAGES,alterator-dhcp)
 	@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)

+distro/regular-engineering: distro/regular-lxde use/live/ru
+	@$(call add,THE_PACKAGES,lxde-settings-lxdesktop)
+	@$(call add,THE_LISTS,$(call tags,engineering desktop))
+	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
+	@$(call add,THE_PACKAGES,LibreOffice LibreOffice-gnome LibreOffice-langpack-ru)
+	@$(call add,THE_PACKAGES,firefox-pepperflash)
+	@$(call add,THE_PACKAGES,cups system-config-printer)
+	@$(call add,THE_PACKAGES,gnome-disk-utility)
+	@$(call add,THE_PACKAGES,evince)
+	@$(call add,LIVE_KMODULES,staging)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
+	@$(call add,DEFAULT_SERVICES_ENABLE,ModemManager)
+
 endif
--- a/conf.d/t7.mk
+++ b/conf.d/t7.mk
@@ -1,13 +0,0 @@
-# t7 base kits
-
-mixin/t7:
-	@$(call set,BRANDING,altlinux-starterkit) ### needs changing
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/altlinux-t7-gnustep: distro/regular-gnustep mixin/t7; @:
-distro/altlinux-t7-gnustep-systemd: distro/regular-gnustep-systemd mixin/t7; @:
-distro/altlinux-t7-tde: distro/regular-tde mixin/t7; @:
-distro/altlinux-t7-sysv-tde: distro/regular-sysv-tde mixin/t7; @:
-
-endif
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -70,28 +70,6 @@ distro/elinks: distro/.base use/pid1/net

 endif # IMAGE_CLASS: distro

-ifeq (ve,$(IMAGE_CLASS))
-
-ifeq (centos,$(REPO))
-
-ve/.centos-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-
-ve/centos: ve/.centos-base
-	@$(call add,BASE_PACKAGES,openssh-server)
-
-endif # REPO: centos
-
-ifeq (opensuse,$(REPO))
-
-ve/.opensuse-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-	@$(call add,BASE_PACKAGES,aaa_base)
-
-endif # REPO: opensuse
-
-endif # IMAGE_CLASS: ve
-
 ifeq (vm,$(IMAGE_CLASS))

 vm/net-static: vm/bare use/net-eth use/net-ssh
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -18,16 +18,12 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
 	@$(call add,BASE_PACKAGES,su)

 # vm/net or vm/systemd-net
-vm/cloud-systemd: vm/systemd-net use/vmguest/kvm
-	@$(call add,BASE_PACKAGES,cloud-init)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,THE_KMODULES,kdbus)

-vm/cloud-sysv: vm/net use/vmguest/kvm use/power/acpi/button
-	@$(call add,BASE_PACKAGES,cloud-init)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:

 # NB: use/x11 employs some installer-feature packages
 vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
@@ -35,8 +31,6 @@ vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
 vm/.desktop-base: vm/.desktop-bare \
 	use/deflogin/altlinuxroot use/x11-autologin; @:

-mixin/icewm: use/x11/lightdm/gtk +icewm; @:
-
 vm/icewm: vm/.desktop-base mixin/icewm; @:

 vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
--- a/features.in/armh/config.mk
+++ b/features.in/armh/config.mk
@@ -1,2 +1,2 @@
-use/armh: use/control/sudo-su use/net/dns/google
+use/armh: use/control/sudo-su use/net-dns/google
 	@$(call add_feature)
--- a/features.in/deflogin/config.mk
+++ b/features.in/deflogin/config.mk
@@ -43,3 +43,4 @@ use/deflogin/privileges: use/deflogin
 # NM with sysvinit
 use/deflogin/sysv/nm: use/deflogin
 	@$(call add,GROUPS,_nmconnect)
+	@$(call add,THE_PACKAGES,nm-sysvinit)
--- a/features.in/e2k/config.mk
+++ b/features.in/e2k/config.mk
@@ -4,7 +4,7 @@ use/e2k:

 use/e2k/x11: use/e2k use/x11
 	@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
-	@$(call add,THE_PACKAGES,xorg-drv-ati)
+	@$(call add,THE_PACKAGES,xorg-drv-ati xinit)

 use/e2k/sound:
 	@$(call add,THE_PACKAGES,setup-alsa-elbrus-401)
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -31,6 +31,7 @@ use/firmware/wireless: use/firmware
 	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)

 use/firmware/laptop: use/firmware/cpu
 	@$(call add,KMODULES,acpi_call)
--- a/features.in/vmguest/config.mk
+++ b/features.in/vmguest/config.mk
@@ -26,6 +26,7 @@ use/vmguest/kvm: use/vmguest
 use/vmguest/vmware:
 	@$(call add,THE_KMODULES,vmware)
 	@$(call add,THE_KMODULES,scsi)	# mptspi.ko
+	@$(call add,THE_PACKAGES,open-vm-tools)

 use/vmguest/vmware/x11: use/vmguest/vmware
 	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
--- a/pkg.in/lists/tagged/desktop+engineering
+++ b/pkg.in/lists/tagged/desktop+engineering
@@ -1,23 +1,45 @@
-# Electronic
+# EDA
 kicad
 qucs

-# CAD
+# 2D CAD
 librecad

+# 3D CAD
+freecad
+GLC_Player
+openscad
+openscad-MCAD
+openscad-libraries-mcad
+meshlab
+
+# CAM
+camotics
+pycam
+flatcam
+
+# CNC
+linuxcnc
+pcb2gcodeGUI
+inkscape-plugin-gcodetools
+
+# 3D Printer Software
+cura
+# bug 33830
+libfreeglut
+slic3r
+# bug 33831
+perl-Math-PlanePath
+printrun
+repraptor
+
 # APCS
 beremiz
 yaplc-ide
+# beremiz has problems with python-module-wx3.0
+python-module-wx

 # SCADA
 openscada-Model.AGLKS
 openscada-Model.Boiler
-
-# CNC
-linuxcnc
-camotics
-repraptor
-pcb2gcode
-inkscape-plugin-gcodetools
-pycam
-flatcam
+openscada-docRU
--- a/pkg.in/lists/tagged/desktop+lxqt
+++ b/pkg.in/lists/tagged/desktop+lxqt
@@ -19,9 +19,7 @@ udisks2
 gvfs

 # system configuration tools
-compton-conf
 lxqt-config
-obconf-qt

 # utilities
 lximage-qt
@@ -33,11 +31,7 @@ eject
 icon-theme-oxygen
 x-cursor-theme-jimmac

-qupzilla
 qterminal
-juffed
-juffed-plugins
-screengrab
 xscreensaver

 psi-plus
@@ -46,7 +40,5 @@ psi-plus-plugin-conferencelogger
 psi-plus-plugin-screenshot
 psi-plus-plugin-watcher

-axkb
-
 # reboot/poweroff in logout menu as of May, 2014
 ConsoleKit
--- a/pkg.in/lists/tagged/desktop+lxqt+extra
+++ b/pkg.in/lists/tagged/desktop+lxqt+extra
@@ -1,3 +1,7 @@
+# system configuration tools (qt4)
+compton-conf
+obconf-qt
+
 # carefully chosen
 x-cursor-theme-BlueGlass3D
 x-cursor-theme-CP38
@@ -17,6 +21,10 @@ tubularix
 smplayer
 QCheckers
 qps
+juffed
+juffed-plugins
+screengrab
+axkb

 # media player; see also #30556 though
 clementine
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -18,6 +18,7 @@ disktype
 #     would suddenly get busy otherwise
 #evms
 #evms-ncurses
+fio
 gpart
 hddtemp
 idle3-tools
Author	SHA1	Message	Date
Michael Shigorin	efcb82b4f1	1.2.3-alt1 - p8+	2017-09-26 00:00:48 +03:00
Michael Shigorin	fd4f2a675d	e2k.mk, mixin.mk: add more targets mixin/e2k-desktop was asking for separation from its day zero, and the rest just came in naturally (the temporary patch to add lxqt and mate looked awfully with all the duplication in).	2017-09-26 00:00:31 +03:00
Michael Shigorin	41b5a5b633	desktop+lxqt: reshuffle qt4 bits This is to make desktop+lxqt packages installable on e2k as there's no qt4 package within this Sisyphus port and things might just stay this way (it's long unsupported, looks like porting software to qt5 is more worthwile an effort). There's one more removal though: qupzilla. This browser fits lxqt like a glove but* it's pulled in already by mixin/regular-lxqt, and browser feature is available now to make the selection more flexible. It's also going to be renamed on the way to incusion into KDE SC.	2017-09-26 00:00:02 +03:00
Michael Shigorin	f32fd9a3b0	firmware: add firmware-rt* to use/firmware/wireless ...for firmware-rt61pci; thanks to an anonymous bugreporter. See-also: http://www.opennet.ru/openforum/vsluhforumID3/112310.html#177	2017-09-25 23:59:25 +03:00
Michael Shigorin	9d10d78b48	desktop.mk, live.mk, regular.mk, test.mk: cleanup There was a semi-awful lot of long-abandoned targets spotted while factoring out mixins; let's just drop these for good, and if anyone needs some of those drop me a commit.	2017-09-25 23:58:59 +03:00
Michael Shigorin	0a87d47748	p7.mk, t7.mk: drop completely These branches are officially unsupported for the whole two years, probably just the time to clean up. See-also: http://altlinux.org/branches	2017-09-25 23:58:52 +03:00
Michael Shigorin	24defe9461	mixin.mk: gather all mixin/* targets These have appeared in desktop.mk, regular.mk, vm.mk over time, and there are two problems around. The minor one is that mixins have been introduced as handy reusable bits close in context of their use; this practically means that they fall under the same class restrictions as their parent targets, that is a mixin coming from regular.mk will only be available for "distro" IMAGE_CLASS, and so on. The major one is probably the worst design flaw in m-p: building images from ground up, where ground is a valid standalone buildable target as well. Life has shown that we rather want to build up images the other way around, choosing what essentials go in first and then fitting the fine details along with the packaging. The first sign of this difference appeared with ARMv7 Simply: we had a well-built configuration aiming for x86 ISO, still we needed roughly the same app/environment configuration put into armh disk image. Those platforms were different enough that we didn't actually plan shipping lots of distributions but the problem was clear, and it was much alike to the one that sprang m-p to life in the first place (when we had a range of "common" distros and needed to create and maintain a set of "school" ones that mostly had similar or even identical difference to their respective base ones -- and we couldn't do something like conf.d/p8.mk does now). So mixins are going to become the softer way to turn m-p's target configuration chain upside down to considerable extent: build up what you're going to mix into the various deliverables, and make it as portable across image classes, hardware platforms, repository branches as feasible so that total maintenance effort needed goes down or at least doesn't spike too bad. And here's the first strike at that.	2017-09-25 23:58:40 +03:00
Michael Shigorin	b558f88bfa	vm.mk: factor out mixin/cloud-init This one has been clearly duplicated before.	2017-09-25 23:56:42 +03:00
Michael Shigorin	ef0394f810	regular.mk: conditionally add kdeedu* It's been expelled from sisyphus. See-also: http://git.altlinux.org/tasks/archive/done/_183/187993/	2017-09-12 14:29:58 +03:00
Mike Radyuk	fe07f4091f	Fix armh feature	2017-09-12 14:28:28 +03:00
Michael Shigorin	2828090d6b	gear-store-tags	2017-09-11 21:25:50 +03:00
Michael Shigorin	40fd44377b	1.2.2-alt1 - regular-engineering	2017-09-11 20:47:19 +03:00
Anton Midyukov	9c5a47a4ce	New target regular-engineering and alt-p8-engineering	2017-09-11 16:23:29 +03:00
Michael Shigorin	59c1a58793	regular.mk: pnmixer to sysv-based xfce flavours ...instead of xfce4-mixer which is based on gstreamer 0.10 (with its mixer API that perished in 1.0); this has been tested on e2k already. Suggested-by: Mikhail Efremov <sem@altlinux.org> See-also: http://forum.altlinux.org/index.php?topic=36177.msg316175#msg316175	2017-09-11 09:38:06 +03:00
Anton Midyukov	a21ab528da	Update pkg.in/lists/tagged/desktop+engineering	2017-09-08 18:44:01 +03:00
Sergey V Turchin	792e70e237	- add open-vm-tools to use/vmguest/vmware	2017-09-08 18:41:28 +03:00
Michael Shigorin	86ed95a7e1	e2k: need startx too Weird it got overlooked in the first place.	2017-09-08 18:25:02 +03:00
Michael Shigorin	9383fce946	regular.mk: add screenpen to gnome3 flavour ROSA's legacy...	2017-09-08 17:38:36 +03:00
Michael Shigorin	4cec22b957	deflogin: add nm-sysvinit to use/deflogin/sysv/nm Suggested-by: Speccyfighter See-also: http://forum.altlinux.org/index.php?topic=39476.msg315597#msg315597	2017-09-07 15:45:23 +03:00
Michael Shigorin	9371719edc	regular.mk: trim kdeedu set in tde flavour Suggested-by: squire See-also: http://forum.altlinux.org/index.php?topic=38966.msg312602#msg312602	2017-09-07 15:29:31 +03:00
Michael Shigorin	032b3a1bf1	rescue+extra: add fio Suggested-by: Evgenii Terechkov <evg@altlinux.org>	2017-08-29 16:38:22 +03:00
Michael Shigorin	53c2c7fd1d	gear-store-tags	2017-08-21 22:05:01 +03:00