0.8.3-alt1

- make-3.82 support - fixed live image boot to some extent (see #27640, #27852)
80-make-initfs: fixed silly thinko
2012-10-15 23:34:36 +03:00 · 2012-10-15 17:04:18 +03:00 · 2012-10-15 16:03:58 +03:00 · 2012-10-10 16:18:35 +03:00 · 2012-10-10 12:06:55 +03:00 · 2012-10-10 12:00:17 +03:00
44 changed files with 208 additions and 41 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.0
+Version: 0.8.3
 Release: alt1

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

 %changelog
+* Mon Oct 15 2012 Michael Shigorin <mike@altlinux.org> 0.8.3-alt1
+- make-3.82 support
+- fixed live image boot to some extent (see #27640, #27852)
+
+* Mon Sep 24 2012 Michael Shigorin <mike@altlinux.org> 0.8.2-alt1
+- fixed build with recent make-initrd-propagator
+
+* Mon Sep 03 2012 Michael Shigorin <mike@altlinux.org> 0.8.1-alt1
+- misc fixes
+
 * Mon Aug 13 2012 Michael Shigorin <mike@altlinux.org> 0.8.0-alt1
 - stage2@live

--- a/.gear/tags/8c1ac8f38121c21dfeb04a0c38fa9b95bb7d1f32
+++ b/.gear/tags/8c1ac8f38121c21dfeb04a0c38fa9b95bb7d1f32
@@ -1,6 +0,0 @@
-object 55fda1a044b132323a5b7fbbf109d0dbd9ea69fc
-type commit
-tag v0.7.6
-tagger Michael Shigorin <mike@altlinux.org> 1344283455 +0400
-
-improvements
--- a/.gear/tags/8e161378cc7ad174898a8d51697730334b1b712a
+++ b/.gear/tags/8e161378cc7ad174898a8d51697730334b1b712a
@@ -0,0 +1,6 @@
+object b44705d25baf5b0f0c0abb526d42c42b312026e9
+type commit
+tag v0.8.2
+tagger Michael Shigorin <mike@altlinux.org> 1348509116 +0400
+
+propagator joy
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-8c1ac8f38121c21dfeb04a0c38fa9b95bb7d1f32 v0.7.6
+8e161378cc7ad174898a8d51697730334b1b712a v0.8.2
--- a/9
+++ b/9
@@ -39,13 +39,13 @@ Most docs are in Russian, welcome to learn it or ask for English.
  + базовые комплекты помещены в подкаталогах под sub.in/;
    их наборы скриптов могут расширяться фичами
 - фичи:
-  + накопительный список собирается в $(FEATURES)
  + законченные блоки функциональности (или наборы таковых)
  + описываются в индивидуальных features.in/*/config.mk
  + могут требовать другие фичи, а также субпрофили
+  + накопительный список собирается в $(FEATURES)
  + при сборке $(BUILDDIR) содержимое фич добавляется в профиль
 - списки пакетов (*_LISTS):
-  + просьба по возможности избегать дублирования
+  + просьба по возможности избегать дублирования (см. bin/pkgdups)
 - индивидуальные пакеты (*_PACKAGES): см. тж. conf.d/README

 Результат:
@@ -62,3 +62,8 @@ Most docs are in Russian, welcome to learn it or ask for English.
  + params.txt: переменные, указываемые при запуске сборки
  + pkglists.txt: формирование состава образа
  + features.txt: обзор подключаемых особенностей
+
+Удачи; что не так -- пишите.
+
+-- 
+Michael Shigorin <mike@altlinux.org>
--- a/bin/tar2vm
+++ b/bin/tar2vm
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+# usage:
+# tar2vm chroot.tar image.raw [size_in_bytes]

 . shell-error

@@ -27,7 +29,7 @@ IMG="$2"

 # image size in bytes (256M is a fallback)
 TARSIZE="$(stat -Lc %s "$TAR")"
-DEFSIZE="$((3 * $TARSIZE / 2))"
+DEFSIZE="$((2 * $TARSIZE))"
 DISKSIZE="${3:-${DEFSIZE:-268435456}}"
 # ...and in megabytes
 DISKSIZEM="$(($DISKSIZE / 1048576))"
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -11,7 +11,7 @@ distro/.desktop-network: distro/.desktop-mini +vmguest
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))

-distro/icewm: distro/.desktop-network use/lowmem +icewm; @:
+distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/tde: distro/.desktop-mini +tde; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -57,7 +57,8 @@ distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \
 	use/x11/cinnamon use/x11/3d-proprietary; @:

 distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free
-	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && mate))
+	@$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate))
+	@$(call set,KFLAVOURS,un-def)	# the newest one

 distro/live-enlightenment: distro/.live-desktop use/live/autologin \
 	use/live/ru use/x11/3d-free
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -18,9 +18,16 @@ distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 distro/live-testserver: distro/live-install use/server/mini
 	@$(call set,KFLAVOURS,std-def el-smp)

+distro/live-gns3: distro/live-icewm
+	@$(call add,LIVE_LISTS,gns3)
+	@$(call add,LIVE_KMODULES,kvm virtualbox)
+
 distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)

+distro/server-test: distro/server-mini use/relname
+	@$(call set,RELNAME,Test-Server)
+
 # 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
@@ -28,6 +35,7 @@ distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \

 distro/desktop-systemd: distro/icewm use/systemd; @:
 distro/desktop-plymouth: distro/icewm +plymouth; @:
+distro/live-mate-systemd: distro/live-mate use/systemd use/live/install; @:

 endif # IMAGE_CLASS: distro

--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -1,9 +1,9 @@
 # virtual machines
 ifeq (vm,$(IMAGE_CLASS))

-# NB: use/x11 employs some installer-feature packages
-vm/icewm: vm/bare use/cleanup/installer use/x11/xdm +icewm; @:
-
 vm/net: vm/bare use/vm-net/dhcp use/vm-ssh; @:

+# NB: use/x11 employs some installer-feature packages
+vm/icewm: vm/net use/cleanup/installer use/repo +icewm; @:
+
 endif
--- a/doc/params.txt
+++ b/doc/params.txt
@@ -106,6 +106,11 @@
    - пусто (по умолчанию) либо строка (например, "alpha", "beta")
  + см. ../image.in/Makefile

+- VM_SIZE
+  + задаёт размер несжатого образа виртуальной машины в байтах
+  + значение: пусто (по умолчанию двойной размер чрута) или целое
+  + см. ../features.in/build-vm/lib/90-build-vm.mk, ../bin/tar2vm
+
 пример
 ~~~~~~
 make DEBUG=1 CLEAN=1 distro/syslinux.iso
--- a/features.in/bootloader/README
+++ b/features.in/bootloader/README
@@ -11,4 +11,7 @@
 произведена ещё одна попытка переключения на grub, то в конфигурации
 останется lilo как последняя "новая" цель с точки зрения make.

+При необходимости всё-таки "пересилить" последнее изменение можно
+	@$(call set,BASE_BOOTLOADER,grub_или_lilo)
+
 Реализация экспериментальная (нужно модуляризовать installer-steps).
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -17,3 +17,15 @@ use/install2/kms: use/stage2/kms
 # see also use/vmguest/kvm; qxl included in xorg pkglist
 use/install2/kvm:
 	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
+
+# filesystems handling
+use/install2/fs: use/install2/xfs use/install2/jfs use/install2/reiserfs; @:
+
+use/install2/xfs:
+	@$(call add,INSTALL2_PACKAGES,xfsprogs)
+
+use/install2/jfs:
+	@$(call add,INSTALL2_PACKAGES,jfsutils)
+
+use/install2/reiserfs:
+	@$(call add,INSTALL2_PACKAGES,reiserfsprogs)
--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -1,4 +1,4 @@
 ###
 use/kernel:
 	@$(call add_feature)
-	@$(call set,KFLAVOURS,std-def)
+	@$(call set,KFLAVOURS,un-def)
--- a/features.in/plymouth/config.mk
+++ b/features.in/plymouth/config.mk
@@ -1,8 +1,8 @@
 +plymouth: use/plymouth/full; @:

-# and a few silent aliases
-use/plymouth/live: use/plymouth/stage2
-use/plymouth/install2: use/plymouth/stage2
+# and a few aliases
+use/plymouth/live: use/plymouth/stage2; @:
+use/plymouth/install2: use/plymouth/stage2; @:

 use/plymouth:
 	@$(call add_feature)
--- a/features.in/relname/README
+++ b/features.in/relname/README
@@ -0,0 +1,4 @@
+Эта фича меняет содержимое файла /etc/altlinux-release в соответствии
+с установленной переменной RELNAME, что изменяет пункты загрузки GRUB.
+
+Применяется при необходимости перекрыть внесенный брендингом текст.
--- a/features.in/relname/config.mk
+++ b/features.in/relname/config.mk
@@ -0,0 +1,3 @@
+use/relname:
+	@$(call add_feature)
+	@$(call xport,RELNAME)
--- a/features.in/relname/stage2/image-scripts.d/91-relname
+++ b/features.in/relname/stage2/image-scripts.d/91-relname
@@ -0,0 +1,20 @@
+#!/bin/sh -ef
+# create a postinstall script to perform the change afterwards
+
+if [ -z "$GLOBAL_RELNAME" ]; then
+	echo "** warning: relname feature enabled but RELNAME not set" >&2
+	exit 0
+fi
+
+if [ -n "$GLOBAL_VERBOSE" ]; then
+	echo "** Change /etc/altlinux-release contents to the release name" >&2
+fi
+
+SCRIPT="/usr/share/install2/postinstall.d/91-relname"
+cat > "$SCRIPT" << EOF
+#!/bin/sh
+a= . install2-init-functions
+exec_chroot sh -c 'echo "$GLOBAL_RELNAME" > /etc/altlinux-release'
+exec_chroot sh -c 'grub-mkconfig -o /boot/grub/grub.cfg >&/dev/null ||:'
+EOF
+chmod +x "$SCRIPT"
--- a/features.in/repo/image-scripts.d/90-enable-repo
+++ b/features.in/repo/image-scripts.d/90-enable-repo
@@ -0,0 +1,20 @@
+#!/bin/sh
+# enable online repos if possible, just quit if anything's wrong
+
+repo_source='/etc/apt/sources.list.d/alt.list'
+host='http://ftp.altlinux.org'
+
+[ -s "$repo_source" ] || exit 0
+
+# regexps from alterator-pkg (via installer-feature-online-repo)
+prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?"
+updates_re="${prefix_re}http:\/\/\([^[:space:]]\+\)[[:space:]]*"
+
+# architectures
+host_arch="$(rpm --eval '%_host_cpu')"
+[ "$host_arch" = "x86_64" ] && compat="x86_64-i586" || compat=
+
+# turn on unconditionally
+for arch in "$host_arch" noarch "$compat"; do
+	sed -i "s/^#\($updates_re$arch\)/\1/" "$repo_source"
+done
--- a/features.in/stage2/stage1/scripts.d/10-initrd-base
+++ b/features.in/stage2/stage1/scripts.d/10-initrd-base
@@ -2,5 +2,5 @@
 # prepare base make-initrd configuration for stage1
 # see also http://www.altlinux.org/Make-initrd-propagator

-sed -i 's/AUTODETECT/#AUTODETECT/' /etc/initrd.mk
+sed -i 's/AUTODETECT/#&/' /etc/initrd.mk
 echo 'FEATURES += propagator' >> /etc/initrd.mk
--- a/features.in/stage2/stage1/scripts.d/80-make-initfs
+++ b/features.in/stage2/stage1/scripts.d/80-make-initfs
@@ -1,6 +1,8 @@
-#!/bin/sh -efu
+#!/bin/sh -efux
 # NB: /etc/initrd.mk carefully prepared by earlier scripts

+verbose() { [ -n "$GLOBAL_VERBOSE" ] && echo "** 80-make-initfs: $@" >&2; }
+
 kver="$(rpm -qa 'kernel-image*' \
 	    --qf '%{installtime} %{version}-%{name}-%{release}\n' \
 	| sort -n \
@@ -12,15 +14,25 @@ MAKE_INITRD_OPTS="--no-checks -k $kver"
 MAKE_INITRD_VER="`make-initrd -V \
 	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"

+# make-initrd >= 0.7.8
 if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.7.8"`" != "-1" ]; then
 	MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS --no-depmod"
 fi

+[ -z "$GLOBAL_VERBOSE" ] || MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS -v"
+
 if make-initrd $MAKE_INITRD_OPTS; then
-	gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs
+	pdir="$(getconf LIBDIR)/propagator"
+	if [ -d "$pdir" ]; then		# p5/t6
+		verbose "$pdir exists"
+		gzip < /boot/initrd-$kver.img > "$pdir"/initfs
+	else
+		verbose "$pdir missing, no-op"
+	fi
 else
 	exit 1
 fi

 [ -h /boot/vmlinuz ] || ln -s vmlinuz-$kver /boot/vmlinuz
 [ -h /boot/initrd.img ] || ln -s initrd-$kver.img /boot/initrd.img
+:
--- a/features.in/syslinux/cfg.in/01gfxboot.cfg
+++ b/features.in/syslinux/cfg.in/01gfxboot.cfg
@@ -1,3 +1,3 @@
 ui gfxboot bootlogo message
-menu title ALT Linux (@mkimage-profiles@)
+menu title @relname@
 prompt 0
--- a/features.in/syslinux/cfg.in/01menu.cfg
+++ b/features.in/syslinux/cfg.in/01menu.cfg
@@ -1,3 +1,3 @@
 ui menu.c32
-menu title ALT Linux (@mkimage-profiles@)
+menu title @relname@
 prompt 0
--- a/features.in/syslinux/cfg.in/01prompt.cfg
+++ b/features.in/syslinux/cfg.in/01prompt.cfg
@@ -1,2 +1,2 @@
-say ALT Linux (@mkimage-profiles@)
+say @relname@
 prompt 1
--- a/features.in/syslinux/cfg.in/01vesamenu.cfg
+++ b/features.in/syslinux/cfg.in/01vesamenu.cfg
@@ -1,3 +1,3 @@
 ui vesamenu
-menu title ALT Linux (@mkimage-profiles@)
+menu title @relname@
 prompt 0
--- 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 @distro@
+  menu label ^Install @relname@
  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/cfg.in/20netinstall2.cfg
+++ b/features.in/syslinux/cfg.in/20netinstall2.cfg
@@ -1,5 +1,5 @@
 label netinst
-  menu label Install server-ovz via inter^net
+  menu label Install @relname@ via inter^net
  kernel alt0/vmlinuz
  append initrd=alt0/full.cz fastboot showopts automatic=method:http,network:dhcp,server:ftp.linux.kiev.ua,directory:/pub/Linux/ALT/people/mike/iso/mkimage-profiles/netinst/server-ovz/x86_64 quiet=1 ramdisk_size=131072 vga=0x314
  ### hardwired parameters and strings should become dynamic someday
--- a/features.in/syslinux/config.mk
+++ b/features.in/syslinux/config.mk
@@ -3,6 +3,7 @@ use/syslinux: sub/stage1
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,syslinux)
 	@$(call try,META_SYSTEM_ID,SYSLINUX)
+	@$(call set,RELNAME,ALT Linux ($(IMAGE_NAME)))

 # UI is overwritten
 use/syslinux/ui/%: use/syslinux
--- a/features.in/syslinux/generate.mk
+++ b/features.in/syslinux/generate.mk
@@ -49,9 +49,12 @@ cfg = $(wildcard cfg.in/??$(1).cfg)

 all: debug timeout
 	@### proper text branding should be implemented
-	@sed -i 's,@mkimage-profiles@,$(IMAGE_NAME),' $(DSTDIR)/*.cfg
 	@echo $(SYSLINUX_MODULES) > $(DSTDIR)/modules.list
 	@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
+	@sed -i \
+		-e 's,@mkimage-profiles@,$(IMAGE_NAME),' \
+		-e 's,@relname@,$(RELNAME),' \
+		$(DSTDIR)/*.cfg

 # integerity check
 timeout: distro
--- a/features.in/systemd/config.mk
+++ b/features.in/systemd/config.mk
@@ -1,4 +1,4 @@
 use/systemd:
 	@$(call add_feature)
 	@$(call add,COMMON_PACKAGES,systemd systemd-units systemd-sysvinit)
-	@$(call add,COMMON_PACKAGES,installer-feature-systemd-stage3)
+	@$(call add,COMMON_PACKAGES,installer-feature-systemd-stage3 chkconfig)
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -52,7 +52,7 @@ GLOBAL_TARGET := $(ARCH)
 GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))

 # the lib/build-*.mk comes from features.in/build-*/lib
-include lib/*.mk
+include $(sort $(wildcard lib/*.mk))
 include $(MKIMAGE_PREFIX)/targets.mk

 # specified only for the final image (target-specific)
--- a/image.in/image-scripts.d/01rootdir
+++ b/image.in/image-scripts.d/01rootdir
@@ -0,0 +1,6 @@
+#!/bin/sh
+# fixup chroot's toplevel directory permissions (use to become 1775)
+
+chmod 755 /
+
+rm -f /.gitignore
--- a/lib/clean.mk
+++ b/lib/clean.mk
@@ -51,11 +51,9 @@ distclean: clean

 # builddir existing outside read-only metaprofile is less ephemeral
 # 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 [ "0$(DEBUG)" -lt 2 -a -z "$(CHECK)" ] && \
+	if [ "0$(DEBUG)" -lt 2 -a -z "$(CHECK)$(REPORT)" ] && \
 	     [ "$(NUM_TARGETS)" -gt 1 \
 	       -o -n "$(__frontend)" \
 	       -o ! -L "$(SYMLINK)" ]; then \
--- a/lib/vm.mk
+++ b/lib/vm.mk
@@ -8,7 +8,7 @@ ifeq (vm,$(IMAGE_CLASS))

 vm/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,interactivesystem lilo shadow-utils e2fsprogs)
-	@$(call set,KFLAVOURS,std-def)
+	@$(call set,KFLAVOURS,un-def)

 vm/bare: vm/.bare
 	@$(call add,BASE_PACKAGES,apt)
--- a/main.mk
+++ b/main.mk
@@ -30,7 +30,7 @@ export MKIMAGE_PROFILES := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 -include $(HOME)/.mkimage/profiles.mk

 # most of the actual work done elsewhere
-include lib/*.mk
+include $(sort $(wildcard lib/*.mk))
 include conf.d/*.mk
 include features.in/*/config.mk

--- a/pkg.in/lists/gns3
+++ b/pkg.in/lists/gns3
@@ -0,0 +1,15 @@
+gns3
+
+dynamips
+dynagen
+
+qemu
+qemu-kvm
+virtualbox
+
+wireshark
+
+su
+
+livecd-virtualbox
+livecd-online-repo
--- a/pkg.in/lists/ovz-server
+++ b/pkg.in/lists/ovz-server
@@ -2,6 +2,7 @@ vzctl
 vzdump
 #vzautolimit
 #vzfree
+vzquota
 #vzvalidate
 htop
 yabeda
--- a/pkg.in/lists/tagged/desktop+live
+++ b/pkg.in/lists/tagged/desktop+live
@@ -3,3 +3,4 @@ xinit
 xinitrc
 livecd-setlocale
 installer-feature-runlevel5-stage3
+su
--- a/pkg.in/lists/tagged/desktop+mate
+++ b/pkg.in/lists/tagged/desktop+mate
@@ -15,6 +15,36 @@ mate-session
 #mate-session-manager
 mate-settings-daemon
 mate-themes
-mate-vfs
+mate-vfs gvfs-backends
 mate-vfs-smb
 mate-window-manager
+
+mate-applets
+mate-bluetooth
+mate-calc
+mate-charmap
+mate-document-viewer
+mate-document-viewer-caja
+mate-document-viewer-djvu
+mate-file-archiver
+mate-image-viewer
+mate-media
+mate-media-apps
+mate-netspeed
+mate-power-manager
+mate-screensaver
+mate-terminal
+mate-utils
+mate-utils-mate-system-log
+
+mate-file-manager-extensions
+mate-file-manager-image-converter
+mate-file-manager-open-terminal
+mate-file-manager-sendto
+parcellite
+
+### should be dropped at some stage; see bugreports within this thread:
+# http://lists.altlinux.org/pipermail/sisyphus/2012-August/358079.html
+libmatekbd-capplet
+iso-codes
+tzdata
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -75,6 +75,7 @@ arpwatch
 elinks
 hostinfo
 iftop
+ipmitool
 iproute2
 iptables
 iputils
--- a/sub.in/main/Makefile
+++ b/sub.in/main/Makefile
@@ -29,7 +29,7 @@ IMAGE_PACKAGES = $(call map,list, \
 		 $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \
 		 $(THE_PACKAGES) $(BASE_PACKAGES) $(MAIN_PACKAGES)

-include lib/*.mk
+-include $(sort $(wildcard lib/*.mk))

 MKI_DESTDIR = ALTLinux/RPMS.main
 MKI_PACK_RESULTS = data
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -41,7 +41,7 @@ CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES)
 # pass for use/stage2
 GLOBAL_SQUASHFS := $(SQUASHFS)

-include lib/*.mk
+-include $(sort $(wildcard lib/*.mk))

 # scripts prepare bootloader configuration, too
 # NB: we pass tested squashfs options for ../stage2/Makefile to include
--- a/sub.in/stage2/Makefile
+++ b/sub.in/stage2/Makefile
@@ -37,7 +37,7 @@ IMAGE_PACKAGES_REGEXP += $(call kpackages, \
 			 $(STAGE2_KMODULES) $(STAGE2_KMODULES_REGEXP), \
 			 $(STAGE1_KFLAVOUR))

-include lib/*.mk
+-include $(sort $(wildcard lib/*.mk))

 # see also scripts.d/99-elf-stats
 ifdef GLOBAL_SQUASHFS_SORT
--- a/sub.in/stage2/image-scripts.d/01rootdir
+++ b/sub.in/stage2/image-scripts.d/01rootdir
@@ -0,0 +1,6 @@
+#!/bin/sh
+# fixup chroot's toplevel directory permissions (use to become 1775)
+
+chmod 755 /
+
+rm -f /.gitignore
Author	SHA1	Message	Date
Michael Shigorin	7a50acb5c4	0.8.3-alt1 - make-3.82 support - fixed live image boot to some extent (see #27640, #27852)	2012-10-15 23:34:36 +03:00
Michael Shigorin	90b8fd49f4	80-make-initfs: fixed silly thinko The added pdir check was a hillarious(tm) overlooked bug indeed: I tried to put .../initfs/initfs instead of .../initfs as the result. Duly spotted by torabora@, thanks a lot. Still the kmod+propagator+kernel-image combo needed some tweaking too, see #27640	2012-10-15 17:04:18 +03:00
Michael Shigorin	944e0341c5	stage2: brevity fix A tiny bit less cut-n-paste. :)	2012-10-15 16:03:58 +03:00
Michael Shigorin	6f5be91827	make-3.82 adaptation The issue actually hit image.in/Makefile: "metadata" target in features.in/metadata/lib/50-metadata.mk wasn't reached even if features.in/build-distro/lib/90-build-distro.mk would ACK that the "whatever" actions included "metadata"; thus Metadata/pkg-groups.tar wasn't created and the installer silently failed to install the .base system. Let's armour the rest of the cases where the order of inclusion might be important as well.	2012-10-10 16:18:35 +03:00
Michael Shigorin	718a50b9d0	relname: tweak the fix/diagnostics The culprit would be that $RELNAME isn't really set there ($GLOBAL_RELNAME is), and sh -u will treat that as error.	2012-10-10 12:06:55 +03:00
Mike Radyuk	78684bfef3	fix RELNAME script and README	2012-10-10 12:00:17 +03:00
Mike Radyuk	cc623bc56b	fix typo in RELNAME variable	2012-10-09 00:13:02 +03:00
Michael Shigorin	64536f62d1	bootloader README: a note on overriding It's pretty ugly but dropping the current way means losing the dependency tracking which is critical to get the required alterator module into install2.	2012-10-01 23:28:24 +03:00
Michael Shigorin	91053b9daf	gear-store-tags	2012-09-24 21:52:10 +04:00
Michael Shigorin	b44705d25b	0.8.2-alt1 - fixed build with recent make-initrd-propagator	2012-09-24 21:21:49 +04:00
Michael Shigorin	12a2fc983c	80-make-initfs: fix for current make-initrd* Thanks mithraen@ for spotting, boyarsh@ for explaining, and legion@ for hearty support :) The problem would manifest itself like this: /.host/script.sh: line 20: /usr/lib64/propagator/initfs: \ No such file or directory mki-scripts: .../stage1/scripts.d/80-make-initfs: unable to run script.	2012-09-24 21:20:49 +04:00
Michael Shigorin	30d0340d56	install2: added convenient filesystems support Thanks Serg Markov for bringing my attention to this: http://www.opennet.ru/openforum/vsluhforumID3/86552.html#61 While the official distros might skip some filesystems for support reasons there's no reason for community distros to do so either. Let's try that with icewm.iso... NB: installer has a misfeature of dropping jfs/reiserfs support in runtime unless "expertmode" magic word is on the kernel bootargs string (#27763, #17368).	2012-09-24 11:07:49 +04:00
Michael Shigorin	2f357e44d6	clean.mk: skip if REPORT requested either The problem would manifest itself like this: ..:..:.. cleaning up after build sed: can't read .../build.log: No such file or directory	2012-09-24 11:07:45 +04:00
Michael Shigorin	a2b89e6647	ovz-server: add vzquota Asked for by torabora@; indeed.	2012-09-23 11:46:52 +04:00
Michael Shigorin	56b3147eac	README: minor readability fixes Should be a tiny bit better this way.	2012-09-22 17:37:14 +04:00
Michael Shigorin	d5cf1ff3eb	renamed menuitem-grub feature to relname Its immediate purpose was influencing the GRUB boot menu but the implemented mechanism is actually a part of the long planned text branding and might be further merged into branding when hierarchical features finally chime in. So let's get the naming straight before it breeds.	2012-09-12 20:12:41 +03:00
Michael Shigorin	f44908ca78	proofreading of the merged commits File contents should be correct.	2012-09-12 19:39:42 +03:00
Mike Radyuk	8233aa8424	added menuitem-grub feature	2012-09-12 19:23:55 +03:00
Mike Radyuk	a35b5fbc21	added MENUITEM variable	2012-09-12 19:19:37 +03:00
Michael Shigorin	c3a1b4a934	gear-store-tags	2012-09-03 20:22:54 +03:00
Michael Shigorin	061f299fa1	0.8.1-alt1 - misc fixes	2012-09-03 20:22:16 +03:00
Michael Shigorin	e52e21781f	actually useful vm/icewm See http://www.opennet.ru/openforum/vsluhforumID3/86239.html#1 for a query that has led to this one; in particular, - xdm dropped (won't log in root and there are no users yet); - network is brought up and configured via DHCP by default; - apt-get works out-of-box; - default image size is twice the chroot size.	2012-09-03 19:16:50 +03:00
Michael Shigorin	0e8871e7b4	use un-def kernel by default 3.5.2-std-def-alt2 brings boot problems which were absent with 3.4.x-std-def and are absent with 3.5.x-un-def; seems like it's better to stay with known good variant at the moment instead of having to fall back to it.	2012-09-03 19:16:50 +03:00
Michael Shigorin	e064954e93	rescue += ipmitool It was missing indeed; suggested by ildar@.	2012-09-03 19:16:50 +03:00
Michael Shigorin	83fa2544bc	fix root directory permissions hsh-initroot leaves the chroot's root directory permissions as 1775 while these should really be 755 at most; let's fix it (important for both VE and VM images, useful for rescue/livecd ones as well -- especially those with an installer onboard).	2012-09-03 19:16:50 +03:00
Michael Shigorin	d0cb988897	desktop+live += su Thanks aen@ for finally mentioning it as I just used to cope without su. :)	2012-09-03 19:16:50 +03:00
Michael Shigorin	84591991cb	no more silent aliases The missing "; @:" at the end of the otherwise recipeless rule resulted in target graph being broken; I should have checked this when introducing these aliases (the intent was to reduce noise).	2012-09-03 19:16:50 +03:00
Michael Shigorin	d2581522d9	systemd += chkconfig It appears that chkconfig wasn't getting pulled in by now if not told so explicitly. Still in need.	2012-09-03 19:16:50 +03:00
Michael Shigorin	705a20938a	conf.d/test.mk: live-mate-systemd Not even alpha quality yet but at least debuggable: - X session doesn't autostart but service dm start works; - keyboard layout indicator is missing until started by hand.	2012-09-03 19:16:50 +03:00
Michael Shigorin	f54a5660d1	MATE: current crop of packages There's a bunch of additions to the MATE package list: thanks viy@ for pulling extras into autoimports, several more tweaks done due to hints by dek@, and openssh packages added for debugging convenience. The kernel's been changed for the latest one (un-def).	2012-09-03 19:16:50 +03:00
Michael Shigorin	e0a849e974	initial live-gns3 Someone over the internets suggested that such a LiveCD exist: http://www.opennet.ru/openforum/vsluhforumID3/85817.html#24 ...but then disappeared in the thin air, sigh.	2012-09-03 19:15:42 +03:00
Michael Shigorin	b5e5d4f223	gear-store-tags	2012-08-13 22:04:57 +03:00