0.6.7-alt1

- docs updates

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.6.5
+Version: 0.6.7
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -61,6 +61,13 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART
 
 %changelog
+* Mon May 21 2012 Michael Shigorin <mike@altlinux.org> 0.6.7-alt1
+- docs updates
+
+* Mon May 14 2012 Michael Shigorin <mike@altlinux.org> 0.6.6-alt1
+- build helpers refactored
+- initial frontend support
+
 * Mon May 07 2012 Michael Shigorin <mike@altlinux.org> 0.6.5-alt1
 - branding feature
 

.gear/tags/028d4ddb3f38f92ac39f3d0a7df072847d34336c

@@ -1,6 +0,0 @@
-object e10d55d0adfb991d4152794d01e6273fe21240b0
-type commit
-tag v0.6.4
-tagger Michael Shigorin <mike@altlinux.org> 1335214381 +0300
-
-simply better

.gear/tags/02fe7a7e583b570944eb332ca93eba03a6f0f11e

@@ -0,0 +1,6 @@
+object a4836609d986c3609ba52860ae60061d0cf0e514
+type commit
+tag v0.6.6
+tagger Michael Shigorin <mike@altlinux.org> 1337020642 +0300
+
+frontstart

.gear/tags/list

@@ -1 +1 @@
-028d4ddb3f38f92ac39f3d0a7df072847d34336c v0.6.4
+02fe7a7e583b570944eb332ca93eba03a6f0f11e v0.6.6

Makefile

@@ -2,6 +2,9 @@
 # iterate over multiple goals/arches,
 # collect proceedings
 
+# preferences
+-include $(HOME)/.mkimage/profiles.mk
+
 # for immediate assignment
 ifndef ARCHES
 ifdef ARCH
@@ -23,7 +26,7 @@ endif
 # recursive make considered useful for m-p
 MAKE += -r --no-print-directory
 
-DIRECT_TARGETS := clean distclean check help
+DIRECT_TARGETS := clean distclean check help help/distro help/ve
 .PHONY: $(DIRECT_TARGETS)
 $(DIRECT_TARGETS):
 	@$(MAKE) -f main.mk $@

README

@@ -43,7 +43,7 @@ Most docs are in Russian, welcome to learn it or ask for English.
   + базовые комплекты помещены в подкаталогах под sub.in/;
     их наборы скриптов могут расширяться фичами
 - фичи:
-  + список собирается в $(FEATURES)
+  + накопительный список собирается в $(FEATURES)
   + законченные блоки функциональности (или наборы таковых)
   + описываются в индивидуальных features.in/*/config.mk
   + могут требовать другие фичи, а также субпрофили

conf.d/live.mk

@@ -28,14 +28,11 @@ distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
 	@$(call add,MAIN_PACKAGES,$(pkgs))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
 
-distro/live-install: distro/.live-base use/syslinux/localboot.cfg
+distro/live-install: distro/.live-base use/live/textinst; @:
-	@$(call add,LIVE_PACKAGES,live-install)
+distro/.livecd-install: distro/.live-base use/live/install; @:
-
-distro/.livecd-install: distro/.live-base use/syslinux/localboot.cfg
-	@$(call add,LIVE_PACKAGES,livecd-install)
 
 distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
-distro/live-razorqt: distro/.live-desktop +razorqt; @:
+distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
 distro/live-tde: distro/.live-desktop use/live/ru +tde; @:
 
 distro/live-rescue: distro/live-icewm
@@ -55,9 +52,10 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
 	@$(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
+	use/x11/cinnamon use/x11/3d-proprietary
 
-distro/live-enlightenment: distro/.live-desktop use/live/autologin use/live/ru use/x11/3d-free
+distro/live-enlightenment: distro/.live-desktop use/live/autologin \
+	use/live/ru use/x11/3d-free
 	@$(call add,LIVE_PACKAGES,enlightenment)
 
 distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru

doc/features.txt

@@ -1,8 +1,9 @@
 фичи
 ~~~~
 Особенности дистрибутива, не учитываемые в пакетной базе
-или зависящие от переменных времени сборки/установки образа,
+или зависящие от переменных времени сборки/установки образа;
-могут быть оформлены как:
+по необходимости влияют на конфигурацию, приносят с собой
+или запрашивают скрипты, которые могут быть оформлены как:
 
 * scripts.d/ или image-scripts.d/ различных стадий;
 * пакеты installer-feature-*
@@ -27,3 +28,12 @@
 Стоит избегать изменения пакетных умолчаний в случае, когда их
 представляется осмысленным и возможным скорректировать в пакете:
 таким образом они станут более дистрибутивными.
+
+Обратите внимание, что фичи включаются в комплект инкрементально:
+что добавили, то уже не убрать; поэтому при необходимости следует
+выделять промежуточные цели сборки, собирающие необходимые фичи
+и оставляющие те, по которым есть расхождения, на включение ближе
+к конечной дистрибутивной цели.
+
+Соглашение по именованию таково, что цели use/ФИЧА и use/ФИЧА/...
+определяются в файле features.in/ФИЧА/config.mk и только в нём.

doc/variables.txt

@@ -39,7 +39,7 @@
   + см. ../lib/log.mk
 
 - CHECK
-  + включает режим проверки сборки конфигурации
+  + включает режим проверки сборки конфигурации (без сборки образа)
   + значение: пусто (по умолчанию) либо любая строка
   + см. ../lib/build.mk
 

features.in/build-distro/lib/90-build-distro.mk

@@ -16,36 +16,14 @@ BOOT_ABST := $(META_ABSTRACT)
 
 BOOT_TYPE := isolinux
 
-# Metadata/ needed only for installers (and not for e.g. syslinux.iso)
-# FIXME: installable live needs it too, don't move to install2 feature
-### see also .../pkg.in/lists/Makefile
-ifneq (,$(findstring install2,$(FEATURES)))
-METADATA = metadata
-endif
-
 # see also ../scripts.d/01-isosort; needs mkimage-0.2.2+
 MKI_SORTFILE := /tmp/isosort
 
 all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
 
-prep: $(GLOBAL_DEBUG) dot-disk $(METADATA) imagedir
+prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER) imagedir
-
+#prep: $(GLOBAL_DEBUG) dot-disk metadata imagedir
-metadata: dot-base
-	@mkdir -p files/Metadata
-	@rm -f files/Metadata/pkg-groups.tar
-# see also alterator-pkg (backend3/pkg-install); we only tar up what's up to it
-	@tar -cvf files/Metadata/pkg-groups.tar -C $(PKGDIR) \
-		$$(echo $(call list,$(MAIN_GROUPS) .base) \
-			$(call group,$(MAIN_GROUPS)) \
-		   | sed 's,$(PKGDIR)/*,,g')
-
-dot-base:
-	@p="$(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))"; \
-	echo -e "\n## added by build-distro.mk\n$$p" >> $(call list,.base); \
-	if [ -n "$$DOT_BASE" ]; then \
-		echo -e "\n## DOT_BASE\n$$DOT_BASE" >> $(call list,.base); \
-	fi
 
 dot-disk:
 	@mkdir -p files/.disk

features.in/install2/config.mk

@@ -1,4 +1,5 @@
-use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
+# alterator-based installer, second (livecd) stage
+use/install2: use/stage2 sub/stage2/install2 use/metadata use/cleanup/installer
 	@$(call add_feature)
 	@$(call set,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
@@ -8,6 +9,10 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
 use/install2/net: use/install2
 	@$(call add,INSTALL2_PACKAGES,curl)
 
+# modern free xorg drivers for mainstream hardware requires KMS support
+use/install2/kms:
+	@$(call set,STAGE1_KMODULES_REGEXP,drm.*)
+
 # see also use/vm/kvm/guest; qxl included in xorg pkglist
 use/install2/kvm:
 	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)

features.in/kernel/README

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

features.in/kernel/config.mk

@@ -0,0 +1,4 @@
+###
+use/kernel:
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,std-def)

features.in/kernel/lib/10-kernel.mk

@@ -0,0 +1,4 @@
+# step 4: build the distribution image
+#         take care for kernel bits
+
+DOT_BASE += $(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))

features.in/live/config.mk

@@ -16,6 +16,14 @@ use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
 	@$(call add,SYSLINUX_CFG,localboot)
 
+# alterator-based permanent installation
+use/live/install: use/metadata use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,livecd-install)
+
+# text-based installation script
+use/live/textinstall: use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,live-install)
+
 # NB: there's an unconditional live/image-scripts.d/40-autologin script
 #     *but* it only configures some of the *existing* means; let's add one
 #     for the cases when there should be no display manager

features.in/metadata/README

@@ -0,0 +1,3 @@
+Эта фича занимается метаданными в составе образов --
+в первую очередь инсталяционных и пригодных к установке
+"живых".

features.in/metadata/config.mk

@@ -0,0 +1,2 @@
+use/metadata:
+	@$(call add_feature)

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

@@ -0,0 +1,37 @@
+# step 4: build the distribution image
+
+# package lists are needed for installer and live-install images
+METADIR := files/Metadata
+
+# preparation targets of ../../build-distro/lib/build-distro.mk
+WHATEVER += metadata
+
+# args: name, suffix, command
+define dump-THEM
+if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
+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;
+# thus construct requisite .base packagelist for alterator-pkg
+metadata-.base:
+	@cd $(call list,/); \
+	{ \
+		echo "## generated by features.in/metadata/lib/metadata.mk"; \
+		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
+		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
+		if [ -n "$(DOT_BASE)" ]; then \
+			echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
+		fi; \
+	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' > .base
+
+# see also alterator-pkg (backend3/pkg-install);
+# we only tar up what's up to it
+metadata: metadata-.base
+	@mkdir -p $(METADIR); \
+	tar -C $(PKGDIR) -cvf - \
+		$(call rlist,$(MAIN_GROUPS) .base) \
+		$(call rgroup,$(MAIN_GROUPS)) \
+	> $(METADIR)/pkg-groups.tar

features.in/vm/README

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

features.in/vm/config.mk

@@ -2,7 +2,7 @@
 
 use/vm/virtualbox/guest:
 	@$(call add_feature)
-	@$(call add,THE_KMODULES,virtualbox-addition)
+	@$(call add,THE_KMODULES,virtualbox-addition drm)
 	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
 
 # NB: only reasonable for X11-bearing images

features.in/x11/config.mk

@@ -1,5 +1,5 @@
 +icewm: use/x11/icewm; @:
-+razorqt: use/x11/razorqt use/x11/lightdm; @:
++razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
 +tde: use/x11/tde use/x11/kdm; @:
 
 use/x11/xorg:
@@ -30,8 +30,8 @@ use/x11/xdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole)
 
 ### : some set()-like thing might be better?
-use/x11/lightdm: use/x11/runlevel5
+use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5
-	@$(call add,THE_PACKAGES,lightdm)
+	@$(call add,THE_PACKAGES,lightdm-$*-greeter)
 
 use/x11/kdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,kdebase-kdm)

image.in/functions.mk

@@ -5,11 +5,13 @@ PKGDIR := $(GLOBAL_BUILDDIR)/pkg
 ARCH ?= $(shell arch | sed 's/i686/i586/')
 DATE ?= $(shell date +%Y%m%d)
 
-# prefix pkglist name with its directory to form a path
+# prefix pkglist name with its directory to form a path (relative/absolute)
-list = $(1:%=$(PKGDIR)/lists/%)
+rlist = $(1:%=lists/%)
+list  = $(addprefix $(PKGDIR)/,$(call rlist,$(1)))
 
-# prefix/suffix group name to form a path
+# prefix/suffix group name to form a path (relative/absolute)
-group = $(1:%=$(PKGDIR)/groups/%.directory)
+rgroup = $(1:%=groups/%.directory)
+group  = $(addprefix $(PKGDIR)/,$(call rgroup,$(1)))
 
 # map first argument (a function) onto second one (an argument list)
 map = $(foreach a,$(2),$(call $(1),$(a)))

lib/check.mk

@@ -9,3 +9,9 @@ check:
 	| while read line; do \
 		echo "chmod 755 $$line"; \
 	done
+	@find features.in -maxdepth 1 -type d \
+	| while read dir; do \
+		if [ ! -s "$$dir/README" ]; then \
+			echo "$$dir: missing README"; \
+		fi; \
+	done

lib/clean.mk

@@ -53,7 +53,7 @@ distclean: clean
 # than BUILDDIR is -- usually it's unneeded afterwards so just zap it
 postclean: build-image
 	@{ \
-	if [ "$(NUM_TARGETS)" -gt 1 -a -z "$(DEBUG)" ] || \
+	if [ "$(NUM_TARGETS)" -gt 1 -a -z "$(DEBUG)" -a -z "$(__frontend)" ] ||\
 	    [ ! -L "$(SYMLINK)" -a "0$(DEBUG)" -lt 2 ]; then \
 		echo "$(TIME) cleaning up after build"; \
 		$(MAKE) -C "$(BUILDDIR)" distclean \

lib/distro.mk

@@ -23,18 +23,16 @@ distro/.init: profile/bare
 
 # NB: the last flavour in KFLAVOURS gets to be the default one;
 # the kernel packages regexp evaluation has to take place at build stage
-distro/.base: distro/.init
+distro/.base: distro/.init use/kernel
-	@$(call set,KFLAVOURS,std-def)
 	@$(call set,META_SYSTEM_ID,LINUX)
-	@$(call set,META_VOL_ID,ALT Linux $(ARCH))
+	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)/$(ARCH))
 	@$(call set,META_VOL_SET,ALT Linux)
 
 # something marginally useful (as a network-only installer)
 # NB: doesn't carry stage3 thus cannot use/bootloader
-distro/installer: distro/.base use/install2 use/install2/kvm \
+distro/installer: distro/.base use/syslinux/localboot.cfg \
-	use/syslinux/localboot.cfg
+	use/install2 use/install2/kms use/install2/kvm
 	@$(call set,INSTALLER,altlinux-generic)
-	@$(call set,STAGE1_KMODULES_REGEXP,drm.*)	# for KMS
 
 distro/.installer: distro/installer use/bootloader/grub use/repo/main; @:
 

lib/help.mk

@@ -1,8 +1,20 @@
 # this makefile holds the most helpful bits for the toplevel one
 
+ifdef __frontend
+define help_body
+	@for i in $(2); do echo $$i; done
+endef
+else
+define help_body
+	@echo '** available $(1) targets:'; \
+	columnize $(2)
+endef
+endif
+
+help = $(and $(2),$(help_body))
+
 help/distro:
-	@echo '** available distribution targets:'; \
+	$(call help,distribution,$(sort $(DISTROS:distro/%=%)))
-	columnize $(sort $(DISTROS:distro/%=%))
 
 help/ve:
 	@echo '** available virtual environment targets:'; \

pkg.in/lists/Makefile

@@ -18,13 +18,6 @@ include $(BUILDDIR)/distcfg.mk
 SUFFIX := pkg/lists
 TARGET := $(BUILDDIR)/$(SUFFIX)
 
-# Metadata/ needed only for installers (and not for e.g. syslinux.iso)
-# FIXME: installable live needs it too, don't move to install2 feature
-### see also .../features.in/build-distro/lib/build-distro.mk
-ifneq (,$(findstring install2,$(FEATURES)))
-DOTBASE := dot-base
-endif
-
 all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE) copy-lists copy-groups
 	@if type -t git >&/dev/null && cd $(TARGET); then \
 		if [ -n "`git status -s`" ]; then \
@@ -47,23 +40,6 @@ copy-groups:
 		cp -at $(TARGET) -- $(THE_GROUPS) $(MAIN_GROUPS); \
 	fi
 
-# args: name, suffix, command
-define dump-THEM
-if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
-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
-	@{ \
-		echo "## generated by pkg.in/lists/Makefile"; \
-		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
-		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
-	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' >$(TARGET)/.base
-
 # do beforehand as foreach gets expanded before recipe execution
 $(TARGET):
 	@mkdir -p $(TARGET)