0.7.6-alt1

- minor improvements
image.in/Makefile: support image STATUS
2012-08-07 00:03:41 +04:00 · 2012-08-06 23:58:26 +04:00 · 2012-08-06 23:58:26 +04:00 · 2012-08-06 23:56:32 +04:00 · 2012-07-31 21:28:44 +04:00 · 2012-07-31 13:51:34 +04:00
41 changed files with 241 additions and 106 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.7.3
+Version: 0.7.6
 Release: alt1

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

 %changelog
+* Mon Aug 06 2012 Michael Shigorin <mike@altlinux.org> 0.7.6-alt1
+- minor improvements
+
+* Mon Jul 30 2012 Michael Shigorin <mike@altlinux.org> 0.7.5-alt1
+- a bunch of fixups and cleanups
+
+* Mon Jul 16 2012 Michael Shigorin <mike@altlinux.org> 0.7.4-alt1
+- ppc builds
+
 * Mon Jul 09 2012 Michael Shigorin <mike@altlinux.org> 0.7.3-alt1
 - arm builds

--- a/.gear/tags/50e9488f26557b8bcab412e07ae6265c1270938d
+++ b/.gear/tags/50e9488f26557b8bcab412e07ae6265c1270938d
@@ -0,0 +1,6 @@
+object 2a437c4d2225bdfd1406765711ba46694c9ed2aa
+type commit
+tag v0.7.5
+tagger Michael Shigorin <mike@altlinux.org> 1343664913 +0400
+
+fixups
--- a/.gear/tags/f108c3daaab553777186eb3d12e6a850516417d4
+++ b/.gear/tags/f108c3daaab553777186eb3d12e6a850516417d4
@@ -1,6 +0,0 @@
-object b4560c7aee6082b1a8f33981ee5543339e4f1ddb
-type commit
-tag v0.7.2
-tagger Michael Shigorin <mike@altlinux.org> 1341235133 +0300
-
-simply fixes
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-f108c3daaab553777186eb3d12e6a850516417d4 v0.7.2
+50e9488f26557b8bcab412e07ae6265c1270938d v0.7.5
--- a/6
+++ b/6
@@ -10,7 +10,7 @@ ifndef ARCHES
 ifdef ARCH
 ARCHES := $(ARCH)
 else
-ARCHES := $(shell arch | sed 's/i686/i586/; s/armv.*/arm/')
+ARCHES := $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
 endif
 endif
 export ARCHES
@@ -26,7 +26,7 @@ endif
 # recursive make considered useful for m-p
 MAKE += -r --no-print-directory

-DIRECT_TARGETS := clean distclean check help help/distro help/ve help/vm
+DIRECT_TARGETS := help help/distro help/ve help/vm clean distclean check
 .PHONY: $(DIRECT_TARGETS)
 $(DIRECT_TARGETS):
 	@$(MAKE) -f main.mk $@
@@ -53,7 +53,7 @@ SHELL = /bin/bash
 	fi; \
 	for ARCH in $(ARCHES); do \
 		if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then say; fi; \
-		say "** ARCH: $$ARCH" >&2; \
+		say "** ARCH: $$ARCH"; \
 		if $(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); then \
 			if [ -n "$$REPORT" ]; then \
 				$(MAKE) -f reports.mk ARCH=$$ARCH; \
--- a/bin/mktmpdir
+++ b/bin/mktmpdir
@@ -12,7 +12,7 @@ try_source() { [ -f "$1" ] && . "$1"; }
 # hasher accepted ones
 get_prefices()
 {
-	try_source /etc/hasher-priv/system
+	try_source /etc/hasher-priv/system || exit 1
 	try_source `/usr/libexec/hasher-priv/getconf.sh`
 	echo "$prefix" | tr ':' '\n' | while read i; do realpath "$i"; done
 }
@@ -43,7 +43,7 @@ choose_tmpdir() {
 	for i in "$@"; do
 		[ -d "$i" -a -w "$i" ] || continue
 		echo -n "$i "
-		df -Tl "$i" | tail -1
+		df -PT "$i" | tail -1
 	done \
 	| sort -unk6 \
 	| while read dir dev fstype size used free percent mnt; do
@@ -61,19 +61,19 @@ choose_tmpdir() {
 # bringing it all together
 TMPDIRS="`contemplate_dirs $DIRS`"
 if [ -z "$TMPDIRS" ]; then
-	echo "error: no suitable directories found;" >&2
-	echo "please check docs, filesystem and hasher setup" >&2
-	echo "(mount enough tmpfs into /tmp or fix hasher-priv prefix?)" >&2
+	echo "error: no suitable directories found;"
+	echo "please check QUICKSTART, filesystem and hasher setup"
+	echo "(mount enough tmpfs into /tmp or fix hasher-priv prefix?)"
 	exit 1
-fi
+fi >&2

 TEMP="`choose_tmpdir $TMPDIRS`"
 if [ -z "$TEMP" ]; then
-	echo "error: no suitable directories found;" >&2
-	echo "please check hasher docs and filesystem setup" >&2
-	echo "(nodev and/or noexec on an otherwise suitable filesystem?)" >&2
+	echo "error: no suitable directories found;"
+	echo "please check hasher docs and filesystem setup"
+	echo "(nodev and/or noexec on an otherwise suitable filesystem?)"
 	exit 1
-fi
+fi >&2

 DIR="$TEMP/`dirname "$1"`"
 NAME="`basename "${1:-tmpdir}"`"
--- a/conf.d/README
+++ b/conf.d/README
@@ -10,7 +10,7 @@

 Попросту говоря, copy-paste -- тревожный признак.

-По переменным (см. тж. ../doc/vars-conf.txt):
+По переменным (см. тж. ../doc/pkglists.txt):

 - для пользовательского окружения (live, main) предназначены
  THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP
--- a/conf.d/alien.mk
+++ b/conf.d/alien.mk
@@ -1,6 +0,0 @@
-ve/.centos-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-
-ve/centos: ve/.centos-base
-	@$(call add,BASE_PACKAGES,openssh-server)
-
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -15,7 +15,5 @@ distro/icewm: distro/.desktop-network use/lowmem +icewm; @:
 distro/tde: distro/.desktop-mini +tde; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
-distro/desktop-systemd: distro/icewm use/systemd; @:
-distro/desktop-plymouth: distro/icewm +plymouth; @:

 endif
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -1,12 +1,8 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))

-distro/syslinux: distro/.init \
-	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
-
 distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
 distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
-distro/live-systemd: distro/.base use/live/base use/systemd; @:

 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
 distro/.live-desktop: distro/.base +live use/plymouth/live; @:
@@ -16,25 +12,24 @@ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')

-distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
-	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
-
 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: distro/.live-base use/dev/mkimage use/dev/repo \
+	use/syslinux/timeout/30
 	@$(call set,KFLAVOURS,$(BIGRAM))
 	@$(call add,LIVE_LISTS,$(call tags,base && (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))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)

-distro/live-install: distro/.live-base use/live/textinst; @:
+distro/live-install: distro/.live-base use/live/textinstall; @:
 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-plymouth: distro/.live-base use/plymouth/live; @:

 distro/live-rescue: distro/live-icewm
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -5,20 +5,12 @@ distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest
 	@$(call add,BASE_LISTS,server-base openssh)

 distro/server-nano: distro/.server-base \
-	use/cleanup/x11-alterator use/bootloader/lilo
+	use/cleanup/x11-alterator use/bootloader/lilo +power
 	@$(call add,BASE_LISTS,$(call tags,server network))
 	@$(call add,BASE_PACKAGES,dhcpcd cpio)

-distro/server-mini: distro/.server-base use/cleanup/x11-alterator
+distro/server-mini: distro/.server-base use/server/mini use/cleanup/x11-alterator
 	@$(call set,KFLAVOURS,el-smp)
-	@$(call add,THE_KMODULES,e1000e igb)
-	@$(call add,STAGE1_KMODULES,e1000e igb)
-	@$(call add,BASE_LISTS,\
-		$(call tags,base && (server || network || security || pkg)))
-	@$(call add,BASE_LISTS,$(call tags,extra (server || network)))
-
-distro/server-systemd: distro/server-mini use/systemd
-	@$(call set,KFLAVOURS,std-def)

 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
 	use/firmware/server use/firmware/wireless use/power/acpi/button
@@ -32,9 +24,4 @@ distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
 	@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
 	@$(call add,MAIN_GROUPS,monitoring diag-tools)

-# tiny network-only server-ovz installer (stage2 comes over net too)
-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)
-
 endif
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -0,0 +1,52 @@
+# debug/test/experimental images
+ifneq (,$(DEBUG))
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/syslinux: distro/.init \
+	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
+
+distro/syslinux-auto: distro/.init use/hdt use/syslinux/timeout/1; @:
+distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
+
+distro/live-systemd: distro/.base use/live/base use/systemd; @:
+distro/live-plymouth: distro/.live-base use/plymouth/live; @:
+
+distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
+	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
+
+distro/live-testserver: distro/live-install use/server/mini
+	@$(call set,KFLAVOURS,std-def el-smp)
+
+distro/server-systemd: distro/server-mini use/systemd
+	@$(call set,KFLAVOURS,std-def)
+
+# tiny network-only server-ovz installer (stage2 comes over net too)
+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-systemd: distro/icewm use/systemd; @:
+distro/desktop-plymouth: distro/icewm +plymouth; @:
+
+endif # IMAGE_CLASS: distro
+
+ifeq (ve,$(IMAGE_CLASS))
+
+ve/.centos-base: ve/.bare
+	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
+
+ve/centos: ve/.centos-base
+	@$(call add,BASE_PACKAGES,openssh-server)
+
+endif # IMAGE_CLASS: ve
+
+ifeq (vm,$(IMAGE_CLASS))
+
+vm/net-static: vm/bare use/vm-net/static use/vm-ssh
+	@$(call set,VM_NET_IPV4ADDR,10.0.2.16/24)
+	@$(call set,VM_NET_IPV4GW,10.0.2.2)
+
+endif # IMAGE_CLASS: vm
+
+endif
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -6,8 +6,4 @@ vm/icewm: vm/bare use/cleanup/installer use/x11/xdm +icewm; @:

 vm/net: vm/bare use/vm-net/dhcp use/vm-ssh; @:

-vm/net-static: vm/bare use/vm-net/static use/vm-ssh
-	@$(call set,VM_NET_IPV4ADDR,10.0.2.16/24)
-	@$(call set,VM_NET_IPV4GW,10.0.2.2)
-
 endif
--- a/doc/params.txt
+++ b/doc/params.txt
@@ -10,7 +10,7 @@

 - ARCH
  + задаёт целевую архитектуру образов
-  + значение: пусто (по умолчанию авто), i586, x86_64 или arm
+  + значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc
  + см. ../lib/build.mk

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

 - CLEAN
  + экономия RAM+swap при сборке в tmpfs, иначе места на диске
@@ -51,9 +51,9 @@
  + см. ../lib/clean.mk

 - DEBUG
-  + включает средства отладки
+  + включает средства отладки, может отключить зачистку после сборки
  + значение: пусто (по умолчанию), 1 или 2
-  + см. ../lib/log.mk
+  + см. ../lib/log.mk, ../lib/clean.mk

 - HOMEPAGE, HOMENAME, HOMEWAIT
  + указывают адрес, название и таймаут перехода для домашней страницы
@@ -86,6 +86,12 @@
  + значение: пусто (по умолчанию) либо любая строка
  + см. ../image.in/Makefile

+- SORTDIR
+  + дополнительно структурирует каталог собранных образов
+  + значение: пусто (по умолчанию) либо строка
+    - например, '$(IMAGE_NAME)/$(DATE)'
+  + см. ../image.in/Makefile
+
 - SQUASHFS
  + определяет характер сжатия squashfs для stage2
  + значение:
@@ -94,10 +100,10 @@
    - fast: gzip/lzo (быстрее запаковывается и распаковывается, меньше степень)
  + см. ../features.in/stage2/stage1/scripts.d/03-test-kernel

- SORTDIR
-  + дополнительно структурирует каталог собранных образов
-  + значение: пусто (по умолчанию) либо строка
-    - например, '$(IMAGE_NAME)/$(DATE)'
+- STATUS
+  + добавляет в имя образа указанный префикс
+  + значение:
+    - пусто (по умолчанию) либо строка (например, "alpha", "beta")
  + см. ../image.in/Makefile

 пример
--- a/doc/qemu.txt
+++ b/doc/qemu.txt
@@ -0,0 +1,26 @@
+Для сборки с применением трансляции посредством QEMU
+выполните от имени root следующие команды:
+
+apt-get install qemu-user-binfmt_misc
+modprobe binfmt_misc
+echo 32768 > /proc/sys/vm/mmap_min_addr
+
+и сконфигурируйте его применение для требуемых платформ:
+
+echo ":arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/.host/qemu-arm:" > /proc/sys/fs/binfmt_misc/register
+echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/.host/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register
+
+Если файл /proc/sys/fs/binfmt_misc/register не существует,
+потребуется установить и загрузить иное ядро (например, std-def).
+
+Также нужен sources.list с указанием соответствующего репозитория
+и ссылающийся на него apt.conf (см. apt.conf.sample); например:
+
+--- sources.list.sisyphus.arm
+rpm http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus arm classic
+---
+
+--- sources.list.4.1.ppc
+rpm http://ftp.altlinux.org/pub/people/wart/repos/lioka/powerpc ppc classic
+rpm http://ftp.altlinux.org/pub/people/wart/repos/lioka/powerpc noarch classic
+---
--- a/features.in/branding/README
+++ b/features.in/branding/README
@@ -2,6 +2,11 @@
 добавление задающих внешний вид и сообщения дистрибутива
 пакетов; см. тж. http://www.altlinux.org/Branding

+Реализация "двумерная" -- отдельно задаётся BRANDING
+(см. пакеты branding-*-%version-%release.src.rpm),
+затем отдельно указывается, какие и куда помещать
+компоненты заданного брендинга.
+
 Назначение и возможные значения (если требуются):

 - STAGE1_BRANDING
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
@@ -22,7 +22,7 @@ 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 $(WHATEVER) imagedir
+prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)

 dot-disk:
 	@mkdir -p files/.disk
--- a/features.in/build-ve/lib/90-build-ve.mk
+++ b/features.in/build-ve/lib/90-build-ve.mk
@@ -15,5 +15,3 @@ IMAGE_PACKAGES = $(call list,$(BASE_LISTS)) \

 all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
-
-prep: imagedir
--- a/features.in/build-vm/generate.mk
+++ b/features.in/build-vm/generate.mk
@@ -0,0 +1,4 @@
+# copy tar2vm helper into generated profile to enable standalone builds
+
+all:
+	@install -pD $(MKIMAGE_PROFILES)/bin/tar2vm $(BUILDDIR)/bin/tar2vm
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -50,5 +50,3 @@ pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)

 all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
 	convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
-
-prep: imagedir
--- a/features.in/dev/config.mk
+++ b/features.in/dev/config.mk
@@ -3,7 +3,7 @@ use/dev:
 	@$(call add,THE_PACKAGES,git-core hasher gear)

 use/dev/mkimage: use/dev
-	@$(call add,THE_PACKAGES,mkimage shadow-change)
+	@$(call add,THE_PACKAGES,mkimage shadow-change su)

 use/dev/repo: use/dev use/repo/main
 	@$(call add,THE_PACKAGES,apt-repo)
--- a/features.in/dev/live/image-scripts.d/40-hasher
+++ b/features.in/dev/live/image-scripts.d/40-hasher
@@ -13,10 +13,10 @@ HOME="/home/$USER"
 install -dm750 -o "$USER" -g "$USER" "$HOME"

 # we honestly don't know much more
-if type -t git >&/dev/null; then
+if type -t git && type -t su; then
 	su - -c "git config --global user.email $USER@localhost" "$USER"
 	su - -c "git config --global user.name 'live builder'" "$USER"
-fi
+fi >&/dev/null

 # developer should feel comfortable, eh? ;-)
 ZSHELL="/bin/zsh"
--- a/features.in/live/live/stage2cfg.mk
+++ b/features.in/live/live/stage2cfg.mk
@@ -5,10 +5,10 @@ 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, \
+IMAGE_PACKAGES = $(call map,list, \
 			$(THE_LISTS) $(THE_GROUPS) \
 			$(LIVE_LISTS) $(LIVE_GROUPS)) \
+		 $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
 		 interactivesystem

 MKI_PACK_RESULTS = squash:live
--- a/features.in/rescue/rescue/stage2cfg.mk
+++ b/features.in/rescue/rescue/stage2cfg.mk
@@ -1,8 +1,8 @@
 # stage2 mod: rescue "live" image

-IMAGE_PACKAGES = $(COMMON_PACKAGES) \
+IMAGE_PACKAGES = $(call list,$(RESCUE_LISTS)) \
+		 $(COMMON_PACKAGES) \
 		 $(RESCUE_PACKAGES) \
-		 $(call list,$(RESCUE_LISTS)) \
 		 interactivesystem startup-rescue

 MKI_PACK_RESULTS = squash:rescue
--- a/features.in/server/README
+++ b/features.in/server/README
@@ -0,0 +1,2 @@
+Эта фича предоставляет типичные для серверных образов
+наборы списков пакетов и модулей ядра.
--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
@@ -0,0 +1,9 @@
+use/server:
+	@$(call add_feature)
+
+use/server/mini: use/server
+	@$(call add,THE_KMODULES,e1000e igb)
+	@$(call add,STAGE1_KMODULES,e1000e igb)
+	@$(call add,THE_LISTS,\
+		$(call tags,base && (server || network || security || pkg)))
+	@$(call add,THE_LISTS,$(call tags,extra (server || network)))
--- a/features.in/slinux/config.mk
+++ b/features.in/slinux/config.mk
@@ -13,6 +13,7 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add,THE_LISTS,slinux/network)
 	@$(call add,THE_LISTS,slinux/xfce)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call set,META_VOL_SET,Simply Linux)

 use/slinux/full: use/isohybrid use/slinux use/systemd \
 	use/firmware/wireless use/branding/complete \
--- a/features.in/syslinux/README
+++ b/features.in/syslinux/README
@@ -1,6 +1,10 @@
 Добавление поддержки syslinux; требуется для инсталяторов, live/rescue;
 реализуется в рамках stage1.

+Самостоятельное творческое использование на данный момент подразумевает
+знакомство с /usr/share/doc/syslinux-*/syslinux.txt и изучение кусочков
+конфигурации, которые уже существуют.
+
 Цели config.mk:
 * use/syslinux/ui/% -- конфигурирование интерфейса (см. cfg.in/00*.cfg);
  при использовании автоматически добавляют syslinux в FEATURES;
@@ -17,8 +21,3 @@

 Здесь производится первичная обработка конфигурационных данных,
 окончательно проверяемых и используемых уже в инструментальном чруте.
-
-TODO: может потребоваться обобщение механизма генерации с учётом
-многоуровневых меню и включаемых файлов (которыми лучше не злоупотреблять
-из соображений скорости инициализации загрузчика); требуется обеспечить
-брендирование заголовков.
--- a/features.in/syslinux/cfg.in/01none.cfg
+++ b/features.in/syslinux/cfg.in/01none.cfg
@@ -0,0 +1 @@
+prompt 0
--- a/features.in/syslinux/cfg.in/02noescape.cfg
+++ b/features.in/syslinux/cfg.in/02noescape.cfg
@@ -0,0 +1,2 @@
+noescape 1
+
--- a/features.in/syslinux/cfg.in/20install2.cfg
+++ b/features.in/syslinux/cfg.in/20install2.cfg
@@ -1,5 +1,5 @@
 label linux
-  menu label ^Install ALT Linux
+  menu label ^Install @distro@
  kernel alt0/vmlinuz
  append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@

--- a/features.in/syslinux/generate.mk
+++ b/features.in/syslinux/generate.mk
@@ -17,8 +17,8 @@ endif
 ifdef SYSLINUX_UI
 SYSLINUX_MODULES := $(SYSLINUX_MODULES) $(SYSLINUX_UI)
 else
-$(warning no syslinux ui configured, default is plain text prompt)
-SYSLINUX_UI := prompt
+$(warning no syslinux ui configured, default is now none)
+SYSLINUX_UI := none
 endif

 # SUBPROFILES are considered SYSLINUX_CFG too
@@ -26,7 +26,6 @@ endif
 # 01defaults.cfg is included indefinitely
 SYSLINUX_CFG := $(SYSLINUX_CFG) $(notdir $(SUBPROFILES)) defaults

-### have to operate BUILDDIR, not pretty...
 DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in

 # we can do SYSLINUX_{CFG,MODULES,FILES}
@@ -55,7 +54,7 @@ all: debug timeout
 	@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list

 # integerity check
-timeout: bootargs
+timeout: distro
 	@if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \
 		TIMEOUT="$(SYSLINUX_TIMEOUT)"; \
 	else \
@@ -63,6 +62,14 @@ timeout: bootargs
 	fi; \
 	sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg

+distro: bootargs
+	@if [ -n "$(META_VOL_SET)" ]; then \
+		DISTRO="$(META_VOL_SET)"; \
+	else \
+		DISTRO="ALT Linux"; \
+	fi; \
+	sed -i "s,@distro@,$$DISTRO," $(DSTDIR)/*.cfg
+
 # pass over additional parameters, if any
 bootargs: clean
 	@if [ -n "$(STAGE2_BOOTARGS)" ]; then \
--- a/features.in/syslinux/stage1/scripts.d/01-syslinux
+++ b/features.in/syslinux/stage1/scripts.d/01-syslinux
@@ -3,6 +3,7 @@
 # copy modules; see also ../../generate.mk

 MODDIR="/usr/lib/syslinux"
+CFG="$GLOBAL_BOOTLOADER.cfg"

 mkdir -p "$WORKDIR/syslinux"
 cd "$WORKDIR/syslinux"
@@ -30,7 +31,18 @@ if [ -n "$SYSLINUX_MODULES" ]; then
 fi

 # number ordering sponsored by shell's pathname expansion
-grep -hv '^#' .in/[0-9][0-9]*.cfg > "$GLOBAL_BOOTLOADER.cfg"
+grep -hv '^#' .in/[0-9][0-9]*.cfg > "$CFG"
+
+# there should be either DEFAULT or UI directive there
+if ! egrep -i '^(default|ui)' "$CFG"; then
+	DEFAULT="$(grep -i '^label ' "$CFG" | head -1 | cut -f2 -d' ')"
+	if [ -n "$DEFAULT" ]; then
+		echo "default $DEFAULT" >> "$CFG"
+	else
+		echo "error: no DEFAULT or UI directive and cannot guess" >&2
+		exit 1
+	fi
+fi

 # snippets are not going into the actual image
 if [ "$DEBUG" != 2 ]; then rm -r .in/; fi
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -34,7 +34,7 @@ use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,lightdm-$*-greeter)

 use/x11/kdm: use/x11/runlevel5
-	@$(call add,THE_PACKAGES,kdebase-kdm)
+	@$(call add,THE_PACKAGES,kdebase-kdm<4)

 use/x11/gdm2.20: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,gdm2.20)
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -32,7 +32,7 @@ IMAGE_SORTDIR := $(SORTDIR)

 # reconstruct instead of passing yet another variable
 IMAGE_OUTDIR   := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)
-IMAGE_OUTFILE  := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
+IMAGE_OUTFILE  := $(IMAGE_NAME)-$(STATUS)$(DATE)-$(ARCH).$(IMAGE_TYPE)
 IMAGE_OUTPATH  := $(IMAGE_OUTDIR)/$(IMAGE_OUTFILE)
 IMAGE_RELPATH  := $(IMAGE_SORTDIR:%=%/)$(IMAGE_OUTFILE)
 IMAGE_RELDIR   := $(IMAGE_OUTDIR:$(GLOBAL_BUILDDIR)/%=%)
@@ -48,6 +48,7 @@ COPY_TREE = ./files
 # outdir shouldn't be wiped clean before use
 CLEANUP_OUTDIR ?=

+GLOBAL_TARGET := $(ARCH)
 GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))

 # the lib/build-*.mk comes from features.in/build-*/lib
@@ -67,6 +68,8 @@ save-profile:

 .PHONY: imagedir postprocess debug

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

@@ -88,4 +91,6 @@ debug:
 	@echo "TOPDIR=$(TOPDIR)"
 	@echo "IMAGEDIR=$(IMAGEDIR)"
 	@echo "ARCH=$(ARCH)"
+	@echo "GLOBAL_TARGET=$(GLOBAL_TARGET)"
 	@echo "GLOBAL_HSH_APT_CONFIG=$(GLOBAL_HSH_APT_CONFIG)"
+	@echo "GLOBAL_HSH_USE_QEMU=$(GLOBAL_HSH_USE_QEMU)"
--- a/image.in/functions.mk
+++ b/image.in/functions.mk
@@ -2,7 +2,7 @@
 PKGDIR := $(GLOBAL_BUILDDIR)/pkg

 # duplicated from metaprofile makefiles for the sake of "local" builds
-ARCH ?= $(shell arch | sed 's/i686/i586/; s/armv.*/arm/')
+ARCH ?= $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
 DATE ?= $(shell date +%Y%m%d)

 # prefix pkglist name with its directory to form a path (relative/absolute)
--- a/lib/build.mk
+++ b/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)\.))$$
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$

 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
@@ -20,8 +20,13 @@ LOWSPACE = 1024
 # it's also nice to know how long and much it takes
 START += time -f "%E %PCPU %Mk"

-ifneq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
-# /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not
+# /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
+# also check whether non-x86 build is running native
+ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
+ifeq (,$(findstring $(ARCH),$(shell uname -m)))
+export GLOBAL_HSH_USE_QEMU=$(ARCH)
+endif
+else
 START += $(ARCH)
 endif

--- a/lib/clean.mk
+++ b/lib/clean.mk
@@ -50,11 +50,15 @@ distclean: clean
 	} >&2

 # builddir existing outside read-only metaprofile is less ephemeral
-# than BUILDDIR is -- usually it's unneeded afterwards so just zap it
+# than BUILDDIR variable is -- usually it's unneeded afterwards
+# so just zap it unless DEBUG has been requested (moreso for multi
+# image builds, UI based ones, and readonly metaprofile; or CHECK)
 postclean: build-image
 	@{ \
-	if [ "$(NUM_TARGETS)" -gt 1 -a -z "$(DEBUG)" -a -z "$(__frontend)" ] ||\
-	    [ ! -L "$(SYMLINK)" -a "0$(DEBUG)" -lt 2 ]; then \
+	if [ "0$(DEBUG)" -lt 2 -a -z "$(CHECK)" ] && \
+	     [ "$(NUM_TARGETS)" -gt 1 \
+	       -o -n "$(__frontend)" \
+	       -o ! -L "$(SYMLINK)" ]; then \
 		echo "$(TIME) cleaning up after build"; \
 		$(MAKE) -C "$(BUILDDIR)" distclean \
 			GLOBAL_BUILDDIR="$(BUILDDIR)" $(LOG) ||:; \
--- a/lib/profile.mk
+++ b/lib/profile.mk
@@ -52,13 +52,25 @@ profile/init: distclean
 		fi $(LOG); \
 	fi; \
 	{ \
-		eval `apt-config shell $${APTCONF:+-c=$(wildcard $(APTCONF))} \
+		APTCONF="$(wildcard $(APTCONF))"; \
+		echo "** using $${APTCONF:-system apt configuration}:"; \
+		eval `apt-config shell $${APTCONF:+-c=$$APTCONF} \
 			SOURCELIST Dir::Etc::sourcelist/f \
 			SOURCEPARTS Dir::Etc::sourceparts/d`; \
 		find "$$SOURCEPARTS" -name '*.list' \
-		| xargs egrep -Rhv '^#|^[[:blank:]]*$$' "$$SOURCELIST" && \
+		| xargs egrep -Rhv '^#|^[[:blank:]]*$$' "$$SOURCELIST" \
+		| tee $(BUILDDIR)/sources.list; \
 		echo; \
 	} $(LOG); \
+	if ! grep -q "[	 ]$(ARCH)[ 	]" $(BUILDDIR)/sources.list; then \
+		echo -n "requested arch '$$ARCH' unavailable" >&2; \
+		if [ -z "$(APTCONF)" ]; then \
+			echo " (no APTCONF)"; \
+		else \
+			echo; \
+		fi >&2; \
+		exit 1; \
+	fi; \
 	if type -t git >&/dev/null; then \
 		if cd $(BUILDDIR); then \
 			git init -q && \
--- a/lib/ve.mk
+++ b/lib/ve.mk
@@ -6,17 +6,25 @@ endif

 ifeq (ve,$(IMAGE_CLASS))

+# no package management and networking
 ve/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,basesystem)

+# no "vzctl enter"
 ve/bare: ve/.bare
-	@$(call add,BASE_PACKAGES,apt)
+	@$(call add,BASE_PACKAGES,sysvinit etcnet apt)

-ve/generic: ve/.bare
+# /dev/pty and friends start here
+ve/base: ve/bare
+	@$(call add,BASE_PACKAGES,interactivesystem)
+
+# this should be more or less deployable
+ve/generic: ve/base
 	@$(call add,BASE_LISTS,openssh \
 		$(call tags,base && (server || network || security || pkg)))

-ve/openvpn: ve/.bare
+# example of service-specific template
+ve/openvpn: ve/bare
 	@$(call add,BASE_LISTS,$(call tags,server openvpn))

 endif
--- a/main.mk
+++ b/main.mk
@@ -6,8 +6,6 @@
 # --- in BUILDDIR
 # 4. build subprofiles and subsequently an image

-MKIMAGE_PROFILES := $(dir $(lastword $(MAKEFILE_LIST)))
-
 # deal with one target at a time
 IMAGE_TARGET := $(firstword $(MAKECMDGOALS))#	ve/generic.tar.gz
 ifeq (./,$(dir $(IMAGE_TARGET)))#		convenience fallback
@@ -26,6 +24,8 @@ else
 BUILDDIR_PREFIX ?= mkimage-profiles.build/$(IMAGE_CONF).$(ARCH)
 endif

+export MKIMAGE_PROFILES := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
+
 # preferences
 -include $(HOME)/.mkimage/profiles.mk
Author	SHA1	Message	Date
Michael Shigorin	55fda1a044	0.7.6-alt1 - minor improvements	2012-08-07 00:03:41 +04:00
Michael Shigorin	0d859e70fc	image.in/Makefile: support image STATUS Another feature suggested by Michael Radyuk (torabora): some images are known alpha/beta quality, it's more handy to just state this at the build time than to rename by hand.	2012-08-06 23:58:26 +04:00
Michael Shigorin	cbfc3db882	syslinux: honour META_VOL_SET for boot menu This trots along the TODO item on text branding and hopefully helps Michael Radyuk (torabora) with his feature request to tweak the installer's "Install ALT Linux" label; as an example, Simply will now offer to "Install Simply Linux".	2012-08-06 23:58:26 +04:00
Michael Shigorin	43d62dd9bb	live-builder.iso += livecd-qemu-arch The package actually passed the test and just got uploaded to Sisyphus proper; its aim is to help set up the cross-arch QEMU build environment. NB: there are known issues with PPC32-on-x86_64 (which were the cause for this package and commit to be created in the first place).	2012-08-06 23:56:32 +04:00
Michael Shigorin	307fb51f15	conf.d/test.mk: experimental stuff went here Some images were unbuildable (at least without special setup, like ve/centos), unusable or just not useful in any meaningful way (like distro/live-isomd5sum); as these tend to get any attention during experiments, I decided to put them together in a separate configuration file that would be effectively skipped if DEBUG is not requested.	2012-07-31 21:28:44 +04:00
Michael Shigorin	46e3c94707	syslinux: no ui, no escape This one was suggested by enp@ for industrial use where some extra protection for the boot process might be quite desirable. If no syslinux ui was specified (the stock configuration paths ensure there is one) or if it was set to "none" explicitly, then there's no boot: prompt (let alone any menu). If there's a need to ensure that the boot process is not interruptable by Ctrl/Shift/Caps Lock/Scroll Lock.	2012-07-31 13:51:34 +04:00
Michael Shigorin	78a660aed6	live-builder: added qemu-user-binfmt_misc This provides the means to cross-build at least ARM chroots, there are known problems with PowerPC for me so far: http://lists.altlinux.org/pipermail/devel/2012-July/194855.html See also http://www.altlinux.org/Ports/arm/chroot for /proc magic.	2012-07-30 23:15:36 +04:00
Michael Shigorin	d8f64c0c89	gear-store-tags	2012-07-30 20:15:24 +04:00
Michael Shigorin	2a437c4d22	0.7.5-alt1 - a bunch of fixups and cleanups	2012-07-30 20:14:48 +04:00
Michael Shigorin	3a8af6b55d	lib/clean.mk: post-build cleanup revisited The prerequisites for a cleanup after a successful build were somewhat weird at this point; now the rules are: - if DEBUG level is more than 1 or CHECK is set, don't do it; - otherwise if at least one of the following conditions is true: + there's more than one target being built in a row; + the build was run by e.g. alterator-mkimage; + metaprofile directory is read only ...then do a distclean. If these are still weird or feel unsuitable for profile hacking, drop me a note (or a patch).	2012-07-30 19:59:41 +04:00
Michael Shigorin	ea1f039c02	server-nano += +power Essentially all the relevant server images got cpufreq setup and a power button handler; feel free to ask for revert if this causes any harm in any situation.	2012-07-28 14:26:27 +04:00
Michael Shigorin	8fd4b396f3	branding: clarify README It wasn't obvious at all what BRANDING variable is for (at least until the source code and existing configurarion has been examined).	2012-07-28 13:32:01 +04:00
Michael Shigorin	a680ea2862	Makefile: fix default target to provide help again `help' used to be the default target described at the very top of the toplevel makefile but that got broken with g2f307ff; spotted while discussing m-p with enp@.	2012-07-28 13:26:08 +04:00
Michael Shigorin	57747b22a5	initial live-testserver.iso Also pulled the pkglist/kmodule part out of distro/server-mini's recipe and started off a standalone feature based on it. NB: el-smp kernel now contains aufs as a module but propagator doesn't try to modprobe it.	2012-07-28 13:22:59 +04:00
Michael Shigorin	7eaa868525	conf.d/live.mk: ugly thinko fix, thx enp@ "textinst" != "textinstall", so let's just stick to the latter form.	2012-07-28 00:42:16 +04:00
Michael Shigorin	cb6a71d97f	lib/ve.mk: whoops, ve/bare misses /sbin/init Actually the templates pretending to be usable missed the whole interactivesystem (sysvinit would get pulled in by services as well). Fixed somewhat but time and practice will tell.	2012-07-21 19:15:24 +03:00
Michael Shigorin	ceffac4035	x11: ensure kdm3 installation for tde TDE distros don't really need kdm4 which was proposed as a replacement by zerg@ (for all the valid reasons but kdm3 wasn't maintained at that point, this has changed since).	2012-07-19 15:39:30 +03:00
Michael Shigorin	6c00e10b31	live, rescue: fix stage2cfg.mk LISTS/PACKAGES order The reason is that package lists and individual packages are processed in different dependency resolution "transactions" by mkimage; thus if packages (the more precise form of specifying the contents) come first they can't override the lists appearing later, and that's wrong: we should be able to specify the more generic things and then pinpoint the specifics. This became apparent while authoring [[Mkimage/Profiles/m-p/howto]] asked for by drool@.	2012-07-19 13:32:53 +03:00
Michael Shigorin	cb764516eb	build-vm: standalone build is a must, too The problem was spotted by Alexander Bandura: bin/tar2vm wasn't present in the generated profile. I considered extending features.in/Makefile to include bin/ alongside lib/ but that would make the helper's location unpredictable (unless BUILDDIR is specified explicitly) so restricting sudoers would be harder; worse yet, the copied file would come with write access for the user building an image. The implications in restricted case are complex enough anyways so the recommended implementation would only include a fixed readonly location like /usr/share/mkimage-profiles/bin/tar2vm as laid out in doc/vm.txt, and that means it's in the metaprofile not a generated profile.	2012-07-18 16:06:15 +03:00
Michael Shigorin	5f479eb80f	conf.d/README: updated reference Argh, is it overdocumentation already? The temporary name bites once again...	2012-07-18 12:34:47 +03:00
Michael Shigorin	f3e923ad61	Makefile: drop extra >&2 say() redirects to stderr already.	2012-07-17 20:43:06 +03:00
Michael Shigorin	4ea5959f79	bin/mktmpdir: hasher might be unconfigured yet No need to just go ahead and source files in potentially unavailable directories, really.	2012-07-17 15:53:42 +03:00
Michael Shigorin	1b62f94bf3	gear-store-tags	2012-07-16 21:37:34 +03:00
Michael Shigorin	0a3aaf15c2	0.7.4-alt1 - ppc builds	2012-07-16 21:33:00 +03:00
Michael Shigorin	1ee997e832	initial PowerPC support As it happens, adding another architecture required almost no changes; native 32-bit ppc build took only ARCH and a repo, qemu-ppc one still has problems (/.host/entry hangs while unpacking setup for fakedata). Proof of concept on a QS22: $ make ve/bare.tar.gz ARCH: ppc /bin/sh: rpmvercmp: command not found 21:41:01 cleaning up 21:41:03 initializing BUILDDIR: build/ 21:41:03 preparing distro config 21:41:05 starting image build (coffee time) 21:42:48 done (1:42) image: $TMP/out/bare-20120716-ppc.tar.gz [21M]	2012-07-16 21:20:12 +03:00
Michael Shigorin	18f1a6360a	bin/mktmpdir: grok NFS root "df -l" is going to hurt (or at least spam) if it's a diskless node; "df -P" helps maintain output parseability. So be it.	2012-07-16 21:19:06 +03:00
Michael Shigorin	809ae4d9e8	live-builder: minor fixes su wasn't making it into the image breaking ~/.git setup, and there's no reason for a full default boot timeout either.	2012-07-16 18:24:18 +03:00
Michael Shigorin	24edc620d8	prep optimization There was some extra duplication, just clean it up.	2012-07-16 18:24:18 +03:00
Michael Shigorin	d31a2555bd	non-native ARM support via qemu mkimage and hasher can make use of qemu to run non-native binaries while working on the chroots; thanks kas@, manowar@ and sbolshakov@ for implementing this functionality as well as providing nice examples through mkimage-profiles-arm and mkimage-profile-armrootfs. This required the architecture check to be added since baking a tarball with "arm" as its specified arch and x86_64 inside isn't particularly good thing to let slip through; however the implementation is quite fragile, bugreports and patches are seriously welcome. NB: APTCONF evaluation order between lazy make and nimble shell turned out to be quite a delicate issue in this particular case.	2012-07-16 18:20:55 +03:00
Michael Shigorin	03ba4631f6	gear-store-tags	2012-07-09 23:47:49 +03:00