1.2.5-alt1

- qcow2c
p8.mk: added vm/opennebula-systemd bridge
2017-12-04 22:12:05 +03:00 · 2017-12-04 21:00:27 +03:00 · 2017-12-04 20:02:19 +03:00 · 2017-12-04 19:41:51 +03:00 · 2017-12-04 18:24:53 +03:00 · 2017-11-20 21:50:10 +03:00
28 changed files with 162 additions and 214 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.2.2
+Version: 1.2.5
 Release: alt1

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

 %changelog
+* Mon Dec 04 2017 Michael Shigorin <mike@altlinux.org> 1.2.5-alt1
+- qcow2c
+
+* Mon Nov 20 2017 Michael Shigorin <mike@altlinux.org> 1.2.4-alt1
+- opennebula-systemd
+
+* 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

--- a/.gear/tags/c0de6d3ac2e9abfec056da74f11f53c4bebe9d91
+++ b/.gear/tags/c0de6d3ac2e9abfec056da74f11f53c4bebe9d91
@@ -1,6 +0,0 @@
-object 58844d304a02408eff356c3d509d9c9b0db1551c
-type commit
-tag v1.2.1
-tagger Michael Shigorin <mike@altlinux.org> 1503342262 +0300
-
-seven years of m-p
--- a/.gear/tags/cabd1447933387c124b0d9f5bc785c41d5b42c9f
+++ b/.gear/tags/cabd1447933387c124b0d9f5bc785c41d5b42c9f
@@ -0,0 +1,6 @@
+object cf0fe91f0ee6a1bd1a4065c453fb0d128c77e25c
+type commit
+tag v1.2.4
+tagger Michael Shigorin <mike@altlinux.org> 1511203798 +0300
+
+opennebula-systemd
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-c0de6d3ac2e9abfec056da74f11f53c4bebe9d91 v1.2.1
+cabd1447933387c124b0d9f5bc785c41d5b42c9f v1.2.4
--- 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,82 @@
+### 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/opennebula-context:
+	@$(call add,BASE_PACKAGES,opennebula-context)
+	@$(call add,DEFAULT_SERVICES_ENABLE,one-context-local one-context)
+
+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
@@ -49,4 +49,5 @@ endif
 ifeq (vm,$(IMAGE_CLASS))
 vm/alt-p8-vm-net: vm/net mixin/p8; @:
 vm/alt-p8-cloud: vm/cloud-systemd mixin/p8; @:
+vm/alt-p8-opennebula: vm/opennebula-systemd mixin/p8; @:
 endif
--- 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,pnmixer 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; @:

@@ -193,12 +158,6 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)

-# reusable bits
-mixin/regular-tde: +tde \
-	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
-	@$(call add,THE_PACKAGES,kdeedu-kalzium kdeedu-ktouch)
-	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
-
 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 \
--- 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,16 @@ 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; @:
+
+# vm with OpenNebula contextualization package (with empty network config)
+vm/opennebula-systemd: vm/systemd use/net/networkd use/net-ssh \
+	use/vmguest/kvm mixin/opennebula-context \
+	use/repo use/control/sudo-su use/deflogin
+	@$(call add,BASE_PACKAGES,su)

 # NB: use/x11 employs some installer-feature packages
 vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
@@ -35,8 +35,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/browser/config.mk
+++ b/features.in/browser/config.mk
@@ -33,7 +33,6 @@ use/browser/firefox/live: use/browser/firefox

 # scarey, and will have to be done otherwise when l10n feature is there
 use/browser/firefox/i18n: use/browser/firefox
-	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-be)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -33,15 +33,18 @@ prepare-image: check-sudo
 	fi

 convert-image: prepare-image
-	@case "$(IMAGE_TYPE)" in \
+	@VM_COMPRESS=; \
+	case "$(IMAGE_TYPE)" in \
 	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
 	"vhd") VM_FORMAT="vpc";; \
+	"qcow2c") VM_FORMAT="qcow2"; VM_COMPRESS="-c";; \
 	*) VM_FORMAT="$(IMAGE_TYPE)"; \
 	esac; \
 	if ! type -t qemu-img >&/dev/null; then \
-		echo "** warning: qemu-img not available" >&2; \
+		echo "** error: qemu-img not available" >&2; \
+		exit 1; \
 	else \
-		qemu-img convert -O "$$VM_FORMAT" \
+		qemu-img convert $$VM_COMPRESS -O "$$VM_FORMAT" \
 			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
 		rm "$(VM_RAWDISK)"; \
 		if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
--- 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/pack/config.mk
+++ b/features.in/pack/config.mk
@@ -40,6 +40,6 @@ $(foreach c,$(VE_ARCHIVES), \
 		$(eval $(call PACK_compressors,$(c),$(z)))))

 # virtual machines
-VM_EXTS := .img .qcow2 .vdi .vmdk .vhd
+VM_EXTS := .img .qcow2 .qcow2c .vdi .vmdk .vhd

 $(VM_EXTS:.%=use/pack/%): use/pack; @:
--- a/features.in/rescue/rescue/image-scripts.d/00-test-rescue
+++ b/features.in/rescue/rescue/image-scripts.d/00-test-rescue
@@ -2,9 +2,10 @@

 no_x11() {
 	if rpmquery libX11 >&/dev/null; then
-		echo "** rescue image contains libX11 which is prohibited" >&2
+		echo "** rescue image contains libX11 which is prohibited"
+		rpm -e --test libX11
 		exit 1
-	fi
+	fi >&2
 }

 case "${GLOBAL_TEST_RESCUE:-}" in
--- a/features.in/vmguest/config.mk
+++ b/features.in/vmguest/config.mk
@@ -6,9 +6,9 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/vmguest:
 	@$(call add_feature)

-use/vmguest/base: use/vmguest/vbox use/vmguest/vmware; @:
+use/vmguest/base: use/vmguest/vbox use/vmguest/vmware use/vmguest/kvm; @:
 use/vmguest/complete: use/vmguest/base \
-	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm; @:
+	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm/x11; @:

 use/vmguest/vbox: use/vmguest
 	@$(call add,THE_KMODULES,virtualbox-addition vboxguest)
@@ -20,7 +20,10 @@ use/vmguest/vbox/x11: use/vmguest/vbox
 # NB: only reasonable for X11-bearing images
 # see also use/install2/kvm
 use/vmguest/kvm: use/vmguest
-	@$(call add,THE_PACKAGES,spice-vdagent qemu-guest-agent)
+	@$(call add,THE_PACKAGES,qemu-guest-agent)
+
+use/vmguest/kvm/x11: use/vmguest/kvm
+	@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl)

 # see also use/install2/vmware
 use/vmguest/vmware:
@@ -29,7 +32,7 @@ use/vmguest/vmware:
 	@$(call add,THE_PACKAGES,open-vm-tools)

 use/vmguest/vmware/x11: use/vmguest/vmware
-	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse open-vm-tools-desktop)

 else

--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -80,6 +80,10 @@ imagedir:

 postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
 	@OUTSIZE="`ls -lh "$(IMAGE_OUTPATH)" | cut -f5 -d' '`"; \
+	if [ ! -n "$$OUTSIZE" ]; then \
+		echo "** error: $(IMAGE_OUTPATH) missing" >&2; \
+		exit 1; \
+	fi; \
 	echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \
 	echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \
 	echo "IMAGE_OUTFILE = $(IMAGE_OUTFILE)" && \
--- a/pkg.in/lists/tagged/base+regular
+++ b/pkg.in/lists/tagged/base+regular
@@ -6,6 +6,8 @@ ntfs-3g
 dosfstools
 fatresize

+make-initrd-ucode
+
 lvm2
 make-initrd-lvm

--- a/pkg.in/lists/tagged/desktop+engineering
+++ b/pkg.in/lists/tagged/desktop+engineering
@@ -4,6 +4,8 @@ qucs

 # 2D CAD
 librecad
+qcad
+qcad-partlibrary

 # 3D CAD
 freecad
@@ -13,31 +15,24 @@ openscad-MCAD
 openscad-libraries-mcad
 meshlab

-# CAM
+# CAM and gcode generator
 camotics
 pycam
 flatcam
+pcb2gcodeGUI

 # 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
--- a/pkg.in/lists/tagged/desktop+ibus
+++ b/pkg.in/lists/tagged/desktop+ibus
@@ -9,4 +9,4 @@ imsettings-xim

 ibus-hangul
 ibus-pinyin
-ibus-unikey
+#ibus-unikey
--- 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
@@ -193,7 +193,6 @@ socat
 sshpt
 #stunnel
 tcpdump
-tcpflow
 tcpreen
 tcpreplay
 tcptrace
Author	SHA1	Message	Date
Michael Shigorin	84183f8818	1.2.5-alt1 - qcow2c	2017-12-04 22:12:05 +03:00
Michael Shigorin	051b8ef2b8	p8.mk: added vm/opennebula-systemd bridge Suggested-by: Alexey Shabalin <shaba@altlinux.org>	2017-12-04 21:00:27 +03:00
Michael Shigorin	e043f87775	build-vm, pack: implement qcow2c support This is a compressed version of good ol' qcow2. Suggested-by: Alexey Shabalin <shaba@altlinux.org>	2017-12-04 20:02:19 +03:00
Michael Shigorin	0f2411ec34	image.in, build-vm: handle qemu-img absence properly This isn't a warning cause, this is a error cause!	2017-12-04 19:41:51 +03:00
Michael Shigorin	a173bbd070	browser: drop -be Maybe this commit will be reverted but this is the current state of both sisyphus and p8. See-also: http://bugzilla.mozilla.org/show_bug.cgi?id=1304743 See-also: http://www.opennet.ru/opennews/art.shtml?num=45909 See-also: http://www.opennet.ru/opennews/art.shtml?num=46987	2017-12-04 18:24:53 +03:00
Michael Shigorin	3ca9ae4ba2	gear-store-tags	2017-11-20 21:50:10 +03:00
Michael Shigorin	cf0fe91f0e	1.2.4-alt1 - opennebula-systemd	2017-11-20 21:49:45 +03:00
Michael Shigorin	ea373cec67	desktop+ibus: dropped ibus-unikey No more in sisyphus: http://git.altlinux.org/tasks/archive/done/_189/193808/	2017-11-14 19:01:36 +03:00
Michael Shigorin	5dd5c0b618	base+regular: added make-initrd-ucode Suggested-by: Anton Farygin <rider@altlinux.org> See-also: https://lists.debian.org/debian-devel/2017/06/msg00308.html	2017-11-03 15:58:54 +03:00
Alexey Shabalin	890390a89a	add vm/opennebula-systemd	2017-10-31 13:24:02 +03:00
Alexey Shabalin	91e0c6e933	cleanup vm/cloud-systemd	2017-10-31 13:23:56 +03:00
Alexey Shabalin	e0dfa733e6	install open-vm-tools-desktop for use/vmguest/vmware/x11	2017-10-31 13:23:49 +03:00
Alexey Shabalin	a9b1f05501	add use/vmguest/kvm/x11	2017-10-31 13:13:09 +03:00
Michael Shigorin	af20f89346	rescue: make libX11 test a bit more helpful It should be more clear what gets libX11 test triggered.	2017-10-23 18:54:37 +03:00
Michael Shigorin	3afb96a824	rescue+extra: drop tcpflow ...as it pulls libX11 in now.	2017-10-23 18:53:26 +03:00
Anton Midyukov	9f10e9d12a	Update pkg.in/lists/tagged/desktop+engineering	2017-09-28 18:40:36 +03:00
Michael Shigorin	4a07391d93	gear-store-tags	2017-09-26 00:11:00 +03:00
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