0.9.5-alt1

- homeros

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.7
+Version: 0.9.5
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -15,10 +15,10 @@ BuildRequires: rsync asciidoc-a2x xmlgraphics-fop fonts-ttf-dejavu
 BuildRequires: /proc
 
 Requires: rsync git-core
-Requires: time schedutils
-Requires: mkimage >= 0.2.0
+Requires: time schedutils sfdisk
+Requires: mkimage >= 0.2.5
 
-# Recommends: graphviz
+# Recommends: graphviz qemu-img
 
 %define mpdir %_datadir/%name
 %add_findreq_skiplist %mpdir/*.in/*
@@ -78,6 +78,25 @@ cp -a * %buildroot%mpdir
 %doc %docs/*
 
 %changelog
+* Mon Jan 21 2013 Michael Shigorin <mike@altlinux.org> 0.9.5-alt1
+- homeros
+
+* Mon Jan 14 2013 Michael Shigorin <mike@altlinux.org> 0.9.4-alt1
+- restricted boot
+
+* Mon Dec 31 2012 Michael Shigorin <mike@altlinux.org> 0.9.3-alt1
+- regular images
+
+* Mon Dec 17 2012 Michael Shigorin <mike@altlinux.org> 0.9.2-alt1
+- enhanced uefi support
+
+* Mon Dec 03 2012 Michael Shigorin <mike@altlinux.org> 0.9.1-alt1
+- initial kde4 support
+
+* Mon Nov 19 2012 Michael Shigorin <mike@altlinux.org> 0.9.0-alt1
+- initial uefi, luks, armh support
+- enhanced arm, gnome3/systemd, vm support
+
 * Sun Nov 11 2012 Michael Shigorin <mike@altlinux.org> 0.8.7-alt1
 - regressions--
 

.gear/tags/24fb8e929beca1399383ff7d269589711a1dca2c

@@ -1,6 +0,0 @@
-object cebabf992f29ac406170ea6d349ddcf1e4a827b1
-type commit
-tag v0.8.6
-tagger Michael Shigorin <mike@altlinux.org> 1352123574 +0400
-
-make docs

.gear/tags/285b2e0c1b9673a8476f0fe7066e69b0281b8d8a

@@ -0,0 +1,6 @@
+object a133490be9b705457f738cd12ff297bc672e2437
+type commit
+tag v0.9.4
+tagger Michael Shigorin <mike@altlinux.org> 1358193993 +0400
+
+restricted boot

.gear/tags/list

@@ -1 +1 @@
-24fb8e929beca1399383ff7d269589711a1dca2c v0.8.6
+285b2e0c1b9673a8476f0fe7066e69b0281b8d8a v0.9.4

Makefile

@@ -10,7 +10,8 @@ ifndef ARCHES
 ifdef ARCH
 ARCHES := $(ARCH)
 else
-ARCHES := $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
+ARCHES := $(shell arch \
+	| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
 endif
 endif
 export ARCHES

QUICKSTART

@@ -10,24 +10,30 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
 полезно
 ~~~~~~~
 - смонтированный tmpfs на несколько гигабайт
-  + например, в /tmp или /home/USER/hasher
-  + каталог из prefix в /etc/hasher-priv/system
+  * например, в /tmp или /home/USER/hasher
+  * каталог из prefix в /etc/hasher-priv/system
 - установленный git-core
 - настроенный ~/.gitconfig
 
 команды
 ~~~~~~~
-- от имени root:
+от имени root::
+----
 # apt-get install mkimage hasher git-core
 # hasher-useradd USER
+----
 
-- от имени указанного пользователя (после повторного входа):
+от имени указанного пользователя (после повторного входа)::
+----
 $ git config --global user.email "my@email"
 $ git config --global user.name "My Name"
 $ mkdir ~/out
+----
 
-- тестовая сборка (см. тж. lib/distro.mk, doc/params.txt):
+тестовая сборка (см. тж. lib/distro.mk, doc/params.txt)::
+----
 $ make syslinux.iso
+----
 
 ссылки
 ~~~~~~

bin/tags2lists

@@ -30,4 +30,4 @@ transformed="$(sed \
 	-e "s, *) *, ) ,g")"
 
 [ "$DEBUG" = 2 ] && echo "`basename $0`: transformed = \"$transformed\"" >&2
-[ -z "$transformed" ] || find $transformed | sed 's,^\./,,'
+[ -z "$transformed" ] || find $transformed | sed 's,^\./,,' | grep -v '\.sw.$'

bin/tar2vm

@@ -42,7 +42,7 @@ ROOTFSTYPE="${4:-ext4}"
 ROOTDEV="/dev/sda1"
 
 # last preparations...
-for i in losetup parted kpartx mkfs."$ROOTFSTYPE"; do
+for i in losetup sfdisk parted kpartx mkfs."$ROOTFSTYPE"; do
 	if ! type -t "$i" >&/dev/null; then
 		fatal "$i required but not found"
 	fi
@@ -98,8 +98,8 @@ chroot "$ROOTFS" make-initrd -k "$KERNEL"
 sed -i "s,$LOOPDEV1,$ROOTDEV," "$ROOTFS/etc/fstab"
 
 # configure and install bootloader
-REGEXP='^([0-9]+) heads, ([0-9]+) sectors/track, ([0-9]+) cylinders.*$'
-set -- $(fdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
+REGEXP='^Disk .*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
+set -- $(sfdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
 
 LILO_COMMON="lba32
 delay=1
@@ -113,9 +113,9 @@ cat > "$ROOTFS"/etc/lilo-loop.conf << EOF
 boot=$LOOPDEV
 disk=$LOOPDEV
   bios=0x80
-  heads=$1
-  sectors=$2
-  cylinders=$3
+  cylinders=$1
+  heads=$2
+  sectors=$3
   partition=$LOOPDEV1
   start=63
 $LILO_COMMON

conf.d/README

@@ -25,19 +25,19 @@
   что обязано быть и в инсталяторе, и в готовой системе
 
 - для направленного действия служат:
-  + STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
-  + STAGE2_PACKAGES (инсталятор и спасательная/"живая" система)
-  + INSTALL2_PACKAGES (инсталятор)
-  + BASE_PACKAGES, BASE_LISTS, BASE_PACKAGES_REGEXP (базовая система)
-  + MAIN_PACKAGES, MAIN_LISTS, MAIN_PACKAGES_REGEXP (дополнительные пакеты)
-  + LIVE_PACKAGES, LIVE_LISTS, LIVE_PACKAGES_REGEXP ("живая" система)
+  * STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
+  * STAGE2_PACKAGES (инсталятор и спасательная/"живая" система)
+  * INSTALL2_PACKAGES (инсталятор)
+  * BASE_PACKAGES, BASE_LISTS, BASE_PACKAGES_REGEXP (базовая система)
+  * MAIN_PACKAGES, MAIN_LISTS, MAIN_PACKAGES_REGEXP (дополнительные пакеты)
+  * LIVE_PACKAGES, LIVE_LISTS, LIVE_PACKAGES_REGEXP ("живая" система)
 
 - аналогично по модулям ядра:
-  + THE_KMODULES попадут в "пользовательскую" среду (live, main)
-  + STAGE1_KMODULES доступны в производных от stage2 (install2, live, rescue)
-  + BASE_KMODULES попадут в установку по умолчанию
-  + MAIN_KMODULES будут доступны для установки с носителя
-  + LIVE_KMODULES предназначены для LiveCD/LiveFlash
+  * THE_KMODULES попадут в "пользовательскую" среду (live, main)
+  * STAGE1_KMODULES доступны в производных от stage2 (install2, live, rescue)
+  * BASE_KMODULES попадут в установку по умолчанию
+  * MAIN_KMODULES будут доступны для установки с носителя
+  * LIVE_KMODULES предназначены для LiveCD/LiveFlash
 
 Не стоит бояться такого разнообразия, для большинства задач достаточно THE_*.
 

conf.d/desktop.mk

@@ -11,9 +11,15 @@ distro/.desktop-network: distro/.desktop-mini +vmguest
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))
 
+distro/.desktop-extra:
+	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
+
 distro/tde: distro/.desktop-mini +tde
 	@$(call set,KFLAVOURS,led-ws)
 
+distro/kde-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde
+	@$(call set,KFLAVOURS,std-def)
+
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:

conf.d/homeros.mk

@@ -0,0 +1,6 @@
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/homeros-nano: distro/.live-base use/live/textinstall use/homeros; @:
+
+endif

conf.d/live.mk

@@ -2,28 +2,30 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
-distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
+distro/rescue: distro/.base use/rescue use/efi/signed use/syslinux/ui/menu; @:
 distro/syslinux: distro/.init \
 	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
 
 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
 distro/.live-desktop: distro/.base +live use/plymouth/live; @:
+distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
 
 distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
 	use/syslinux/timeout/1 use/cleanup +power
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
 
-distro/live-builder: pkgs := livecd-tmpfs livecd-online-repo mkimage-profiles
-distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo \
+distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
 	use/syslinux/timeout/30
 	@$(call set,KFLAVOURS,$(BIGRAM))
-	@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
+	@$(call add,LIVE_LISTS,\
+		$(call tags,(base || live) && (server || builder)))
 	@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
 	@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
 	@$(call add,LIVE_PACKAGES,zsh sudo)
-	@$(call add,LIVE_PACKAGES,$(pkgs))
-	@$(call add,MAIN_PACKAGES,$(pkgs))
+
+distro/live-builder: distro/live-builder-mini use/dev/repo
+	@$(call add,MAIN_LISTS,$(call tags,live builder))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
 
 distro/live-install: distro/.live-base use/live/textinstall; @:
@@ -31,9 +33,9 @@ distro/.livecd-install: distro/.live-base use/live/install; @:
 
 distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
 distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
-distro/live-tde: distro/.live-desktop use/live/ru use/live/install +tde; @:
+distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
 
-distro/live-rescue: distro/live-icewm
+distro/live-rescue: distro/live-icewm use/efi
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
 	@$(call add,LIVE_LISTS,openssh \
 		$(call tags,(base || extra) && (archive || rescue || network)))
@@ -56,16 +58,18 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
 	@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
 	@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
 
-distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \
+distro/live-gnome: distro/.live-desktop-ru use/systemd use/live/nodm use/x11/3d-proprietary
+	@$(call add,LIVE_PACKAGES,gnome3-default)
+
+distro/live-cinnamon: distro/.live-desktop-ru use/live/autologin \
 	use/x11/cinnamon use/x11/3d-proprietary; @:
 
-distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free
+distro/live-mate: distro/.live-desktop-ru use/live/nodm use/x11/3d-free
 	@$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate))
 	@$(call set,KFLAVOURS,un-def)	# the newest one
 
-distro/live-enlightenment: distro/.live-desktop use/live/autologin \
-	use/live/ru use/x11/3d-free
-	@$(call add,LIVE_PACKAGES,enlightenment)
+distro/live-e17: distro/.live-desktop-ru use/live/autologin \
+	use/x11/e17 use/x11/gdm2.20; @:
 
 distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
 	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)

conf.d/regular.mk

@@ -0,0 +1,52 @@
+# regular build/usage images
+ifeq (distro,$(IMAGE_CLASS))
+
+# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
+distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
+	use/live/install use/live/repo use/x11/3d-free use/systemd \
+	use/firmware/wireless use/efi/signed use/luks \
+	+vmguest use/memtest use/branding use/syslinux/ui/gfxboot
+	@$(call add,LIVE_PACKAGES,openssh strace alterator-standalone)
+	@$(call add,LIVE_PACKAGES,cpufreq-simple)
+	@$(call add,LIVE_PACKAGES,livecd-online-repo apt-repo)
+	@$(call add,LIVE_PACKAGES,xdg-user-dirs)
+	@$(call add,LIVE_PACKAGES,synaptic-usermode)
+	@$(call add,LIVE_PACKAGES,firefox-ru)
+	@$(call add,LIVE_PACKAGES,net-tools)
+	@$(call add,LIVE_PACKAGES,uvcview)
+	@$(call add,LIVE_PACKAGES,powertop)
+	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
+	@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
+	@$(call set,KFLAVOURS,std-def)
+	@$(call try,SAVE_PROFILE,yes)
+
+distro/.regular-gtk: distro/.regular-desktop use/x11/gdm2.20; @:
+
+distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind
+	@$(call add,LIVE_PACKAGES,xxkb mutt)
+
+distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
+distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
+
+distro/regular-mate: distro/.regular-gtk
+	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
+
+distro/regular-e17: distro/.regular-gtk use/x11/e17
+	@$(call add,LIVE_PACKAGES,xterm xorg-xnest)
+
+distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
+	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
+
+distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
+
+distro/regular-tde: distro/.regular-desktop +tde
+	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
+	@$(call add,LIVE_PACKAGES,kdegames kdeedu)
+
+distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4
+	@$(call add,LIVE_PACKAGES,kde4-regular)
+	@$(call add,LIVE_PACKAGES,plasma-applet-networkmanager)
+
+distro/regular-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4; @:
+
+endif

conf.d/server.mk

@@ -9,8 +9,9 @@ distro/server-nano: distro/.server-base \
 	@$(call add,BASE_LISTS,$(call tags,server network))
 	@$(call add,BASE_PACKAGES,dhcpcd cpio)
 
-distro/server-mini: distro/.server-base use/server/mini use/cleanup/x11-alterator
-	@$(call set,KFLAVOURS,el-smp)
+distro/server-mini: distro/.server-base use/server/mini \
+	use/cleanup/x11-alterator use/efi
+	@$(call set,KFLAVOURS,led-ws)
 
 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
 	use/firmware/server use/firmware/wireless use/power/acpi/button

conf.d/simply.mk

@@ -7,5 +7,6 @@ distro/live-simply: distro/.livecd-install use/slinux/full
 
 distro/simply: distro/.installer use/slinux/full
 	@$(call set,INSTALLER,simply-linux)
+	@$(call add,INSTALL2_PACKAGES,sysvinit)
 
 endif

conf.d/test.mk

@@ -19,6 +19,12 @@ distro/live-gns3: distro/live-icewm
 	@$(call add,LIVE_LISTS,gns3)
 	@$(call add,LIVE_KMODULES,kvm virtualbox)
 
+distro/live-efi: distro/live-install use/efi
+	@$(call set,KFLAVOURS,un-def)	### CONFIG_FB_EFI
+
+distro/icewm-efi: distro/icewm use/efi/debug use/firmware
+	@$(call add,INSTALL2_PACKAGES,strace)
+
 distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)
 
@@ -30,9 +36,11 @@ distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
 	use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest
 	@$(call add,SYSLINUX_CFG,netinstall2)
 
+distro/desktop-luks: distro/icewm use/luks; @:
 distro/desktop-systemd: distro/icewm use/systemd; @:
 distro/desktop-plymouth: distro/icewm +plymouth; @:
 distro/live-mate-systemd: distro/live-mate use/systemd use/live/install; @:
+distro/server-efi: distro/server-mini use/efi/debug; @:
 
 endif # IMAGE_CLASS: distro
 

doc/.gitignore

@@ -0,0 +1,4 @@
+mkimage-profiles.chunked
+docbook-xsl.css
+mkimage-profiles.pdf
+mkimage-profiles.html

doc/assumptions.txt

@@ -1,7 +1,7 @@
 == Предположения фрагментов кода об окружении ==
 
 NB: пути приводятся от верхнего уровня; проект в целом предполагает
-ALT Linux 6.0+ и GNU make 3.81 (на которых и разрабатывается),
+ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатывается),
 но может быть портирован вместе с mkimage.
 
 * lib/report.mk

features.in/README

@@ -23,9 +23,14 @@
 построенных на одном базовом, можно воспользоваться подкаталогом
 с именем исходного базового субпрофиля (см. $src, $dst в Makefile).
 
+Рекомендуется давать несколько различающиеся имена скриптам,
+которые одна и та же фича может добавлять в различные стадии,
+чтобы они не выглядели одинаково в логе сборки.
+
 Наиболее востребованные цели можно снабжать "ярлычками" вроде
 "+icewm" с тем, чтобы сделать более краткими и выразительными
-использующие их правила.  Просьба не злоупотреблять количеством.
+использующие их правила.  Просьба не злоупотреблять количеством,
+такие имена предполагается показывать в интерфейсе к профилю.
 
 Каталог lib/ является специфическим для фич, определяющих
 построение конкретного вида образа -- см. build-*/.

features.in/branding/README

@@ -10,17 +10,17 @@
 Назначение и возможные значения (если требуются):
 
 - STAGE1_BRANDING
-  + относится к загрузке со сгенерированного образа (например, ISO)
-  + bootloader bootsplash (при старте)
+  * относится к загрузке со сгенерированного образа (например, ISO)
+  * bootloader bootsplash (при старте)
 
 - STAGE2_BRANDING
-  + общая часть для всех вариантов stage2
-  + bootsplash (при выключении)
+  * общая часть для всех вариантов stage2
+  * bootsplash (при выключении)
 
 - INSTALL2_BRANDING
-  + специфические пакеты брендирования инсталятора
-  + notes slideshow
+  * специфические пакеты брендирования инсталятора
+  * notes slideshow
 
 - THE_BRANDING
-  + общий список для использования в установленной системе и LiveCD
-  + alterator bootsplash graphics indexhtml notes slideshow
+  * общий список для использования в установленной системе и LiveCD
+  * alterator bootsplash graphics indexhtml notes slideshow

features.in/build-ve/image-scripts.d/08-resolv

@@ -0,0 +1,9 @@
+#!/bin/sh
+# by default hasher copy resolv.conf and /etc/hosts from host system
+# we need to change it to useful defaults
+
+echo 'nameserver 8.8.8.8' > /etc/resolv.conf
+echo 'nameserver 8.8.4.4' > /etc/resolv.conf
+#echo 'nameserver 2001:4860:4860::8888' > /etc/resolv.conf
+#echo 'nameserver 2001:4860:4860::8844' > /etc/resolv.conf
+echo '127.0.0.1 localhost.localdomain localhost' > /etc/hosts

features.in/build-ve/image-scripts.d/90-firsttime

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Run scripts from /etc/firsttime.d at first start
+[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"

features.in/build-vm/image-scripts.d/90-firsttime

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Run scripts from /etc/firsttime.d at first start
+[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"

features.in/efi/README

@@ -0,0 +1,10 @@
+Фича добавляет в образы необходимое для поддержки EFI/UEFI.
+
+Конфигурируется заданием загрузчика (EFI_BOOTLOADER)
+и файла сертификата (EFI_CERT) при помощи целей;
+пример использования доступен в ../../conf.d/regular.mk
+
+См. тж.:
+* http://www.altlinux.org/UEFI
+* http://www.rodsbooks.com/efi-bootloaders/
+* https://bugzilla.altlinux.org/showdependencytree.cgi?id=27804

features.in/efi/config.mk

@@ -0,0 +1,36 @@
+ifeq (x86_64,$(ARCH))
+
+EFI_LISTS := $(call tags,base efi)
+
+use/efi:
+	@$(call add_feature)
+	@$(call set,MKI_VER_MINIMAL,0.2.5)	# see #28219
+	@$(call add,THE_LISTS,$(EFI_LISTS))
+	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
+	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
+	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
+	@$(call add,INSTALL2_PACKAGES,dosfstools)
+	@$(call try,EFI_BOOTLOADER,elilo)	# default one
+
+use/efi/refind: use/efi
+	@$(call set,EFI_BOOTLOADER,refind)
+
+use/efi/signed: use/efi
+	@$(call set,EFI_CERT,altlinux)
+	@$(call set,EFI_SHELL,efi-shell-signed)	# even more useful
+	@$(call add,RESCUE_PACKAGES,refind-signed)
+	@$(call add,RESCUE_PACKAGES,openssl sbsigntools)
+
+use/efi/shell: use/efi
+	@$(call set,EFI_SHELL,efi-shell)
+
+use/efi/debug: use/efi
+	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
+	@$(call set,KFLAVOURS,led-ws)
+
+else
+
+# ignore on an unsupported target arch but make it hybrid at least
+use/efi use/efi/refind use/efi/signed use/efi/shell use/efi/debug: use/isohybrid
+
+endif

features.in/efi/stage2/image-scripts.d/50-efi

@@ -0,0 +1,4 @@
+#!/bin/sh
+# see also https://bugzilla.altlinux.org/27970
+
+echo efivars >> /etc/modules

features.in/firmware/config.mk

@@ -5,6 +5,8 @@
 use/firmware:
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,firmware-linux)
+	@$(call add,THE_PACKAGES,firmware-amd-ucode)
+	@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
 
 use/firmware/server: use/firmware
 	@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)

features.in/homeros/README

@@ -0,0 +1,5 @@
+Каталог содержит основную feature для создания адаптированного
+дистрибутива Homeros. Это промежуточный вариант, при помощи которого
+можно получить минимальный разговаривающий образ, но, возможно, помимо
+его дальнейшего естественного развития требуется ещё осмысление с
+точки зрения идей mkimage-profiles.

features.in/homeros/config.mk

@@ -0,0 +1,9 @@
+use/homeros:
+	@$(call add_feature)
+#	@$(call set,BRANDING,simply-linux)
+#	@$(call add,THE_BRANDING,menu xfce-settings)
+	@$(call add,THE_LISTS,homeros/voiceman)
+	@$(call add,THE_LISTS,homeros/tts)
+	@$(call add,THE_LISTS,homeros/yasr)
+	@$(call add,THE_LISTS,homeros/tools)
+#	@$(call set,META_VOL_SET,Homeros)

features.in/homeros/live/image-scripts.d/10-amixer

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+cat <<EOF > /etc/rc.d/rc.local
+#!/bin/sh
+
+amixer set Master 100%
+amixer set Master toggle
+amixer set PCM 100%
+amixer set PCM toggle
+
+EOF
+
+chmod 755 /etc/rc.d/rc.local

features.in/homeros/live/image-scripts.d/10-console-keyboard-ru

@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+echo 'KEYTABLE=ruwin_ct_sh-UTF-8' > /etc/sysconfig/keyboard
+cat <<EOF > /etc/sysconfig/i18n
+SYSFONT=UniCyr_8x16
+LANG=ru_RU.UTF-8
+SUPPORTED=ru_RU.UTF-8
+EOF

features.in/homeros/live/image-scripts.d/10-rhvoice

@@ -0,0 +1,4 @@
+#!/bin/sh -e
+
+/bin/ln -s /etc/tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
+/bin/ln -s /etc/tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output

features.in/homeros/live/image-scripts.d/10-ssh

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+chkconfig sshd on

features.in/homeros/live/image-scripts.d/10-sudo

@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+mkdir -p /etc/sudo.d
+chmod 700 /etc/sudo.d
+control su public
+control sudo public

features.in/homeros/live/image-scripts.d/10-voiceman

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+chkconfig voiceman on

features.in/homeros/live/image-scripts.d/20-altlinux-user

@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+useradd altlinux
+echo 'altlinux ALL=NOPASSWD:ALL' > /etc/sudo.d/altlinux
+chmod 400 /etc/sudo.d/altlinux

features.in/homeros/live/image-scripts.d/30-autologin

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+subst s/'^\(1:2345:respawn.*\)$'/'#\1'/ /etc/inittab 
+cat <<EOF >> /etc/inittab
+# yasr is always available on 1-st console;
+yasr:2345:respawn:/bin/openvt -w -f -c 1 -- su -l altlinux -c /usr/local/bin/yasr-with-linux-term
+EOF
+    cat <<EOF > /usr/local/bin/yasr-with-linux-term
+#!/bin/sh
+TERM=linux /usr/bin/yasr
+exit \$?
+EOF
+    chmod 755 /usr/local/bin/yasr-with-linux-term

features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat

@@ -19,11 +19,14 @@ rm -rf /usr/share/awk/
 ### TODO: x11vnc, xorg-xvfb: fix installer-common-stage2
 rpmquery -a cpp\* gcc\* perl-base file ipv6calc \
 	bind-utils libbind \
-	gnupg libgcrypt libgnutls\* libgpg-error libsoup\* \
+	libsoup\* \
 	libGL glxinfo xdriinfo \
 	make make-initrd x11vnc xorg-xvfb \
 | xargs -r rpmi -e --nodeps --
 
+### TODO: unless LUKS luks feature is requested we can also drop
+###       gnupg libgcrypt libgnutls\* libgpg-error
+
 rpmquery -a bind-utils libbind \
 | xargs -r rpmi -e --
 

features.in/install2/install2/image-scripts.d/90-install2-cleanup-drivers

@@ -17,7 +17,7 @@ rm -rf /lib/modules/*/kernel/drivers/char/{ipmi,hw_random,mwave,tpm}
 rm -rf /lib/modules/*/kernel/drivers/char/watchdog
 rm -rf /lib/modules/*/kernel/drivers/cpufreq
 rm -rf /lib/modules/*/kernel/drivers/edac
-rm -rf /lib/modules/*/kernel/drivers/firmware	###
+#rm -rf /lib/modules/*/kernel/drivers/firmware	### EFI
 rm -rf /lib/modules/*/kernel/drivers/gpio
 rm -rf /lib/modules/*/kernel/drivers/hwmon
 rm -rf /lib/modules/*/kernel/drivers/infiniband	###

features.in/live/config.mk

@@ -21,9 +21,15 @@ use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_PACKAGES,pciutils)
 	@$(call add,SYSLINUX_CFG,localboot)
 
+# preconfigure apt for both live and installed-from-live systems
+use/live/repo:
+	@$(call add,LIVE_PACKAGES,livecd-online-repo)
+	@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
+
 # alterator-based permanent installation
 use/live/install: use/metadata use/syslinux/localboot.cfg
 	@$(call add,LIVE_PACKAGES,livecd-install)
+	@$(call add,LIVE_PACKAGES,livecd-installer-features)
 
 # text-based installation script
 use/live/textinstall: use/syslinux/localboot.cfg

features.in/live/live/image-scripts.d/03-services

@@ -1,9 +1,28 @@
 #!/bin/sh
 # see also m-p-d::profiles/live/image-scripts.d/init3-services
 
-[ -x /sbin/chkconfig ] || exit 0
+[ -x /sbin/chkconfig -o -x /bin/systemctl ] || exit 0
+
+switch() {
+	case "$2" in
+	on)
+		cc=on; sc=enable;;
+	off)
+		cc=off; sc=disable;;
+	esac
+
+	{
+		[ ! -x /bin/systemctl ] || /bin/systemctl $sc $1.service
+		[ ! -x /sbin/chkconfig ] || /sbin/chkconfig $1 $cc
+	} 2>/dev/null
+}
 
 ENABLE="
+dm
+gdm
+kdm
+wdm
+prefdm
 alteratord
 livecd-evms
 livecd-fstab
@@ -13,6 +32,7 @@ livecd-setauth
 livecd-setlocale
 network
 NetworkManager
+connman
 random
 rpcbind
 "
@@ -37,6 +57,6 @@ update_wms
 xinetd
 "
 
-for i in $ENABLE;  do chkconfig $i on  2>/dev/null; done
-for i in $DISABLE; do chkconfig $i off 2>/dev/null; done
+for i in $ENABLE;  do switch $i on;  done
+for i in $DISABLE; do switch $i off; done
 :

features.in/live/live/image-scripts.d/20-locale

@@ -1,8 +1,10 @@
 #!/bin/sh -efu
 # if no means for locale setup are employed,
-# it should still be somewhat reasonable
+# it should still be at least marginally reasonable
 # NB: keyboard layout not included!
 
+if [ -s /etc/sysconfig/i18n ]; then exit 0; fi
+
 mkdir -p /etc/sysconfig
 cat >> /etc/sysconfig/i18n << _EOF_
 # mkimage-profiles live 20-locale hook

features.in/live/live/image-scripts.d/35-xdg-user-dirs

@@ -2,5 +2,11 @@
 # Turn on xdg-user-dirs.
 # NB: not yet available on t6/p6 hence the warning
 
-control xdg-user-dirs enabled ||
+. shell-config
+
+if control xdg-user-dirs enabled; then
+	shell_config_set /etc/xdg/user-dirs.defaults MOVIES 'Documents/Videos'
+	shell_config_set /etc/xdg/user-dirs.defaults PHOTOS 'Documents/Pictures'
+else
 	echo "** warning: control xdg-user-dirs failed" >&2
+fi

features.in/live/live/image-scripts.d/40-autologin

@@ -15,6 +15,28 @@ add_nopasswdlogin_group()
 	gpasswd -a "$USER" nopasswdlogin
 }
 
+BAK=".save"
+backup() {
+	[ -f "$1" -a ! -f "$1$BAK" ] || return 1
+	cp -av "$1" "$1$BAK"
+}
+
+restore_later() {
+	[ -n "$1" ] || return 0
+
+	local prefix="/usr/lib/alterator/hooks/livecd-preinstall.d"
+	[ -d "$prefix" ] || mkdir -p "$prefix"
+
+	local hook="$prefix/51-disable-autologin-again.sh"
+	[ -s "$hook" ] || cat >> "$hook" <<- EOF
+	#!/bin/sh
+	. livecd-functions
+	EOF
+
+	echo mv -v "\$destdir$1$BAK" "\$destdir$1" >> "$hook"
+	chmod +x "$hook"
+}
+
 ## setup runlevel
 INITTAB=/etc/inittab
 if [ -f "$INITTAB" ]; then
@@ -23,61 +45,92 @@ if [ -f "$INITTAB" ]; then
 fi
 
 ## autologin^2
+AUTOLOGIN_CFG=/etc/sysconfig/autologin
 if [ -x /usr/sbin/autologin ]; then
-	cat << E_O_F >> /etc/sysconfig/autologin
-USER=$USER
-AUTOLOGIN=yes
-E_O_F
+	backup "$AUTOLOGIN_CFG"
+	cat >> "$AUTOLOGIN_CFG" <<- EOF
+	USER=$USER
+	AUTOLOGIN=yes
+	EOF
+	restore_later "$AUTOLOGIN_CFG"
 fi
 
 ## lightdm autologin
 LIGHTDM_CONF=/etc/lightdm/lightdm.conf
 if [ -f "$LIGHTDM_CONF" ]; then
+	backup "$LIGHTDM_CONF"
 	sed -i \
 		-e "s/^#\(autologin-user=\).*$/\1$USER/" \
 		-e "s/^#\(autologin-user-timeout=0\)/\1/" \
 		"$LIGHTDM_CONF"
+	backup "/etc/group"
 	add_nopasswdlogin_group lightdm ||:
+
+	restore_later "$LIGHTDM_CONF"
+	restore_later "/etc/group"
 fi
 
 ## gdm2 autologin
 GDM_CONF=/etc/X11/gdm/custom.conf
 if [ -f "$GDM_CONF" ]; then
+	backup "$GDM_CONF"
 	sed -i -e '/\[daemon\]/aAutomaticLoginEnable=true\nAutomaticLogin='$USER \
 		"$GDM_CONF"
+	backup "/etc/group"
 	add_nopasswdlogin_group gdm ||:
+
+	restore_later "$GDM_CONF"
+	restore_later "/etc/group"
 fi
 
-## kdm3 autologin
-# TODO: iterate over kdm{,4} if feasible
-KDMRC=/etc/X11/kdm/kdmrc
-if [ -f "$KDMRC" ]; then
+autologin_kdm() {
+	backup "$1"
 	sed -i \
 		-e '/AutoLoginEnable/ s,^.*$,AutoLoginEnable=true,' \
 		-e '/AutoLoginUser/ s,^.*$,AutoLoginUser='$USER',' \
-		"$KDMRC"
+		"$1"
+	restore_later "$1"
+}
+
+## kdm3 autologin
+# FIXME: tde packages have kdmrc in /usr via an absolute symlink :-(
+KDM_ETC=/etc/X11/kdm
+KDM_USR=/usr/share/kde/config/kdm
+if [ "$(readlink "$KDM_ETC")" = "$KDM_USR" ]; then
+	rm -f "$KDM_ETC"
+	ln -s ../.."$KDM_USR" "$KDM_ETC"
 fi
 
+KDMRC=/etc/X11/kdm/kdmrc
+if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi
+
+## kdm4 autologin
+KDMRC=/etc/X11/kdm4/kdmrc
+if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi
+
 ## nodm autologin (the last since the most intrusive)
 # FIXME nodm and xinitrc should be modified (also in p6)
 NODM_RC=/etc/sysconfig/nodm
 NODM_EXE=/usr/sbin/nodm
-
 if [ -x "$NODM_EXE" ]; then
-	cat << E_O_F >> "$NODM_RC"
-export NODM_USER=$USER
-E_O_F
+	backup "$NODM_RC"
+	cat >> "$NODM_RC" <<- EOF
+	export NODM_USER=$USER
+	EOF
+	restore_later "$NODM_RC"
 else
 	exit 0
 fi
 
-# FIXME: drop when #27449 is fixed
+# FIXME: drop since #27449 is fixed
 PREFDM=/etc/X11/prefdm
 if [ -f "$PREFDM" ] && ! grep -q nodm "$PREFDM"; then
+	backup "$PREFDM"
 	sed -i \
 		-e '/AUTOLOGIN_EXE=/ s,^.*$,AUTOLOGIN_EXE='$NODM_EXE',' \
 		-e '/AUTOLOGIN_CFG=/ s,^.*$,AUTOLOGIN_CFG='$NODM_RC',' \
 		"$PREFDM"
+	restore_later "$PREFDM"
 fi
 
 # FIXME: drop when #27451 is fixed

features.in/luks/README

@@ -0,0 +1,2 @@
+Эта секретная фича добавляет в инсталяторы поддержку
+шифрования файловых систем с помощью LUKS при их создании.

features.in/luks/config.mk

@@ -0,0 +1,5 @@
+LUKS_LISTS := $(call tags,security luks)
+
+use/luks:
+	@$(call add,THE_LISTS,$(LUKS_LISTS))
+	@$(call add,RESCUE_LISTS,$(LUKS_LISTS))

features.in/luks/stage1/scripts.d/11-initrd-luks

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo 'FEATURES += luks' >> /etc/initrd.mk

features.in/metadata/lib/50-metadata.mk

@@ -35,6 +35,6 @@ metadata-.base:
 metadata: metadata-.base
 	@mkdir -p $(METADIR); \
 	tar -C $(PKGDIR) -cvf - \
-		$(call rlist,$(MAIN_GROUPS) .base) \
-		$(call rgroup,$(MAIN_GROUPS)) \
+		$(call rlist,$(THE_GROUPS) $(MAIN_GROUPS) .base) \
+		$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
 	> $(METADIR)/pkg-groups.tar

features.in/pack/config.mk

@@ -10,13 +10,13 @@ use/pack:
 # for direct bootable usbflash imaging
 use/pack/iso: use/pack boot/isolinux $(ISOHYBRID:%=use/isohybrid)
 ifeq (distro,$(IMAGE_CLASS))
-	@$(call set,IMAGE_PACKTYPE,isoboot)
+	@$(call set,IMAGE_PACKTYPE,boot)
 else
 	@$(call set,IMAGE_PACKTYPE,isodata)
 endif
 
 # virtual environments
-VE_ARCHIVES := tar cpio
+VE_ARCHIVES := tar cpio ubifs
 VE_COMPRESSORS := gz xz# there's no sense in bzip2 by now
 VE_ZIPS := $(call addsuffices, \
 		$(addprefix .,$(VE_COMPRESSORS)), \

features.in/stage2/stage1/scripts.d/03-test-kernel

@@ -7,7 +7,7 @@ GZ_OPTS="-comp gzip -noI"
 XZ_OPTS="-comp xz"
 LZO_OPTS="-comp lzo -noI"
 
-verbose() { [ -n "$GLOBAL_VERBOSE" ] && echo "** $@" >&2; }
+verbose() { [ -z "$GLOBAL_VERBOSE" ] || echo "** $@" >&2; }
 fatal() { echo "** error: $@" >&2; exit 1; }
 
 configured()

features.in/stage2/stage1/scripts.d/80-make-initfs

@@ -23,13 +23,10 @@ fi
 
 if make-initrd $MAKE_INITRD_OPTS; then
 	pdir="$(getconf LIBDIR)/propagator"
-	if [ -d "$pdir" ]; then		# p5/t6
-		verbose "$pdir exists"
-		gzip < /boot/initrd-$kver.img > "$pdir"/initfs
-	else
-		verbose "$pdir missing, no-op"
-	fi
+	mkdir -p "$pdir"
+	gzip < /boot/initrd-$kver.img > "$pdir"/initfs
 else
+	verbose "make-initrd failed"
 	exit 1
 fi
 

features.in/syslinux/cfg.in/README

@@ -7,9 +7,9 @@
 с тем, чтобы легче было отсматривать и сводить:
 
 - параметры append перечисляются в следующем порядке:
-  + initrd=...
-  + по алфавиту те, что без аргументов
-  + по алфавиту те, что имеют аргументы
+  * initrd=...
+  * по алфавиту те, что без аргументов
+  * по алфавиту те, что имеют аргументы
 - в конце файла пустая строка
 
 Для проверки уникальности клавиатурных сокращений

features.in/wireless/README

@@ -0,0 +1 @@
+Эта фича занимается добавлением поддержки беспроводных соединений.

features.in/wireless/config.mk

@@ -0,0 +1,6 @@
++wireless: use/wireless; @:
+
+use/wireless:
+	@$(call add_feature)
+	@$(call add,THE_KMODULES,bcmwl rt3070 staging)
+	@$(call add,THE_PACKAGES,wireless-tools rfkill crda iw)

features.in/x11/config.mk

@@ -1,6 +1,7 @@
 +icewm: use/x11/icewm; @:
 +razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
 +tde: use/x11/tde use/x11/kdm; @:
++kde: use/x11/kde use/x11/kdm4; @:
 
 use/x11/xorg:
 	@$(call add_feature)
@@ -36,6 +37,9 @@ use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5
 use/x11/kdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,kdebase-kdm<4)
 
+use/x11/kdm4: use/x11/runlevel5
+	@$(call add,THE_PACKAGES,kde4base-workspace-kdm)
+
 use/x11/gdm2.20: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,gdm2.20)
 
@@ -48,8 +52,23 @@ use/x11/razorqt: use/x11/xorg
 use/x11/tde: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,tde desktop))
 
+use/x11/kde: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,kde desktop))
+
+use/x11/kde4: use/x11/xorg
+	@$(call add,THE_PACKAGES,kde4-default)
+
 use/x11/xfce: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,xfce desktop))
 
 use/x11/cinnamon: use/x11/xorg use/x11/drm
 	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
+
+use/x11/gnome3: use/x11/xorg use/x11/drm
+	@$(call add,THE_PACKAGES,gnome3-default)
+
+use/x11/e17: use/x11/xorg use/x11/3d-free
+	@$(call add,THE_LISTS,$(call tags,e17 desktop))
+
+use/x11/lxde: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,lxde desktop))

image.in/Makefile

@@ -5,8 +5,10 @@ CURRENT_LINK := mkimage-profiles
 OUT_LINK := out
 
 # there were mkimage fixes induced by mkimage-profile development
+# - minimal version is bumped for critical bugfixes/features
+# - optimal one relates to the less universally relevant bits
 MKI_VER_MINIMAL = 0.1.7
-MKI_VER_OPTIMAL = 0.2.0
+MKI_VER_OPTIMAL = 0.2.6
 
 include distcfg.mk
 include functions.mk

lib/build.mk

@@ -3,7 +3,7 @@ ANSI_OK   ?= 1;32
 ANSI_FAIL ?= 1;31
 
 MAX_ERRORS = 3
-GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$
 
 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
@@ -21,10 +21,12 @@ LOWSPACE = 1024
 START += time -f "%E %PCPU %Mk"
 
 # /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
+# armh (armv7l) doesn't have any but should cope with qemu-arm.static;
 # also check whether non-x86 build is running native
+EARCH := $(subst armh,arm,$(ARCH))
 ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
-ifeq (,$(findstring $(ARCH),$(shell uname -m)))
-export GLOBAL_HSH_USE_QEMU=$(ARCH)
+ifeq (,$(findstring $(EARCH),$(shell uname -m)))
+export GLOBAL_HSH_USE_QEMU=$(EARCH)
 endif
 else
 START += $(ARCH)

lib/log.mk

@@ -10,7 +10,7 @@ endif
 HSH_VER_OPTIMAL = 1.3.22
 HSH_VERSION := $(shell hsh -V | sed -n 's/^.* version \([0-9.]\+\).*$$/\1/p')
 
-ifeq (-,$(shell rpmvercmp $(HSH_VERSION) $(HSH_VER_OPTIMAL) | tr -d [0-9]))
+ifeq (-,$(shell rpmvercmp $(HSH_VERSION) $(HSH_VER_OPTIMAL) | tr -d '[0-9]'))
 $(info warning: hasher-$(HSH_VERSION) is suboptimal, consider upgrading)
 endif
 

main.mk

@@ -34,7 +34,8 @@ include $(sort $(wildcard lib/*.mk))
 include conf.d/*.mk
 include features.in/*/config.mk
 
-# starts to look copypastey
+# FIXME: this is buggy since *.mk can expose parts conditionally
+#        (e.g. test.mk does DEBUG-only bits) and these will fail
 DISTRO_TARGETS := $(shell sed -n 's,^\(distro/[^:.]\+\):.*$$,\1,p' \
 		lib/distro.mk $(wildcard conf.d/*.mk) | sort -u)
 VE_TARGETS := $(shell sed -n 's,^\(ve/[^:.]\+\):.*$$,\1,p' \

pkg.in/lists/homeros/tools

@@ -0,0 +1,6 @@
+su
+sudo
+net-tools
+openssh-server
+amixer
+alsa-utils

pkg.in/lists/homeros/tts

@@ -0,0 +1,2 @@
+RHVoice
+espeak

pkg.in/lists/homeros/voiceman

@@ -0,0 +1,3 @@
+voiceman-server
+voiceman
+voiceman-tools

pkg.in/lists/homeros/yasr

@@ -0,0 +1 @@
+yasr

pkg.in/lists/tagged/base+efi

@@ -0,0 +1,7 @@
+gdisk
+parted
+dosfstools
+grub2-efi
+elilo
+efibootmgr
+installer-feature-efi-stage3

pkg.in/lists/tagged/base+extra

@@ -0,0 +1,28 @@
+# Disk utils
+parted
+quota
+time
+acl
+
+# Applications/Editors
+vim-console
+
+# Filesystem utils
+dosfstools
+ntfs-3g
+reiserfsprogs
+cifs-utils
+extundelete
+
+# Applications/Networking
+lftp
+rsync
+tcpdump
+telnet
+
+# Applications/Shells
+bc
+mc
+
+# Development/Debuggers
+strace

pkg.in/lists/tagged/desktop+e17

@@ -0,0 +1,3 @@
+e17-default
+evas_generic_loaders
+gnome-icon-theme

pkg.in/lists/tagged/desktop+e17+extra

@@ -0,0 +1,6 @@
+gst-plugins-*
+gst-ffmpeg
+gnome-mplayer
+
+econnman
+connman

pkg.in/lists/tagged/desktop+kde

@@ -0,0 +1,15 @@
+kde4base-workspace-core
+kde4base-dolphin
+kde4-ksnapshot
+kde4-konsole
+kde4-gwenview
+kde4utils-ark
+kde4utils-kcalc
+kde4-kbluetooth
+kde4-kolourpaint
+kde4-okular
+kde4-i18n-ru
+kde4base-plasma-applets
+plasma-applet-showdesktop
+kde4multimedia-kmix
+ConsoleKit

pkg.in/lists/tagged/desktop+kde+extra

@@ -0,0 +1,5 @@
+kde4-amarok
+kde4-krusader
+kde4-digikam
+kde4-digikam-image-plugins
+smplayer

pkg.in/lists/tagged/desktop+lxde

@@ -0,0 +1,19 @@
+openbox
+
+pcmanfm2
+
+lxde-common
+lxde-lxpanel
+lxde-lxsession
+lxde-lxsession-edit
+lxde-lxrandr
+lxde-lxtask
+lxde-lxshortcut
+lxde-lxappearance
+lxde-lxappearance-obconf
+lxde-lxshortcut
+
+menu-cache
+altlinux-freedesktop-menu-lxde
+
+tango-icon-theme

pkg.in/lists/tagged/desktop+lxde+extra

@@ -0,0 +1,26 @@
+tango-icon-theme-extras
+
+# lxterminal is reportedly sub-par (gns@) but official (aen@)
+lxde-lxterminal
+#sakura
+
+leafpad
+galculator
+deadbeef
+mtpaint
+parcellite
+
+# gqview has thumbnails support, gpicview doesn't
+gqview
+
+# file-roller is recommended over xarchiver (gns@) and not that fatty yet
+file-roller
+
+# for pcmanfm2 (aen@)
+gvfs
+gvfs-backends
+gvfs-utils
+fuse-gvfs
+
+# openbox behaviour, virtual desktops, etc
+obconf

pkg.in/lists/tagged/desktop+mate

@@ -35,7 +35,7 @@ mate-power-manager
 mate-screensaver
 mate-terminal
 mate-utils
-mate-utils-mate-system-log
+#mate-utils-mate-system-log
 
 mate-file-manager-extensions
 mate-file-manager-image-converter
@@ -45,6 +45,5 @@ parcellite
 
 ### should be dropped at some stage; see bugreports within this thread:
 # http://lists.altlinux.org/pipermail/sisyphus/2012-August/358079.html
-libmatekbd-capplet
 iso-codes
 tzdata

pkg.in/lists/tagged/desktop+nm

@@ -0,0 +1,10 @@
+NetworkManager
+NetworkManager-vpnc
+NetworkManager-openvpn
+NetworkManager-pptp
+#NetworkManager-l2tp
+NetworkManager-openvpn-gnome
+NetworkManager-pptp-gnome
+NetworkManager-vpnc-gnome
+#NetworkManager-l2tp-gnome
+usb-modeswitch