.gear/mkimage-profiles.spec: initial package

Also added to the live-builder ISO which is now self-hosted
(sans full repo): one can build an image capable of rebuilding
itself (which is not that useful) and of building other goodies
on some temporarily unused RAM-filled hardware (which is the goal).

.gear/mkimage-profiles.spec

@@ -0,0 +1,62 @@
+Name: mkimage-profiles
+Version: 0.4.2
+Release: alt1
+
+Summary: ALT Linux based distribution metaprofile
+License: GPLv2+
+Group: Development/Other
+
+Url: http://www.altlinux.org/Mkimage/Profiles/next
+Source: %name-%version.tar
+Packager: Michael Shigorin <mike@altlinux.org>
+
+BuildArch: noarch
+Requires: rsync git-core
+Requires: time schedutils
+
+%define mpdir %_datadir/%name
+%add_findreq_skiplist %mpdir/*.in/*
+
+%description
+mkimage-profiles is a collection of bits and pieces useful for
+distributions construction: it contains package lists, features,
+and whole subprofiles (like "rescue" building block) for you
+to choose from, and some ready-made image recipes as well.
+
+Make no mistake: constructing distributions isn't just fun, it takes
+a lot of passion and knowledge to produce a non-trivial one.  So m-p
+(the short nick for mkimage-profiles) is complex too.  If you need
+-- or want -- to make just a few tweaks to an existing recipe, it might
+be easier to comprehend the generated profile (aka builddir) which
+contains only the needed subprofiles, script hooks and package lists
+and is way more compact.
+
+Virtual environment template caches (OpenVZ/LXC) can be made either.
+
+In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
+  cd %mpdir
+  head README
+  make distro/syslinux.iso
+
+But if you're into regular distro hacking and are not afraid of make
+and modest metaprogramming (some code generation and introspection),
+welcome to the metaprofile itself; read the docs and get the git:
+%url
+
+%prep
+%setup
+
+%build
+
+%install
+mkdir -p %buildroot%mpdir
+cp -a * %buildroot%mpdir
+
+%files
+%mpdir/*
+%doc doc/
+%doc README QUICKSTART
+
+%changelog
+* Wed Nov 02 2011 Michael Shigorin <mike@altlinux.org> 0.4.2-alt1
+- initial package

.gear/rules

@@ -0,0 +1,2 @@
+spec: .gear/mkimage-profiles.spec
+tar: v@version@:.

bin/mktmpdir

@@ -3,9 +3,9 @@
 
 # hope there aren't spaces in RM's $HOME are they?
 DIRS="$TMP $TMPDIR $HOME/hasher /tmp /var/tmp"
-MINSIZE=1048576		# face control criterion
+MINSIZE=262144		# face control criterion
 
-# pick existing, writeable, >1Gb free space dirs
+# pick existing, writeable, >256M free space dirs
 # rank them wrt type: tmpfs > realfs > rootfs
 choose_tmpdir() {
 	for i in $DIRS; do
@@ -26,4 +26,4 @@ choose_tmpdir() {
 }
 
 DIR="`choose_tmpdir`"
-mktemp -d "${1:-tmpdir}.XXXXXXXXXX" --tmpdir="${DIR:-`realpath ..`}"
+mktemp -d "${1:-tmpdir}.XXXXXXX" --tmpdir="${DIR:-`realpath ..`}"

conf.d/live.mk

@@ -1,8 +1,21 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/live: distro/.base use/live use/syslinux/ui-menu
+distro/live: distro/.base use/live/base
 distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
 distro/dos: distro/.init use/dos use/syslinux/ui-menu
 
+distro/live-builder: distro/.base sub/main \
+	use/live/base use/dev/mkimage
+	@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
+	@$(call add,LIVE_PACKAGES,livecd-tmpfs livecd-online-repo)
+	@$(call add,LIVE_PACKAGES,mkimage-profiles)
+	@$(call add,LIVE_PACKAGES,zsh sudo apt-repo)
+	@$(call add,MAIN_PACKAGES,rpm-build basesystem)
+	@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
+	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
+	@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
+	@$(call add,MAIN_PACKAGES,livecd-tmpfs livecd-online-repo)
+	@$(call add,MAIN_PACKAGES,mkimage-profiles)
+
 endif

doc/apt.conf.sample

@@ -0,0 +1,8 @@
+// these must be unset to avoid picking up
+// /etc/apt/{apt.conf.d,sources.list.d,}/
+Dir::Etc::main "/dev/null";
+Dir::Etc::parts "/var/empty";
+Dir::Etc::SourceParts "/var/empty";
+
+// this is what caused the whole trouble
+Dir::Etc::sourcelist "/home/mike/apt/sources.list";

doc/profiles.mk.sample

@@ -8,3 +8,6 @@
 
 # spares tmpfs, quite recommended unless you need raw workdir chroots
 #CLEAN = 1
+
+# try and draw attention when done (depends on readline/terminal settings)
+#BELL = 1

doc/variables.txt

@@ -6,13 +6,17 @@
 - APTCONF
   + задаёт путь к требуемому apt.conf
   + значение: пусто (по умолчанию системный) либо строка
-  + см. ../image.in/Makefile
+  + см. ../image.in/Makefile, apt.conf.sample
 
 - ARCH
   + определяет целевую архитектуру образа
   + значение: пусто (по умолчанию авто), i586 или x86_64
   + см. ../lib/build.mk
 
+- BELL
+  + требует подачу сигнала после завершения сборки
+  + см. ../lib/build.mk
+
 - BUILDDIR
   + определяет каталог генерируемого профиля и сборки
   + значение: пусто (по умолчанию авто) либо строка

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

@@ -40,7 +40,7 @@ dot-disk:
 	@echo "$(ARCH)" >files/.disk/arch
 	@echo "$(DATE)" >files/.disk/date
 	@if type -t git >&/dev/null; then \
-		( cd $(TOPDIR) && \
-		git show-ref --head -ds -- HEAD ) \
+		( cd $(TOPDIR) && test -d .git && \
+		git show-ref --head -ds -- HEAD ||:) \
 		>files/.disk/commit 2>/dev/null; \
 	fi

features.in/dev/README

@@ -0,0 +1,5 @@
+Эта фича служит для создания образов, предназначающихся для разработки.
+В первую очередь обеспечивается развёртывание hasher и mkimage.
+
+Реализована поддержка LiveCD, возможно приспособление для образов
+сборочных VM/VE.

features.in/dev/config.mk

@@ -0,0 +1,7 @@
+use/dev:
+	@$(call add,FEATURES,dev)
+	@$(call add,COMMON_PACKAGES,git-core hasher gear)
+
+use/dev/mkimage: use/dev
+	@$(call add,COMMON_PACKAGES,mkimage)
+	@$(call add,LIVE_PACKAGES,shadow-change)

features.in/dev/live/image-scripts.d/40-hasher

@@ -0,0 +1,44 @@
+#!/bin/sh -efu
+# configure hasher (implies that 30-users has been run already)
+
+# predefined passwordless livecd user
+USER="altlinux"
+if ! id "$USER" >&/dev/null; then
+	echo "No such user '$USER'" >&2
+	exit
+fi
+
+# ~
+HOME="/home/$USER"
+install -dm750 -o "$USER" -g "$USER" "$HOME"
+
+# we honestly don't know much more
+if type -t git >&/dev/null; then
+	su - -c "git config --global user.email $USER@localhost" "$USER"
+	su - -c "git config --global user.name 'live builder'" "$USER"
+fi
+
+# developer should feel comfortable, eh? ;-)
+ZSHELL="/bin/zsh"
+if [ -x "$ZSHELL" ]; then
+	chsh -s "$ZSHELL" "$USER"
+	install -m755 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc"
+	echo "mkdir -p \"\$TMP/hasher\"" >> "$HOME/.zshrc"
+fi
+
+# $TMP
+TMP="/tmp/.private/$USER"
+control pam_mktemp enabled
+subst '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
+echo "%_tmppath	$TMP" >> "$HOME/.rpmmacros"
+
+# ~/hasher
+WORKDIR="$TMP/hasher"
+ln -s "$TMP/hasher" "$HOME/hasher"
+
+# online repo needs network not isolation
+echo "export share_network=1" >> /etc/profile.d/hasher.sh
+chmod +x /etc/profile.d/hasher.sh
+
+# requisite
+hasher-useradd "$USER"

features.in/dev/live/image-scripts.d/50-etcnet-dhcp

@@ -0,0 +1,7 @@
+#!/bin/sh -efu
+# attempt to autoconfigure ethernet
+
+mkdir -p /etc/net/ifaces/eth0 && {
+	echo TYPE=eth
+	echo BOOTPROTO=dhcp
+} > /etc/net/ifaces/eth0/options ||:

features.in/dev/live/image-scripts.d/80-cdrom-repo

@@ -0,0 +1,9 @@
+#!/bin/sh -efu
+# configure local image repository provided by sub/main
+
+# TODO: some integration with sub/main to ensure that it is there
+
+{
+	echo "# for real stuff you'll need full repo, see apt-repo"
+	echo "rpm file:/image ALTLinux main"
+} > /etc/apt/sources.list.d/cdrom.list

features.in/live/config.mk

@@ -1,3 +1,9 @@
 use/live: use/stage2 sub/stage2/live
 	@$(call add,FEATURES,live)
-	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && (live || network || icewm)))
+
+use/live/base: use/live use/syslinux/ui-menu
+	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))
+
+use/live/icewm: use/live/base
+	@$(call add,LIVE_LISTS,\
+		$(call tags,(base || desktop) && (live || network || icewm)))

features.in/live/live/image-scripts.d/30-users

@@ -23,8 +23,7 @@ add_user()
 	fi
     done
 
-    /usr/sbin/useradd -p "" -G "$groups" "$1" ||:
-    chown -R "$1:auth" "/etc/tcb/$1"
+    useradd -p "" -G "$groups" "$1" ||:
     chown -R "$1:$1" /home/$1
 
     if [ -n "$GLOBAL_CRYPT_HOMES" ]; then
@@ -39,13 +38,14 @@ add_user()
     else
         verbose "Can't find writable $sudoers file."
     fi
+
+    echo "Hello friend, say \`$1' to log in at \\l" >> /etc/issue
 }
 
 verbose "has started"
 
 verbose "Clear password for root account"
-/usr/sbin/usermod -p "" root
-chown -R root.auth /etc/tcb/root
+usermod -p "" root
 
 add_user altlinux
 

image.in/Makefile

@@ -41,7 +41,7 @@ postprocess:
 	echo "** image: $(IMAGE_OUTFILE)" && \
 	ln -sf "$(IMAGE_OUTFILE)" "$(IMAGEDIR)/$(IMAGE_FILE)" && \
 	ln -sf "$(IMAGE_FILE)" "$(IMAGEDIR)/$(LINKPREFIX).$(IMAGE_TYPE)"; \
-	ln -sf "$$OUTPATH" "$(IMAGE_FILE)"; \
+	ln -sf "$${OUTPATH#`pwd`/}" "$(IMAGE_FILE)"; \
 	if [ -n "$(GLOBAL_DEBUG)" ]; then \
 		cp -a build.log "$$OUTPATH.log"; \
 		cp -a distcfg.mk "$$OUTPATH.cfg"; \

lib/build.mk

@@ -34,3 +34,4 @@ build: profile/populate
 		df -P $(BUILDDIR) | awk 'END { if ($$4 < 1024) \
 			{ print "** NB: low space on "$$6" ("$$5" used)"}}'; \
 	fi
+	@if [ -n "$(BELL)" ]; then echo -ne '\a' >&2; fi

lib/clean.mk

@@ -15,7 +15,7 @@ endif
 # ordinary clean: destroys workdirs but not the corresponding results
 clean:
 	@echo '** cleaning up $(WARNING)'
-	@find -name '*~' -delete >&/dev/null
+	@find -name '*~' -delete >&/dev/null ||:
 	@if [ -L build -a -d build/ ]; then \
 		$(MAKE) -C build $@ GLOBAL_BUILDDIR=$(shell readlink build) $(LOG) ||:; \
 	fi
@@ -28,6 +28,6 @@ distclean: clean
 		rm -rf build/.git; \
 		$(MAKE) -C build $@ GLOBAL_BUILDDIR=$(shell readlink build) $(LOG) || \
 			rm -rf build/; \
-		rm -r $(shell readlink build); \
+		rm -rf $(shell readlink build); \
 	fi
-	@rm -f build
+	@rm -f build ||:

lib/profile.mk

@@ -11,7 +11,7 @@ SYMLINK = build
 ifndef BUILDDIR
 BUILDDIR := $(shell [ -s "$(SYMLINK)" ] \
         && realpath "$(SYMLINK)" \
-        || bin/mktmpdir mkimage-profiles.build)
+        || bin/mktmpdir mkimage-profiles)
 endif
 
 # even smart caching only hurts when every build goes from scratch
@@ -26,36 +26,43 @@ RC := $(HOME)/.mkimage/profiles.mk
 
 # holds a postprocessor; shell test executes in particular situation
 # NB: not exported, for toplevel use only
-SHORTEN = $(shell [ "$(DEBUG)" != 2 -a -s "$(SYMLINK)" ] \
-	  && echo "| sed 's,$(BUILDDIR),$(SYMLINK),'")
+SHORTEN = $(shell \
+		if [ -s "$(SYMLINK)" ]; then \
+			echo "| sed 's,$(BUILDDIR),$(SYMLINK),'"; \
+		else \
+			echo "| sed 's,$(TMP),\$$TMP,'"; \
+		fi;)
 
 # step 1: initialize the off-tree mkimage profile (BUILDDIR)
 profile/init: distclean
 	@echo -n "** initializing BUILDDIR: "
 	@rsync -qaH --delete image.in/ "$(BUILDDIR)"/
+	@mkdir "$(BUILDDIR)"/.mki	# mkimage toplevel marker
 	@$(call put,ifndef DISTCFG_MK)
 	@$(call put,DISTCFG_MK = 1)
-	@{ \
-		git show-ref --head -d -s -- HEAD && \
-		git status -s && \
-		echo; \
-	} $(LOG)
-	@mkdir "$(BUILDDIR)"/.mki	# mkimage toplevel marker
-	@if type -t git >&/dev/null && cd $(BUILDDIR); then \
-		git init -q && \
-		git add . && \
-		git commit -qam 'derivative profile initialized'; \
+	@if type -t git >&/dev/null; then \
+		if [ -d .git ]; then \
+			git show-ref --head -d -s -- HEAD && \
+			git status -s && \
+			echo; \
+		fi $(LOG); \
+		if cd $(BUILDDIR); then \
+			git init -q && \
+			git add . && \
+			git commit -qam 'derivative profile initialized'; \
+		fi; \
 	fi
-	@rm -f "$(SYMLINK)" && \
-		if [ -w . ]; then \
-			ln -sf "$(BUILDDIR)" "$(SYMLINK)" && \
-			echo "$(SYMLINK)/"; \
-		else \
-			echo "$(BUILDDIR)/"; \
-		fi
+	@if [ -w . ]; then \
+		rm -f "$(SYMLINK)" && \
+		ln -sf "$(BUILDDIR)" "$(SYMLINK)" && \
+		echo "$(SYMLINK)/"; \
+	else \
+		echo "$(BUILDDIR)/" $(SHORTEN); \
+	fi $(SHORTEN)
 
 profile/bare: profile/init
-	@echo "** preparing distro configuration$${DEBUG:+: see $(CONFIG)}" $(SHORTEN)
+	@echo "** preparing distro config$${DEBUG:+: see $(CONFIG)}" \
+		$(SHORTEN)
 	@$(call try,MKIMAGE_PREFIX,/usr/share/mkimage)
 	@$(call try,GLOBAL_VERBOSE,)
 	@$(call try,IMAGEDIR,$(IMAGEDIR))

pkg.in/lists/tagged/base+builder

@@ -0,0 +1,3 @@
+rpm-build
+mkimage
+git-core

pkg.in/lists/tagged/base+live

@@ -1,4 +1,5 @@
 wget
+rsync
 apt
 vim-console
 mc

sub.in/stage2/README

@@ -4,3 +4,5 @@
 
 Результат -- соответственно названный файл со squashfs,
 подлежащий копированию в итоговый образ.
+
+NB: смонтированный образ доступен в такой системе как /image/.