0.6.4-alt1

- simply better (tm)
add simply branding things
2012-04-23 23:41:48 +03:00 · 2012-04-23 23:35:43 +03:00 · 2012-04-23 23:35:43 +03:00 · 2012-04-23 23:35:43 +03:00 · 2012-04-23 23:28:40 +03:00 · 2012-04-23 23:28:32 +03:00
72 changed files with 745 additions and 92 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.6.3
+Version: 0.6.4
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -61,6 +61,9 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART

 %changelog
+* Mon Apr 23 2012 Michael Shigorin <mike@altlinux.org> 0.6.4-alt1
+- simply better (tm)
+
 * Mon Apr 09 2012 Michael Shigorin <mike@altlinux.org> 0.6.3-alt1
 - massive squashfs tuning

--- a/.gear/tags/5090c03579f3fc620063211417b18e9a57a0eb8d
+++ b/.gear/tags/5090c03579f3fc620063211417b18e9a57a0eb8d
@@ -0,0 +1,6 @@
+object d190759717b97a39e5d0de0ffb555424d6b1c335
+type commit
+tag v0.6.3
+tagger Michael Shigorin <mike@altlinux.org> 1334001608 +0300
+
+squash!
--- a/.gear/tags/5b441e948d3bca3360d062ec7a36cdfa348f67f7
+++ b/.gear/tags/5b441e948d3bca3360d062ec7a36cdfa348f67f7
@@ -1,6 +0,0 @@
-object 5347d342cca7ad1c23b866a81a70735b7b59616f
-type commit
-tag v0.6.2
-tagger Michael Shigorin <mike@altlinux.org> 1333380199 +0300
-
-webkiosk
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-5b441e948d3bca3360d062ec7a36cdfa348f67f7 v0.6.2
+5090c03579f3fc620063211417b18e9a57a0eb8d v0.6.3
--- a/7
+++ b/7
@@ -43,7 +43,10 @@ export NUM_TARGETS := $(words $(MAKECMDGOALS))
 	for ARCH in $(ARCHES); do \
 		if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then say; fi; \
 		say "** ARCH: $$ARCH" >&2; \
-		$(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); \
-		$(MAKE) -f reports.mk ARCH=$$ARCH; \
+		if $(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); then \
+			if [ -n "$$REPORT" ]; then \
+				$(MAKE) -f reports.mk ARCH=$$ARCH; \
+			fi; \
+		fi; \
 	done; \
 	if [ "$$n" -lt "$(NUM_TARGETS)" ]; then say; fi
--- a/conf.d/README
+++ b/conf.d/README
@@ -17,15 +17,20 @@
  что обязано быть и в инсталяторе, и в готовой системе
 - для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES
  (NB: попадают в базовую систему)
- для "пользовательского" (live, main) есть THE_GROUPS, THE_LISTS
-  и THE_PACKAGES
+- для "пользовательского" окружения (live, main) предназначены
+  THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP
+- для строго направленного действия служат:
+  + STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
+  + 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 и установленную систему)

 По подстановкам:
 - $(VAR) подставляются перед их записью в $(CONFIG), который distcfg.mk
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -6,7 +6,7 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg

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

-distro/.desktop-network: distro/.desktop-mini use/virtualbox/guest
+distro/.desktop-network: distro/.desktop-mini +vmguest
 	@$(call add,BASE_LISTS,$(call tags,(base || desktop) && network))

 distro/icewm: distro/.desktop-network use/lowmem +icewm; @:
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -21,6 +21,7 @@ distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum

 distro/live-builder: pkgs := livecd-tmpfs livecd-online-repo mkimage-profiles
 distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
+	@$(call set,KFLAVOURS,$(BIGRAM))
 	@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
 	@$(call add,LIVE_PACKAGES,zsh sudo)
 	@$(call add,LIVE_PACKAGES,$(pkgs))
@@ -30,7 +31,7 @@ distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
 distro/live-install: distro/.live-base use/syslinux/localboot.cfg
 	@$(call add,LIVE_PACKAGES,live-install)

-distro/livecd-install: distro/.live-base use/syslinux/localboot.cfg
+distro/.livecd-install: distro/.live-base
 	@$(call add,LIVE_PACKAGES,livecd-install)

 distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
@@ -53,4 +54,7 @@ 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 \
+	use/x11/cinnamon use/x11/3d-free
+
 endif
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -19,12 +19,11 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator

 distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:

-distro/server-ovz: distro/server-mini use/install2/net \
-	use/hdt use/rescue use/firmware/server use/power/acpi/button
+distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
+	use/firmware/server use/firmware/wireless use/power/acpi/button
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
 	@$(call add,BASE_KMODULES,rtl8168 rtl8192)
-	@$(call add,MAIN_KMODULES,bcmwl ndiswrapper)
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)
--- a/conf.d/simply.mk
+++ b/conf.d/simply.mk
@@ -0,0 +1,9 @@
+# simply images
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/live-simply: distro/.livecd-install use/isohybrid use/slinux-live use/systemd \
+	use/firmware/wireless use/x11/drm use/x11/3d-proprietary use/syslinux/ui/gfxboot
+	@$(call set,BRANDING,simply-linux)
+
+endif
--- a/doc/variables.txt
+++ b/doc/variables.txt
@@ -71,7 +71,7 @@
  + см. ../lib/build.mk

 - REPORT
-  + запрашивает создание отчёта о собранном образе
+  + запрашивает создание отчётов о собранном образе
  + значение: пусто (по умолчанию) либо любая строка
  + NB: в силу специфики обработки передаётся только явно
  + см. ../Makefile, ../report.mk, ../lib/report.mk
@@ -89,6 +89,12 @@
    - fast: gzip/lzo (быстрее запаковывается и распаковывается, меньше степень)
  + см. ../features.in/stage2/stage1/scripts.d/03-test-kernel

+- SORTDIR
+  + дополнительно структурирует каталог собранных образов
+  + значение: пусто (по умолчанию) либо строка
+    - например, '$(IMAGE_NAME)/$(DATE)'
+  + см. ../image.in/Makefile
+
 пример
 ~~~~~~
 make DEBUG=1 CLEAN=1 distro/syslinux.iso
--- a/features.in/Makefile
+++ b/features.in/Makefile
@@ -25,6 +25,9 @@ define grepper_body
 	done
 endef

+%:
+	$(error BUILDDIR not defined)
+
 else

 include $(BUILDDIR)/distcfg.mk
--- a/features.in/bootloader/config.mk
+++ b/features.in/bootloader/config.mk
@@ -5,6 +5,7 @@
 # - remember .base if adding yet another *_PACKAGES

 use/bootloader: use/install2 sub/main
+	@$(call add_feature)
 	@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))

 use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
--- a/features.in/build-ve/image-scripts.d/03services
+++ b/features.in/build-ve/image-scripts.d/03services
@@ -8,6 +8,6 @@

 [ -x /sbin/chkconfig ] || exit 0

-for i in network random syslogd random; do chkconfig $i on; done
+for i in network random syslogd; do chkconfig $i on; done
 for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
 :
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -3,17 +3,23 @@
 #     for mkmodpack to use

 use/firmware:
+	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,firmware-linux)

 use/firmware/server: use/firmware
 	@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-ql.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)

+# NB: individual firmwarez would sometimes conflict
+#     with ones newly merged into firmware-linux
+# FIXME: kernel modules rather belong to use/hardware
 use/firmware/wireless: use/firmware
-	@$(call add,MAIN_PACKAGES,firmware-acx100)
-	@$(call add,MAIN_PACKAGES,firmware-i2400m)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-carl9170.*)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-ipw.*)
-	@#$(call add,MAIN_PACKAGES_REGEXP,firmware-iwl.*)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-rt.*)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-zd.*)
+	@$(call add,THE_KMODULES,bcmwl ndiswrapper)
+	@$(call add,THE_PACKAGES,firmware-acx100)
+	@#$(call add,THE_PACKAGES,firmware-i2400m)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
+	@#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
+	@#$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -5,6 +5,9 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_LISTS,$(call tags,basesystem))

-### FR: curl-mini
 use/install2/net: use/install2
 	@$(call add,INSTALL2_PACKAGES,curl)
+
+# see also use/vm/kvm/guest; qxl included in xorg pkglist
+use/install2/kvm:
+	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -10,9 +10,9 @@ use/live/base: use/live use/syslinux/ui/menu
 	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))

 # optimized out: use/x11/xorg
-use/live/desktop: use/live/base use/x11/wacom use/virtualbox/guest \
-	use/live/sound +power
+use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
+	@$(call add,LIVE_LISTS,$(call tags,base l10n))
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
 	@$(call add,SYSLINUX_CFG,localboot)

--- a/features.in/live/live/image-scripts.d/03services
+++ b/features.in/live/live/image-scripts.d/03services
@@ -0,0 +1,42 @@
+#!/bin/sh
+# see also m-p-d::profiles/live/image-scripts.d/init3-services
+
+[ -x /sbin/chkconfig ] || exit 0
+
+ENABLE="
+alteratord
+livecd-evms
+livecd-fstab
+livecd-hostname
+livecd-save-nfs
+livecd-setauth
+livecd-setlocale
+network
+NetworkManager
+random
+rpcbind
+"
+
+# NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799
+# NB: sshd might be needed for some particular cases
+DISABLE="
+anacron
+bridge
+clamd
+crond
+dhcpd
+dnsmasq
+mdadm
+netfs
+openvpn
+rawdevices
+slapd
+smartd
+sshd
+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
+:
--- a/features.in/live/live/stage2cfg.mk
+++ b/features.in/live/live/stage2cfg.mk
@@ -2,6 +2,9 @@

 STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES)

+IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
+			$(LIVE_PACKAGES_REGEXP)
+
 IMAGE_PACKAGES = $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
 		 $(call map,list, \
 			$(THE_LISTS) $(THE_GROUPS) \
--- a/features.in/ltsp/config.mk
+++ b/features.in/ltsp/config.mk
@@ -1,6 +1,7 @@
 +ltsp: use/ltsp/base; @:

 use/ltsp:
+	@$(call add_feature)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
 	@$(call add,MAIN_LISTS,ltsp-client ltsp-client.$(ARCH))
 	@$(call add,BASE_LISTS,ltsp)
--- a/features.in/power/config.mk
+++ b/features.in/power/config.mk
@@ -3,6 +3,7 @@
 # common
 # TODO: invent multi-target scripts and integrate that 08-powerbutton
 use/power:
+	@$(call add_feature)
 	@$(call add,COMMON_PACKAGES,installer-feature-powerbutton-stage3)

 # modern power management
--- a/features.in/slinux/README
+++ b/features.in/slinux/README
@@ -0,0 +1 @@
+Наборы пакетов для семейства дистрибутивов Simply Linux.
--- a/features.in/slinux/config.mk
+++ b/features.in/slinux/config.mk
@@ -0,0 +1,17 @@
+use/slinux: use/x11/xfce use/x11/gdm2.20
+	@$(call add_feature)
+	@$(call add,THE_LISTS,gnome-p2p)
+	@$(call add,THE_LISTS,slinux/$(ARCH))
+	@$(call add,THE_LISTS,slinux/games)
+	@$(call add,THE_LISTS,slinux/graphics)
+	@$(call add,THE_LISTS,slinux/live)
+	@$(call add,THE_LISTS,slinux/misc)
+	@$(call add,THE_LISTS,slinux/misc-dvd)
+	@$(call add,THE_LISTS,slinux/multimedia)
+	@$(call add,THE_LISTS,slinux/network)
+	@$(call add,THE_LISTS,slinux/xfce)
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,THE_PACKAGES,apt-conf-sisyphus)
+
+use/slinux-live: use/slinux
+	@$(call add,THE_LISTS,slinux/live-install)
--- a/features.in/slinux/live/image-scripts.d/50services
+++ b/features.in/slinux/live/image-scripts.d/50services
@@ -0,0 +1,38 @@
+#!/bin/sh -x
+
+SYSTEMCTL=/bin/systemctl
+CHKCONFIG=/sbin/chkconfig
+
+turn_on() {
+	if [ -x $SYSTEMCTL ]; then
+		$SYSTEMCTL enable ${*}.service
+	else if [ -x $CHKCONFIG ]; then
+		$CHKCONFIG $* on
+	else
+		exit 0
+	fi
+fi
+}
+
+turn_off() {
+	if [ -x $SYSTEMCTL ]; then
+		$SYSTEMCTL disable ${*}.service
+	else if [ -x $CHKCONFIG ]; then
+		$CHKCONFIG $* off
+	else
+		exit 0
+	fi
+fi
+}
+
+SERVICES_TO_ENABLE="NetworkManager"
+SERVICES_TO_DISABLE=
+
+for i in $SERVICES_TO_ENABLE; do
+	turn_on $i;
+done
+
+for i in $SERVICES_TO_DISABLE; do
+	turn_off $i;
+done
+:
--- a/features.in/virtualbox/config.mk
+++ b/features.in/virtualbox/config.mk
@@ -1,4 +0,0 @@
-use/virtualbox/guest:
-	@$(call add_feature)
-	@$(call add,THE_KMODULES,virtualbox-addition)
-	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
--- a/features.in/vm/config.mk
+++ b/features.in/vm/config.mk
@@ -0,0 +1,13 @@
+vmguest: use/vm/virtualbox/guest use/vm/kvm/guest; @:
+
+use/vm/virtualbox/guest:
+	@$(call add_feature)
+	@$(call add,THE_KMODULES,virtualbox-addition)
+	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
+
+# NB: only reasonable for X11-bearing images
+use/vm/kvm/guest:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,spice-vdagent)
+
+# see also use/install2/kvm
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -3,6 +3,7 @@
 +tde: use/x11/tde use/x11/kdm; @:

 use/x11/xorg:
+	@$(call add_feature)
 	@$(call add,THE_LISTS,xorg)

 use/x11/wacom: use/x11/xorg
@@ -35,6 +36,9 @@ use/x11/lightdm: use/x11/runlevel5
 use/x11/kdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,kdebase-kdm)

+use/x11/gdm2.20: use/x11/runlevel5
+	@$(call add,THE_PACKAGES,gdm2.20)
+
 use/x11/icewm: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,icewm desktop))

@@ -43,3 +47,9 @@ use/x11/razorqt: use/x11/xorg

 use/x11/tde: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,tde desktop))
+
+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))
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -11,6 +11,7 @@ MKI_VER_OPTIMAL = 0.2.0
 include distcfg.mk
 include functions.mk

+# check the build environment
 ifeq (,$(realpath $(MKIMAGE_PREFIX)/config.mk))
 $(error please apt-get install mkimage and have a look at QUICKSTART as well)
 endif
@@ -26,9 +27,19 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
 $(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
 endif

+# additional means to reduce havoc in IMAGEDIR
+IMAGE_SORTDIR := $(SORTDIR)
+
 # reconstruct instead of passing yet another variable
-IMAGE_LINK := $(IMAGE_NAME).$(IMAGE_TYPE)
-IMAGE_OUTFILE := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
+IMAGE_OUTDIR   := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)
+IMAGE_OUTFILE  := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
+IMAGE_OUTPATH  := $(IMAGE_OUTDIR)/$(IMAGE_OUTFILE)
+IMAGE_RELPATH  := $(IMAGE_SORTDIR:%=%/)$(IMAGE_OUTFILE)
+IMAGE_RELDIR   := $(IMAGE_OUTDIR:$(GLOBAL_BUILDDIR)/%=%)
+IMAGE_LINK     := $(IMAGE_NAME).$(IMAGE_TYPE)
+IMAGE_LINKPATH := $(IMAGEDIR)/$(IMAGE_LINK)
+
+### multi-pack can be useful (think netinst iso/tree)
 MKI_PACK_RESULTS = $(IMAGE_PACKTYPE):$(IMAGE_OUTFILE)

 # these get opied over as is
@@ -44,7 +55,7 @@ include lib/*.mk
 include $(MKIMAGE_PREFIX)/targets.mk

 # specified only for the final image (target-specific)
-pack-image: OUTDIR = $(IMAGEDIR)
+pack-image: OUTDIR = $(IMAGE_OUTDIR)
 pack-image: imagedir

 copy-tree: $(SAVE_PROFILE:%=save-profile)
@@ -57,18 +68,18 @@ save-profile:
 .PHONY: imagedir postprocess debug

 imagedir:
-	@mkdir -p "$(IMAGEDIR)"
+	@mkdir -p "$(IMAGE_OUTDIR)"

 postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
-	@OUTPATH="$(IMAGEDIR)/$(IMAGE_OUTFILE)"; \
-	OUTSIZE="`ls -lh "$$OUTPATH" | cut -f5 -d' '`"; \
-	echo "** image: $$OUTPATH [$$OUTSIZE]" >&2 && \
-	ln -sf "$(IMAGE_OUTFILE)" "$(IMAGEDIR)/$(IMAGE_LINK)" && \
-	ln -sf "$${IMAGEDIR#`pwd`/}" "$(OUT_LINK)"; \
-	ln -sf "$(IMAGE_LINK)" $(OUT_LINK)/"$(CURRENT_LINK).$(IMAGE_TYPE)"; \
+	@OUTSIZE="`ls -lh "$(IMAGE_OUTPATH)" | cut -f5 -d' '`"; \
+	echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \
+	echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \
+	ln -sf "$(IMAGE_RELPATH)" "$(IMAGE_LINKPATH)" && \
+	ln -sf "$(IMAGE_RELDIR)" "$(OUT_LINK)" && \
+	ln -sf "$(IMAGE_LINK)" "$(IMAGEDIR)/$(CURRENT_LINK).$(IMAGE_TYPE)"; \
 	if [ -n "$(GLOBAL_DEBUG)" ]; then \
-		cp -a build.log "$$OUTPATH.log"; \
-		cp -a distcfg.mk "$$OUTPATH.cfg"; \
+		cp -a build.log "$(IMAGE_OUTPATH).log"; \
+		cp -a distcfg.mk "$(IMAGE_OUTPATH).cfg"; \
 	fi

 debug:
--- a/lib/build.mk
+++ b/lib/build.mk
@@ -2,6 +2,8 @@
 ANSI_OK   ?= 1;32
 ANSI_FAIL ?= 1;31

+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (Stop|failed)\.))$$
+
 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
 endif
@@ -48,7 +50,7 @@ build-image: profile/populate
 		echo "$(TIME) done (`tail -1 $(BUILDLOG) | cut -f1 -d.`)"; \
 		tail -200 "$(BUILDLOG)" $(SHORTEN) \
 		| GREP_COLOR="$(ANSI_OK)" GREP_OPTIONS="--color=auto" \
-		  grep '^\*\* image: .*' ||:; \
+		  grep '^\*\* image: .*$$' ||:; \
 	else \
 		echo -n "$(TIME) failed, see log"; \
 		if [ -z "$(DEBUG)" ]; then \
@@ -59,7 +61,7 @@ build-image: profile/populate
 		fi; \
 		tail -200 "$(BUILDLOG)" \
 		| GREP_COLOR="$(ANSI_FAIL)" GREP_OPTIONS="--color=auto" \
-		  egrep "^((E:|[Ee]rror|[Ww]arning).*)|(.* Stop\.)$$"; \
+		  egrep "$(GOTCHA)"; \
 		df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
 			{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
 	fi; \
--- a/lib/common.mk
+++ b/lib/common.mk
@@ -0,0 +1,16 @@
+# common bits for building and reporting parts
+
+# somewhat reusable
+BUILD_LOG = build.log
+
+# link it to BUILDDIR if possible
+SYMLINK = build
+
+# brevity postprocessor; not exported, for toplevel use only
+SHORTEN = $(shell \
+	echo -n "| sed"; \
+	if [ -s "$(SYMLINK)" ]; then \
+		echo -n " -e 's,$(BUILDDIR),$(SYMLINK),'"; \
+	fi; \
+	echo -n " -e 's,$(TMP),\$$TMP,' -e 's,$(HOME),~,'"; \
+)
--- a/lib/distro.mk
+++ b/lib/distro.mk
@@ -31,7 +31,8 @@ distro/.base: distro/.init

 # something marginally useful (as a network-only installer)
 # NB: doesn't carry stage3 thus cannot use/bootloader
-distro/installer: distro/.base use/install2 use/syslinux/localboot.cfg
+distro/installer: distro/.base use/install2 use/install2/kvm \
+	use/syslinux/localboot.cfg
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call set,STAGE1_KMODULES_REGEXP,drm.*)	# for KMS

--- a/lib/kernel.mk
+++ b/lib/kernel.mk
@@ -0,0 +1,10 @@
+ifndef MKIMAGE_PROFILES
+$(error this makefile is designed to be included in toplevel one)
+endif
+
+# choose std kernel flavour for max RAM size support
+ifeq (i586,$(ARCH))
+BIGRAM := std-pae
+else
+BUGRAM := std-def
+endif
--- a/lib/log.mk
+++ b/lib/log.mk
@@ -14,7 +14,7 @@ ifeq (-,$(shell rpmvercmp $(HSH_VERSION) $(HSH_VER_OPTIMAL) | tr -d [0-9]))
 $(info warning: hasher-$(HSH_VERSION) is suboptimal, consider upgrading)
 endif

-BUILDLOG ?= $(BUILDDIR)/build.log
+BUILDLOG ?= $(BUILDDIR)/$(BUILD_LOG)

 # LOG holds a redirecting postprocessor
 ifdef DEBUG
@@ -35,12 +35,3 @@ DATE = $(shell date +%Y%m%d)
 TIME = `date +%H:%M:%S`

 export BUILDLOG DATE GLOBAL_DEBUG GLOBAL_VERBOSE LOG MAKE SHELL
-
-# brevity postprocessor; not exported, for toplevel use only
-SHORTEN = $(shell \
-	echo -n "| sed"; \
-	if [ -s "$(SYMLINK)" ]; then \
-		echo -n " -e 's,$(BUILDDIR),$(SYMLINK),'"; \
-	fi; \
-	echo -n " -e 's,$(TMP),\$$TMP,' -e 's,$(HOME),~,'"; \
-)
--- a/lib/profile.mk
+++ b/lib/profile.mk
@@ -2,8 +2,6 @@ ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
 endif

-SYMLINK = build
-
 # this could have come from env; or could be symlinked; or is made anew
 # (the reuse rationale is avoiding extra tmpdir lookups)
 # NB: immediate assignment matters
--- a/pkg.in/lists/Makefile
+++ b/pkg.in/lists/Makefile
@@ -2,8 +2,17 @@
 #         (and only those!) over to $(BUILDDIR)

 ifndef BUILDDIR
-$(error BUILDDIR not defined)
-endif
+
+pkgdups:
+	@find -type f ! -name README ! -name Makefile \
+	| grep -v '~$$' \
+	| sed 's,^\./,,g' \
+	| xargs ../../bin/pkgdups
+
+%:
+	$(error BUILDDIR not defined)
+
+else

 include $(BUILDDIR)/distcfg.mk
 SUFFIX := pkg/lists
@@ -46,6 +55,7 @@ endef
 dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
 dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)

+# BASE_PACKAGES, BASE_LISTS and whatever else goes into base install
 dot-base:
 	@# construct .base packagelist for alterator-pkg
 	@{ \
@@ -64,3 +74,5 @@ debug:
 		$(filter %_LISTS,$(sort $(.VARIABLES))), \
 		$(if $(filter environment% file,$(origin $V)),\
 			$(shell echo '\\n"**"' $V: $(value $V)))) '\n'
+
+endif
--- a/pkg.in/lists/README
+++ b/pkg.in/lists/README
@@ -9,8 +9,7 @@
 Подкаталог tagged/ содержит тегированные списки, имена которых
 удобно получать функцией tags() (см. ../../lib/functions.mk).

-Для выявления дубликатов в составе списков служит запускаемый
-с указанием перечня анализируемых файлов скрипт ../../bin/pkgdups;
+Для выявления дубликатов в составе списков служит `make pkgdups';
 пытаться избежать дублей на 100% скорее бесполезно, но бродячие
 устойчивые группы пакетов могут заслуживать выделения отдельным
 списком.
--- a/pkg.in/lists/gnome-p2p
+++ b/pkg.in/lists/gnome-p2p
@@ -0,0 +1,2 @@
+transmission-gtk
+eiskaltdcpp-gtk
--- a/pkg.in/lists/kernel-wifi
+++ b/pkg.in/lists/kernel-wifi
@@ -1 +0,0 @@
-firmware-rt73
--- a/pkg.in/lists/slinux/dropbox
+++ b/pkg.in/lists/slinux/dropbox
@@ -0,0 +1,2 @@
+dropbox
+thunar-dropbox-plugin
--- a/pkg.in/lists/slinux/games
+++ b/pkg.in/lists/slinux/games
@@ -0,0 +1,17 @@
+# gnome-games
+
+#gnome-games-glines
+#gnome-games-gnect
+#gnome-games-gnibbles
+gnome-games-gnobots
+#gnome-games-quadrapassel
+gnome-games-gnomine
+gnome-games-gnotravex
+gnome-games-gnotski
+#gnome-games-gtali
+#gnome-games-iagno
+gnome-games-mahjongg
+#gnome-games-swell-foop
+gnome-games-sol
+gnome-games-sudoku
+gnome-games-glchess
--- a/pkg.in/lists/slinux/games-dvd
+++ b/pkg.in/lists/slinux/games-dvd
@@ -0,0 +1,18 @@
+freeciv
+wesnoth
+ppracer
+sauerbraten
+
+instead-launcher
+instead-cat
+
+Ri-li
+openttd
+openastromenace
+PokerTH
+
+celestia-gnome
+
+gcompris
+gcompris-voices-en
+gcompris-voices-ru
--- a/pkg.in/lists/slinux/graphics
+++ b/pkg.in/lists/slinux/graphics
@@ -0,0 +1,10 @@
+gimp2
+gimp-plugin-gutenprint
+xsane-gimp2
+# inkscape
+gphoto2
+sane
+xsane
+
+gthumb
+yagf
--- a/pkg.in/lists/slinux/graphics-dvd-blender
+++ b/pkg.in/lists/slinux/graphics-dvd-blender
@@ -0,0 +1,3 @@
+blender
+blender-plugins-yafaray
+blender-plugins-localdocs
--- a/pkg.in/lists/slinux/graphics-dvd-inkscape
+++ b/pkg.in/lists/slinux/graphics-dvd-inkscape
@@ -0,0 +1 @@
+inkscape
--- a/pkg.in/lists/slinux/graphics-dvd-shotwell
+++ b/pkg.in/lists/slinux/graphics-dvd-shotwell
@@ -0,0 +1 @@
+shotwell
--- a/pkg.in/lists/slinux/graphics-dvd-synfigstudio
+++ b/pkg.in/lists/slinux/graphics-dvd-synfigstudio
@@ -0,0 +1 @@
+synfigstudio
--- a/pkg.in/lists/slinux/i586
+++ b/pkg.in/lists/slinux/i586
--- a/pkg.in/lists/slinux/live
+++ b/pkg.in/lists/slinux/live
@@ -0,0 +1,18 @@
+lftp-
+
+python-module-PyQt4-
+libqt4-test-
+libqt4-uitools-
+libqt4-xmlpatterns-
+libqt4-declarative-
+libqt4-scripttools-
+libqt4-svg-
+libqt4-help-
+libqt4-designer-
+libqt4-webkit-
+libqt4-multimedia-
+libqt4-opengl-
+libqt4-clucene-
+libqt4-script-
+libqt4-qt3support-
+libqt4-sql-
--- a/pkg.in/lists/slinux/live-install
+++ b/pkg.in/lists/slinux/live-install
@@ -0,0 +1,2 @@
+installer-feature-simply-livecd
+livecd-setlocale
--- a/pkg.in/lists/slinux/misc
+++ b/pkg.in/lists/slinux/misc
@@ -0,0 +1,124 @@
+strace
+pm-utils
+
+fvwm-
+fvwm-full-
+altlinux-freedesktop-menu-shallow-menu
+altlinux-freedesktop-menu-icon-theme-default
+#altlinux-freedesktop-menu-common
+docs-simply-linux
+docs-linux_intro
+fonts-ttf-droid
+fonts-ttf-ubuntu-font-family
+fonts-ttf-liberation
+fonts-ttf-dejavu
+gnome-system-monitor
+gnome-icon-theme
+#tango-icon-theme
+#tango-icon-theme-extras
+gdm2.20-help
+ntfsprogs-
+driconf-
+
+# Branding things
+branding-simply-linux-xfce-settings
+branding-simply-linux-menu
+branding-simply-linux-alterator
+branding-sisyphus-server-light-alterator-
+
+#branding-simply-linux-bootloader
+#branding-simply-linux-bootsplash
+branding-simply-linux-graphics
+branding-simply-linux-indexhtml
+branding-simply-linux-notes
+#branding-simply-linux-release
+branding-simply-linux-slideshow
+
+
+#added through use/syslinux/gfx... ?
+#branding-simply-linux-bootloader
+gdm-theme-simply
+
+kde4libs-
+kde-common-
+kde3-menu-common-
+kde3-menu-resources-
+kde4-menu-common-
+kde4-menu-resources-
+
+firefox
+firefox-ru
+xulrunner-gnome-support
+file-roller
+unzip
+unrar
+unarj
+dbus-tools-gui
+brasero
+medit
+gcalctool
+synaptic
+synaptic-usermode
+apt-indicator
+gksu
+cups
+ghostscript-cups
+cups-pdf
+avahi-daemon
+blueman
+update-kernel
+printer-drivers-base
+udev-extras
+hostname-hook-hosts
+libnss-mdns
+pulseaudio-daemon
+pulseaudio-utils
+pavucontrol
+alsa-plugins-pulse
+fdisk
+cpufreq-simple
+attr
+rfkill
+
+# Alterator
+alterator-x11
+alterator-auth
+alterator-xkb
+alterator-pkg
+alterator-packages
+alterator-datetime
+alterator-standalone
+alterator-sysconfig
+
+# Additional
+gnome-search-tool
+yelp
+
+# Compiz things
+compiz
+python-module-fusion-icon-gtk
+compiz-gtk
+
+#aen
+#elinks-
+rpminstall
+system-config-printer
+system-config-printer-udev
+#krb5-ticket-watcher-
+apt-repo
+#krb5-ticket-watcher-
+rekonq-
+xdg-user-dirs
+x-cursor-theme-jimmac
+
+plymouth
+#branding-simply-linux-bootsplash
+
+# Office
+java-1.6.0-sun
+libreoffice
+libreoffice-gnome
+libreoffice-langpack-ru
+evince
+stardict-gtk
+stardict-mueller7
--- a/pkg.in/lists/slinux/misc-dvd
+++ b/pkg.in/lists/slinux/misc-dvd
@@ -0,0 +1,15 @@
+#mintmenu
+homebank
+aspell-uk
+libreoffice-langpack-ru
+stardict-slovnyk_ru-en
+stardict-slovnyk_en-uk
+stardict-slovnyk_uk-en
+stardict-slovnyk_uk-ru
+
+vlock
+
+hplip-PPDs
+
+tango-icon-theme
+tango-icon-theme-extras
--- a/pkg.in/lists/slinux/multimedia
+++ b/pkg.in/lists/slinux/multimedia
@@ -0,0 +1,5 @@
+easytag
+gnome-mplayer
+gecko-mediaplayer
+audacious
+audacious-plugins
--- a/pkg.in/lists/slinux/multimedia-dvd-audacity
+++ b/pkg.in/lists/slinux/multimedia-dvd-audacity
@@ -0,0 +1 @@
+audacity
--- a/pkg.in/lists/slinux/multimedia-dvd-pitivi
+++ b/pkg.in/lists/slinux/multimedia-dvd-pitivi
@@ -0,0 +1 @@
+pitivi
--- a/pkg.in/lists/slinux/multimedia-dvd-sound-juicer
+++ b/pkg.in/lists/slinux/multimedia-dvd-sound-juicer
@@ -0,0 +1 @@
+sound-juicer
--- a/pkg.in/lists/slinux/network
+++ b/pkg.in/lists/slinux/network
@@ -0,0 +1,36 @@
+mozilla-plugin-adobe-flash
+firefox-yandexbar
+mozilla-plugin-java-1.6.0-sun
+thunderbird
+thunderbird-ru
+
+pidgin
+pidgin-libnotify
+chestnut-dialer-gtk2
+aspell-ru-lebedev
+
+alterator-net-pptp
+alterator-net-eth
+alterator-net-pppoe
+alterator-net-general
+
+rdesktop
+telnet
+remmina
+remmina-plugins
+
+b43-fwcutter
+bcm43xx-fwcutter
+NetworkManager
+NetworkManager-vpnc
+NetworkManager-openvpn
+NetworkManager-pptp
+#NetworkManager-l2tp
+NetworkManager-openvpn-gnome
+NetworkManager-pptp-gnome
+NetworkManager-vpnc-gnome
+#NetworkManager-l2tp-gnome
+usb-modeswitch
+
+alsa-utils
+dialog
--- a/pkg.in/lists/slinux/x86_64
+++ b/pkg.in/lists/slinux/x86_64
@@ -0,0 +1,48 @@
+i586-glibc-core
+i586-libalsa
+i586-libssl7
+i586-libXv
+i586-libXScrnSaver
+i586-libdbus
+i586-libqt4-xml
+i586-libqt4-core
+i586-libqt4-dbus
+i586-libqt4-gui
+i586-libqt4-network
+i586-libv4l
+i586-libpulseaudio
+i586-libsndfile
+i586-libwrap
+i586-libasyncns
+i586-libogg
+i586-libflac8
+i586-libvorbis
+i586-libavahi
+i586-libgcc1
+i586-libstdc++6
+i586-libXext
+i586-libX11
+i586-glib2
+i586-libpng12
+i586-zlib
+i586-libfreetype
+i586-libSM
+i586-libICE
+i586-libXi
+i586-libXrender
+i586-libXrandr
+i586-libXfixes
+i586-libXcursor
+i586-libXinerama
+i586-fontconfig
+i586-libssl10
+i586-libxcb
+i586-libpcre3
+i586-libuuid
+i586-libexpat
+i586-libkrb5
+i586-libXau
+i586-libXdmcp
+i586-libcom_err
+i586-libkeyutils
+i586-libxcbutil
--- a/pkg.in/lists/slinux/xfce
+++ b/pkg.in/lists/slinux/xfce
@@ -0,0 +1,69 @@
+#main-xfce
+#xfce4-icon-theme
+xfce4-xkb-plugin
+xfce4-appfinder
+xfce4-settings
+xfcalendar
+xfce4-mixer
+xfce4-minimal
+xfce4-session
+xfce4-panel
+xfce4-screenshooter
+xfconf-utils
+xfce4-power-manager
+Thunar
+Terminal
+libexo
+xfce4-default
+#xfce4-full
+gvfs
+gvfs-backends
+udisks2
+
+#xfce-additional
+#xfprint
+thunar-media-tags-plugin
+thunar-volman-plugin
+#thunar-shares-plugin
+thunar-archive-plugin
+
+#screensaver
+gnome-screensaver
+#gnome-screensaver-utils
+
+#samba
+thunar-shares-plugin
+
+xscreensaver-
+xscreensaver-hacks-gl-
+xscreensaver-modules-gl-
+xfce4-wmdock-plugin-
+xfce4-radio-plugin-
+xfce4-genmon-plugin-
+
+xfwm4-themes
+#xfce4-dict
+xfcalendar
+xfce4-screenshooter
+xfce4-clipman-plugin
+xfce4-cpufreq-plugin
+#xfce4-globalmenu-plugin
+xfce4-xkb-plugin
+xfce4-timer-plugin
+xfce4-datetime-plugin
+xfce4-places-plugin
+xfce4-quicklauncher-plugin
+xfce4-time-out-plugin
+xfce4-fsguard-plugin
+xfce4-mailwatch-plugin
+xfce4-battery-plugin
+xfce4-verve-plugin
+xfce4-diskperf-plugin
+xfce4-eyes-plugin
+xfce4-notes-plugin
+xfce4-netload-plugin
+xfce4-mount-plugin
+#xfce4-weather-plugin
+xfce4-systemload-plugin
+xfce4-cpugraph-plugin
+#xfce4-xfapplet-plugin
--- a/pkg.in/lists/tagged/desktop+cinnamon
+++ b/pkg.in/lists/tagged/desktop+cinnamon
@@ -0,0 +1,2 @@
+cinnamon-default
+installer-feature-xdg-user-dirs
--- a/pkg.in/lists/tagged/desktop+cinnamon+extra
+++ b/pkg.in/lists/tagged/desktop+cinnamon+extra
@@ -0,0 +1,3 @@
+gnome3-default
+libreoffice libreoffice-gnome libreoffice-langpack-ru
+gimp
--- a/pkg.in/lists/tagged/desktop+live
+++ b/pkg.in/lists/tagged/desktop+live
@@ -1,4 +1,5 @@
 xdm
 xinit
 xinitrc
+livecd-setlocale
 installer-feature-runlevel5-stage3
--- a/pkg.in/lists/tagged/desktop+xfce
+++ b/pkg.in/lists/tagged/desktop+xfce
@@ -0,0 +1,12 @@
+xfce4-taskmanager
+xfce4-appfinder
+xfce4-settings
+xfcalendar
+xfce4-mixer
+gst-plugins-base
+xfce4-minimal
+xfce4-panel
+xfce4-icon-theme
+xfce4-session
+xfconf-utils
+Thunar
--- a/reports.mk
+++ b/reports.mk
@@ -1,19 +1,49 @@
 # collect what's left

-all: reports/targets
+ifneq (,$(REPORT))

-reports/targets:
-	@if ! [ -n "$$REPORT_PATH" -a -s "$$REPORT_PATH" ]; then \
+include lib/common.mk
+
+BUILDDIR := $(shell sed -n 's/^.* BUILDDIR = \(.*\)/\1/p' "$(REPORT_PATH)")
+BUILDLOG := $(BUILDDIR)/$(BUILD_LOG)
+REPORTDIR := $(BUILDDIR)/reports/
+IMAGE_OUTPATH := $(shell sed -n 's/^IMAGE_OUTPATH = \(.*\)/\1/p' $(BUILDLOG))
+
+# for a multi-image build there's no sense to refer to buildroot
+# contained reports as these are very ephemeral between builds
+ifneq (1,$(NUM_TARGETS))
+SHORTEN := >/dev/null
+endif
+
+all: reports/targets reports/scripts
+	@cp -a $(REPORTDIR) $(IMAGE_OUTPATH).reports
+
+reports/prep:
+	@mkdir -p "$(REPORTDIR)"
+
+reports/scripts: reports/prep
+	@grep "^mki.*scripts: Run: " $(BUILDLOG) \
+	| sed -rn "s,^.*($(BUILDDIR)|$(SYMLINK))/(.*)'$$,\2,p" \
+	> "$(REPORTDIR)/$*.log" \
+	&& echo "** scripts report: $(BUILDDIR)/$(@F).log" $(SHORTEN)
+
+reports/targets: reports/prep
+	@if ! [ -n "$(REPORT_PATH)" -a -s "$(REPORT_PATH)" ]; then \
 		exit 0; \
 	fi; \
-	BUILDDIR="`sed -n 's/^.* BUILDDIR = \(.*\)/\1/p' "$$REPORT_PATH"`"; \
 	if type -t dot >&/dev/null; then \
-		REPORT_IMAGE="$$BUILDDIR/targets.png"; \
-		report-targets < "$$REPORT_PATH" \
+		REPORT_IMAGE="$(BUILDDIR)/$@.png"; \
+		report-targets < "$(REPORT_PATH)" \
 		| dot -Tpng -o "$$REPORT_IMAGE" \
 		&& echo "** target graph report: $$REPORT_IMAGE"; \
 	else \
-		REPORT_DOT="$$BUILDDIR/targets.dot"; \
-		report-targets < "$$REPORT_PATH" > "$$REPORT_DOT" \
-		&& echo "** graphviz missing, target graph dot file: $$REPORT_DOT"; \
-	fi && mv "$$REPORT_PATH" "$$BUILDDIR/targets.log"
+		REPORT_DOT="$(BUILDDIR)/targets.dot"; \
+		report-targets < "$(REPORT_PATH)" > "$$REPORT_DOT" \
+		&& echo "** graphviz missing, " \
+			"target graph dot file: $$REPORT_DOT"; \
+	fi $(SHORTEN); \
+	mv "$(REPORT_PATH)" "$(REPORTDIR)/$(@F).log"
+
+else
+all:; @:
+endif
--- a/sub.in/main/Makefile
+++ b/sub.in/main/Makefile
@@ -12,7 +12,9 @@ include $(MKIMAGE_PREFIX)/config.mk

 CHROOT_PACKAGES = apt-utils rsync

-IMAGE_PACKAGES_REGEXP = $(MAIN_PACKAGES_REGEXP) \
+IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
+			$(BASE_PACKAGES_REGEXP) \
+			$(MAIN_PACKAGES_REGEXP) \
 			$(call kpackages, \
 			       $(THE_KMODULES) \
 			       $(BASE_KMODULES) \
--- a/sub.in/stage1/README
+++ b/sub.in/stage1/README
@@ -3,8 +3,7 @@
 на местности, вытягивание второй стадии с CD/FTP/...).

 Скрипты запускаются извне формируемого образа (scripts.d/);
-следует крайне бережно относиться к составу STAGE1_PACKAGES
-и объёму этой стадии.
+следует крайне бережно относиться к объёму этой стадии.

 Обратите внимание: если не указать явно требуемый вариант
 ядра посредством STAGE1_KFLAVOUR, будет взят последний
--- a/sub.in/stage2/Makefile
+++ b/sub.in/stage2/Makefile
@@ -32,9 +32,9 @@ endif

 # need kernel modules only (which require corresponding kernel-image);
 # these go into work chroot; NB: no vmlinuz there (unless live-install)
-IMAGE_PACKAGES_REGEXP = $(call kpackages, \
-			$(STAGE1_KMODULES) $(STAGE2_KMODULES), \
-			$(STAGE1_KFLAVOUR))
+IMAGE_PACKAGES_REGEXP += $(call kpackages, \
+			 $(STAGE1_KMODULES) $(STAGE2_KMODULES), \
+			 $(STAGE1_KFLAVOUR))

 # see also scripts.d/99-elf-stats
 ifdef GLOBAL_SQUASHFS_SORT
--- a/sub.in/stage2/image-scripts.d/85cleanup-cjk
+++ b/sub.in/stage2/image-scripts.d/85cleanup-cjk
@@ -1,5 +1,8 @@
 #!/bin/sh

+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
 # remove unused fonts
 cd /usr/share/fonts/bitmap/misc/ &&
 	rm -f *ja.* *ko.* han* gb* jis* k14* rk* *rk.* *kana* cl* *JIS*
--- a/sub.in/stage2/image-scripts.d/85cleanup-legacy
+++ b/sub.in/stage2/image-scripts.d/85cleanup-legacy
@@ -1,7 +1,11 @@
 #!/bin/sh

+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
 # remove unused legacy/tiny fonts
-cd /usr/share/fonts/bitmap/misc/ && rm -f *ISO* *KOI* [1456]*
+#cd /usr/share/fonts/bitmap/misc/ && rm -f *ISO* *KOI* [1456]*
+cd /usr/share/fonts/bitmap/misc/ && rm -f [1456]*

 # l10n
 cd /usr/share/X11/locale/ && rm -rf *[^C8]/ iso*
@@ -10,6 +14,7 @@ cd /usr/share/X11/locale/ && rm -rf *[^C8]/ iso*
 cd /usr/share/X11/xkb/symbols && rm -rf *_vndr

 # gconv
-cd /usr/lib*/gconv && rm -f CP* ISO* *JIS* KOI* HP* MAC*
+#cd /usr/lib*/gconv && rm -f CP* ISO* *JIS* KOI* HP* MAC*
+cd /usr/lib*/gconv && rm -f CP* *JIS* HP* MAC*

 :
--- a/sub.in/stage2/image-scripts.d/90cleanup-bloat-bin
+++ b/sub.in/stage2/image-scripts.d/90cleanup-bloat-bin
@@ -1,6 +1,11 @@
 #!/bin/sh
-# outstanding binaries

+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
+# purge outstanding binaries
 rm -f /sbin/{sash,sln,tc}
 rm -f /usr/bin/{openssl,ipv6log*}
 rm -f /bin/ipv6calc
+
+:
--- a/sub.in/stage2/image-scripts.d/90cleanup-drm
+++ b/sub.in/stage2/image-scripts.d/90cleanup-drm
@@ -1,5 +1,10 @@
 #!/bin/sh
-# no sense in xorg-dri-* without kernel-modules-drm*

+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
+# no sense in xorg-dri-* without kernel-modules-drm*
 stat /lib/modules/*/kernel/drivers/gpu/drm >&/dev/null \
 || rm -rf /usr/lib*/X11/modules/dri/
+
+:
--- a/sub.in/stage2/image-scripts.d/97cleanup-blacklisted
+++ b/sub.in/stage2/image-scripts.d/97cleanup-blacklisted
@@ -1,7 +1,12 @@
 #!/bin/sh

+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
 # blacklisted kernel modules
 sed -n 's/^blacklist[[:space:]]\+\([^[:space:]]\+\).*/\1/p' /etc/modprobe.d/* |
 	while read i; do
 		find /lib/modules/ -type f -name "$i.ko" -delete
 	done
+
+:
--- a/sub.in/stage2/image-scripts.d/99cleanup-boot
+++ b/sub.in/stage2/image-scripts.d/99cleanup-boot
@@ -1,6 +1,9 @@
 #!/bin/sh
-# no need for the kernel in live root
-# (unless it's a live-install):
-# it's been booted already

-[ -x /usr/sbin/live-install ] || [ -x /usr/sbin/livecd-install ] || rm -f /boot/*
+# don't cripple the image to be copied over
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+
+# no need for the kernel in live root otherwise: it's been booted already
+rm -f /boot/*
+
+:
Author	SHA1	Message	Date
Michael Shigorin	e10d55d0ad	0.6.4-alt1 - simply better (tm)	2012-04-23 23:41:48 +03:00
Gleb Fotengauer-Malinovskiy	8c042fe775	add simply branding things	2012-04-23 23:35:43 +03:00
Gleb Fotengauer-Malinovskiy	5fc270f996	move simply to conf.d/simply.mk There will be two types of Simply: DVD and Live versions.	2012-04-23 23:35:43 +03:00
Michael Shigorin	6e6f572b43	better output directory and results structuring Following m-p-d, a more involved default output directory structure is feasible now: ~/out/name/date/name-date-arch.type instead of plain ~/out/name-date-arch.type This particular behaviour can be achieved by passing SORTDIR='$(IMAGE_NAME)/$(DATE)'; note the single quotes. Reports are also saved in this resulting structure albeit the place is still highly debatable.	2012-04-23 23:35:43 +03:00
Michael Shigorin	c692da6a06	reports.mk: cosmetic tweaks REPORT_PATH comes from a makefile; let's use corresponding notation.	2012-04-23 23:28:40 +03:00
Michael Shigorin	7221c53ccf	Makefile: no build means no reports Trying to extract reports for a failed build is a bad idea.	2012-04-23 23:28:32 +03:00
Michael Shigorin	aed6540702	conf.d/live.mk: dropped extra distro/live-simply-* That's what command-line variables serve for (without causing a combinatorial explosion) :)	2012-04-23 23:10:30 +03:00
Gleb Fotengauer-Malinovskiy	a83b7a17cb	slinux hacking - xfce-utils removed from Sisyphus - apt-indicator needs gksu - add slinux misc packages: + pm-utils + strace - image-scripts.d/50services is a script which starts/stop some services	2012-04-23 23:10:30 +03:00
Gleb Fotengauer-Malinovskiy	3a4ba20a0f	some fixes in slinux lists and configuration use/slinux-live: in p6 slinux had install-dvd version too lists/slinux/misc-dvd: user 3d-proprietary comes from use/x11/3d-proprietary lists/slinux/misc-dvd:restore compiz slinux: use/syslinux/localboot.cfg	2012-04-23 23:10:29 +03:00
Michael Shigorin	305e97d5a2	introduced lib/kernel.mk helper makefile Sometimes it's desirable to provide the kernel supporting maximal amount of RAM on the system; bad news is that x86 has a kludge named PAE, good news is that x86_64 doesn't need it at all; but now we must be able to choose between those. BIGRAM will hold the flavour needed.	2012-04-23 23:10:29 +03:00
Michael Shigorin	6647e8996a	reports.mk: fixed behaviour with no REPORT set Toplevel Makefile is a bit optimistic regarding calling reports.mk...	2012-04-23 23:10:29 +03:00
Michael Shigorin	6ada32dc91	reports.mk: added reports/scripts This one extracts the exact time-ordered list of script hooks run while building the image. Some commons refactoring is also due.	2012-04-23 23:10:29 +03:00
Michael Shigorin	c66e8ae242	several features forgot to show up in FEATURES This could harm the debug...	2012-04-23 23:10:29 +03:00
Michael Shigorin	674e1482ae	live: added preliminary l10n support The missing part so far is passing "lang=ab_CD" to the kernel; it's done with gfxboot and is somewhat doable without it...	2012-04-23 23:10:29 +03:00
Michael Shigorin	600fc011cb	live: added 03services hook This script specifies the (excessive) lists of services to be enabled and disabled explicitly; these are mostly based on profiles/live/image-scripts.d/init3-services from m-p-d. There might be systemd related pecularities though...	2012-04-23 23:10:29 +03:00
Michael Shigorin	f57759d6dc	initial cinnamon support and livecd Thanks slava@ for the packages and inspiration, and aris@ for the useful advice and fixups.	2012-04-23 23:10:29 +03:00
Michael Shigorin	50bfea9d5c	cleanup: support livecd-install livecd-install support wasn't added properly; fixed (thanks glebfm@ yet again). Something like fine-grained KEEP_* might be due...	2012-04-23 23:10:29 +03:00
Michael Shigorin	d0a8ea6ba8	85cleanup-legacy: less cruel one The early version considered ISO and KOI encoding families as obsolete; the current one is a bit more wise and knows these are just /rare/. Thanks glebfm@ for #27168 research and cinnamon by slava@ for ISO-related noises at startup.	2012-04-23 23:10:29 +03:00
Michael Shigorin	dc3002560a	conf.d/server.mk: dropped wifi kernel modules There's no real reason to keep bcmwl and ndiswrapper around exclusively as the currently available support vastly takes over the early attempts at the task. (it's not about bare firmware though, and some day something like use/hardware/wireless should get in)	2012-04-23 23:10:24 +03:00
Michael Shigorin	4858791145	virtualbox feature renamed to vm, extended Initial SPICE support has been added for kvm/libvirt installation and boot-up using qxl and spice by default as proposed by shaba@. VirtualBox part is shifted a level deeper correspondingly but otherwise stays the same.	2012-04-18 21:04:11 +03:00
Michael Shigorin	03de0aabac	conf.d/live.mk: distro/live-simply It is actually an effort by glebfm@ to create an experimental systemd-based Simply Linux LiveCD; I merely reviewed the original diff, moved kernel related bits to firmware (see preceding commits) and introduced a dedicated pkglist namespace by creating a directory.	2012-04-11 16:21:08 +03:00
Michael Shigorin	8576a1655b	bin/pkgdups: now with a UI frontend Calling ../../bin/pkgdups with a bunch of pkglists was messy, so is done algorithmically from now on while in pkg.in/lists: make pkgdups	2012-04-10 23:39:53 +04:00
Michael Shigorin	865f4c7614	firmware: mv {MAIN,THE}_PACKAGES THE_PACKAGES_REGEXP is in place, let's rebase firmware packages so these would be available in LiveCDs either. The news for systems being installed is that MAIN_* is optional while THE_* is included in base system; firmware packages tend to be pretty tiny and harmless. kernel-wifi pkglist has absolutely no sense by now, hence purged; firmware-rt* and firmware-i2400m are merged into firmware-linux.	2012-04-10 23:39:53 +04:00
Michael Shigorin	86c42e2db6	implemented {THE,BASE,LIVE}_PACKAGES_REGEXP There were STAGE1_PACKAGES_REGEXP and MAIN_PACKAGES_REGEXP but adding more of those was postponed to avoid bloat and bitrot; THE_PACKAGES_REGEXP is needed for use/firmware now and looks like BASE_PACKAGES_REGEXP and LIVE_PACKAGES_REGEXP will be useful before too long either. Docs updated to include stage-specific package related vatiables.	2012-04-10 23:39:53 +04:00
Michael Shigorin	a6cc9fa8c3	lib/build.mk: tweaked wreckage filter A pretty common issue breaking the image build is inter-package file conflict resulting in hsh-install failure down there. Let's bring that back to attention conveniently.	2012-04-10 23:39:53 +04:00
Michael Shigorin	780acc8e6b	gear-store-tags	2012-04-09 23:02:24 +03:00
				`@@ -0,0 +1 @@`
				`Наборы пакетов для семейства дистрибутивов Simply Linux.`