0.9.2-alt1

- enhanced uefi support
luks: drop obsolete comment
2012-12-17 17:56:45 +04:00 · 2012-12-17 15:22:44 +04:00 · 2012-12-17 14:47:42 +04:00 · 2012-12-17 14:40:55 +04:00 · 2012-12-17 14:40:55 +04:00 · 2012-12-17 14:40:45 +04:00
42 changed files with 242 additions and 78 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.7
+Version: 0.9.2
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -15,10 +15,10 @@ BuildRequires: rsync asciidoc-a2x xmlgraphics-fop fonts-ttf-dejavu
 BuildRequires: /proc

 Requires: rsync git-core
-Requires: time schedutils
-Requires: mkimage >= 0.2.0
+Requires: time schedutils sfdisk
+Requires: mkimage >= 0.2.5

-# Recommends: graphviz
+# Recommends: graphviz qemu-img

 %define mpdir %_datadir/%name
 %add_findreq_skiplist %mpdir/*.in/*
@@ -78,6 +78,16 @@ cp -a * %buildroot%mpdir
 %doc %docs/*

 %changelog
+* Mon Dec 17 2012 Michael Shigorin <mike@altlinux.org> 0.9.2-alt1
+- enhanced uefi support
+
+* Mon Dec 03 2012 Michael Shigorin <mike@altlinux.org> 0.9.1-alt1
+- initial kde4 support
+
+* Mon Nov 19 2012 Michael Shigorin <mike@altlinux.org> 0.9.0-alt1
+- initial uefi, luks, armh support
+- enhanced arm, gnome3/systemd, vm support
+
 * Sun Nov 11 2012 Michael Shigorin <mike@altlinux.org> 0.8.7-alt1
 - regressions--

--- a/.gear/tags/24fb8e929beca1399383ff7d269589711a1dca2c
+++ b/.gear/tags/24fb8e929beca1399383ff7d269589711a1dca2c
@@ -1,6 +0,0 @@
-object cebabf992f29ac406170ea6d349ddcf1e4a827b1
-type commit
-tag v0.8.6
-tagger Michael Shigorin <mike@altlinux.org> 1352123574 +0400
-
-make docs
--- a/.gear/tags/25f0420130990a8bfd7b5e91435ac54c7f8eee33
+++ b/.gear/tags/25f0420130990a8bfd7b5e91435ac54c7f8eee33
@@ -0,0 +1,6 @@
+object 919b09313f3be5702cb8e83f9d0372f4d06ed6f3
+type commit
+tag v0.9.1
+tagger Michael Shigorin <mike@altlinux.org> 1354548428 +0200
+
+kde4
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-24fb8e929beca1399383ff7d269589711a1dca2c v0.8.6
+25f0420130990a8bfd7b5e91435ac54c7f8eee33 v0.9.1
--- a/3
+++ b/3
@@ -10,7 +10,8 @@ ifndef ARCHES
 ifdef ARCH
 ARCHES := $(ARCH)
 else
-ARCHES := $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
+ARCHES := $(shell arch \
+	| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
 endif
 endif
 export ARCHES
--- a/16
+++ b/16
@@ -10,24 +10,30 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
 полезно
 ~~~~~~~
 - смонтированный tmpfs на несколько гигабайт
-  + например, в /tmp или /home/USER/hasher
-  + каталог из prefix в /etc/hasher-priv/system
+  * например, в /tmp или /home/USER/hasher
+  * каталог из prefix в /etc/hasher-priv/system
 - установленный git-core
 - настроенный ~/.gitconfig

 команды
 ~~~~~~~
- от имени root:
+от имени root::
+----
 # apt-get install mkimage hasher git-core
 # hasher-useradd USER
+----

- от имени указанного пользователя (после повторного входа):
+от имени указанного пользователя (после повторного входа)::
+----
 $ git config --global user.email "my@email"
 $ git config --global user.name "My Name"
 $ mkdir ~/out
+----

- тестовая сборка (см. тж. lib/distro.mk, doc/params.txt):
+тестовая сборка (см. тж. lib/distro.mk, doc/params.txt)::
+----
 $ make syslinux.iso
+----

 ссылки
 ~~~~~~
--- a/bin/tar2vm
+++ b/bin/tar2vm
@@ -42,7 +42,7 @@ ROOTFSTYPE="${4:-ext4}"
 ROOTDEV="/dev/sda1"

 # last preparations...
-for i in losetup parted kpartx mkfs."$ROOTFSTYPE"; do
+for i in losetup sfdisk parted kpartx mkfs."$ROOTFSTYPE"; do
 	if ! type -t "$i" >&/dev/null; then
 		fatal "$i required but not found"
 	fi
@@ -98,8 +98,8 @@ chroot "$ROOTFS" make-initrd -k "$KERNEL"
 sed -i "s,$LOOPDEV1,$ROOTDEV," "$ROOTFS/etc/fstab"

 # configure and install bootloader
-REGEXP='^([0-9]+) heads, ([0-9]+) sectors/track, ([0-9]+) cylinders.*$'
-set -- $(fdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
+REGEXP='^Disk .*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
+set -- $(sfdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")

 LILO_COMMON="lba32
 delay=1
@@ -113,9 +113,9 @@ cat > "$ROOTFS"/etc/lilo-loop.conf << EOF
 boot=$LOOPDEV
 disk=$LOOPDEV
  bios=0x80
-  heads=$1
-  sectors=$2
-  cylinders=$3
+  cylinders=$1
+  heads=$2
+  sectors=$3
  partition=$LOOPDEV1
  start=63
 $LILO_COMMON
--- a/conf.d/README
+++ b/conf.d/README
@@ -25,19 +25,19 @@
  что обязано быть и в инсталяторе, и в готовой системе

 - для направленного действия служат:
-  + STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
-  + STAGE2_PACKAGES (инсталятор и спасательная/"живая" система)
-  + INSTALL2_PACKAGES (инсталятор)
-  + BASE_PACKAGES, BASE_LISTS, BASE_PACKAGES_REGEXP (базовая система)
-  + MAIN_PACKAGES, MAIN_LISTS, MAIN_PACKAGES_REGEXP (дополнительные пакеты)
-  + LIVE_PACKAGES, LIVE_LISTS, LIVE_PACKAGES_REGEXP ("живая" система)
+  * STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
+  * STAGE2_PACKAGES (инсталятор и спасательная/"живая" система)
+  * 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, main)
+  * STAGE1_KMODULES доступны в производных от stage2 (install2, live, rescue)
+  * BASE_KMODULES попадут в установку по умолчанию
+  * MAIN_KMODULES будут доступны для установки с носителя
+  * LIVE_KMODULES предназначены для LiveCD/LiveFlash

 Не стоит бояться такого разнообразия, для большинства задач достаточно THE_*.

--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -11,9 +11,15 @@ distro/.desktop-network: distro/.desktop-mini +vmguest
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))

+distro/.desktop-extra:
+	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
+
 distro/tde: distro/.desktop-mini +tde
 	@$(call set,KFLAVOURS,led-ws)

+distro/kde-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde
+	@$(call set,KFLAVOURS,std-def)
+
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -8,22 +8,24 @@ distro/syslinux: distro/.init \

 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
 distro/.live-desktop: distro/.base +live use/plymouth/live; @:
+distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:

 distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
 	use/syslinux/timeout/1 use/cleanup +power
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')

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

 distro/live-install: distro/.live-base use/live/textinstall; @:
@@ -31,7 +33,7 @@ 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-tde: distro/.live-desktop-ru use/live/install +tde; @:

 distro/live-rescue: distro/live-icewm
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
@@ -56,15 +58,17 @@ 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 \
+distro/live-gnome: distro/.live-desktop-ru use/systemd use/live/nodm use/x11/3d-proprietary
+	@$(call add,LIVE_PACKAGES,gnome3-default)
+
+distro/live-cinnamon: distro/.live-desktop-ru use/live/autologin \
 	use/x11/cinnamon use/x11/3d-proprietary; @:

-distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free
+distro/live-mate: distro/.live-desktop-ru use/live/nodm use/x11/3d-free
 	@$(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
+distro/live-enlightenment: distro/.live-desktop-ru use/live/autologin use/x11/3d-free
 	@$(call add,LIVE_PACKAGES,enlightenment)

 distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
--- a/conf.d/simply.mk
+++ b/conf.d/simply.mk
@@ -7,5 +7,6 @@ distro/live-simply: distro/.livecd-install use/slinux/full

 distro/simply: distro/.installer use/slinux/full
 	@$(call set,INSTALLER,simply-linux)
+	@$(call add,INSTALL2_PACKAGES,sysvinit)

 endif
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -19,6 +19,12 @@ distro/live-gns3: distro/live-icewm
 	@$(call add,LIVE_LISTS,gns3)
 	@$(call add,LIVE_KMODULES,kvm virtualbox)

+distro/live-efi: distro/live-install use/efi
+	@$(call set,KFLAVOURS,un-def)	### CONFIG_FB_EFI
+
+distro/icewm-efi: distro/icewm use/efi/debug use/firmware
+	@$(call add,INSTALL2_PACKAGES,strace)
+
 distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)

@@ -30,9 +36,11 @@ 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-luks: distro/icewm use/luks; @:
 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; @:
+distro/server-efi: distro/server-mini use/efi/debug; @:

 endif # IMAGE_CLASS: distro

--- a/doc/assumptions.txt
+++ b/doc/assumptions.txt
@@ -1,7 +1,7 @@
 == Предположения фрагментов кода об окружении ==

 NB: пути приводятся от верхнего уровня; проект в целом предполагает
-ALT Linux 6.0+ и GNU make 3.81 (на которых и разрабатывается),
+ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатывается),
 но может быть портирован вместе с mkimage.

 * lib/report.mk
--- a/features.in/branding/README
+++ b/features.in/branding/README
@@ -10,17 +10,17 @@
 Назначение и возможные значения (если требуются):

 - STAGE1_BRANDING
-  + относится к загрузке со сгенерированного образа (например, ISO)
-  + bootloader bootsplash (при старте)
+  * относится к загрузке со сгенерированного образа (например, ISO)
+  * bootloader bootsplash (при старте)

 - STAGE2_BRANDING
-  + общая часть для всех вариантов stage2
-  + bootsplash (при выключении)
+  * общая часть для всех вариантов stage2
+  * bootsplash (при выключении)

 - INSTALL2_BRANDING
-  + специфические пакеты брендирования инсталятора
-  + notes slideshow
+  * специфические пакеты брендирования инсталятора
+  * notes slideshow

 - THE_BRANDING
-  + общий список для использования в установленной системе и LiveCD
-  + alterator bootsplash graphics indexhtml notes slideshow
+  * общий список для использования в установленной системе и LiveCD
+  * alterator bootsplash graphics indexhtml notes slideshow
--- a/features.in/build-ve/image-scripts.d/08resolv
+++ b/features.in/build-ve/image-scripts.d/08resolv
@@ -0,0 +1,9 @@
+#!/bin/sh
+# by default hasher copy resolv.conf and /etc/hosts from host system
+# we need to change it to useful defaults
+
+echo 'nameserver 8.8.8.8' > /etc/resolv.conf
+echo 'nameserver 8.8.4.4' > /etc/resolv.conf
+#echo 'nameserver 2001:4860:4860::8888' > /etc/resolv.conf
+#echo 'nameserver 2001:4860:4860::8844' > /etc/resolv.conf
+echo '127.0.0.1 localhost.localdomain localhost' > /etc/hosts
--- a/features.in/efi/README
+++ b/features.in/efi/README
@@ -0,0 +1,6 @@
+Фича добавляет в образы необходимое для поддержки EFI/UEFI.
+
+См. тж.:
+* http://www.altlinux.org/UEFI
+* http://www.rodsbooks.com/efi-bootloaders/
+* https://bugzilla.altlinux.org/showdependencytree.cgi?id=27804
--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -0,0 +1,10 @@
+use/efi:
+	@$(call add_feature)
+	@$(call set,MKI_VER_MINIMAL,0.2.5)	# see #28219
+	@$(call add,THE_LISTS,$(call tags,base efi))
+	@$(call add,INSTALL2_PACKAGES,dosfstools)
+	@$(call set,EFI_BOOTLOADER,elilo)	### no choice right now
+
+use/efi/debug: use/efi
+	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
+	@$(call set,KFLAVOURS,led-ws)
--- a/features.in/efi/stage2/image-scripts.d/50-efi
+++ b/features.in/efi/stage2/image-scripts.d/50-efi
@@ -0,0 +1,4 @@
+#!/bin/sh
+# see also https://bugzilla.altlinux.org/27970
+
+echo efivars >> /etc/modules
--- a/features.in/install2/install2/image-scripts.d/90+install2+cleanup+bloat
+++ b/features.in/install2/install2/image-scripts.d/90+install2+cleanup+bloat
@@ -19,11 +19,14 @@ rm -rf /usr/share/awk/
 ### TODO: x11vnc, xorg-xvfb: fix installer-common-stage2
 rpmquery -a cpp\* gcc\* perl-base file ipv6calc \
 	bind-utils libbind \
-	gnupg libgcrypt libgnutls\* libgpg-error libsoup\* \
+	libsoup\* \
 	libGL glxinfo xdriinfo \
 	make make-initrd x11vnc xorg-xvfb \
 | xargs -r rpmi -e --nodeps --

+### TODO: unless LUKS luks feature is requested we can also drop
+###       gnupg libgcrypt libgnutls\* libgpg-error
+
 rpmquery -a bind-utils libbind \
 | xargs -r rpmi -e --

--- a/features.in/install2/install2/image-scripts.d/90+install2+cleanup+drivers
+++ b/features.in/install2/install2/image-scripts.d/90+install2+cleanup+drivers
@@ -17,7 +17,7 @@ rm -rf /lib/modules/*/kernel/drivers/char/{ipmi,hw_random,mwave,tpm}
 rm -rf /lib/modules/*/kernel/drivers/char/watchdog
 rm -rf /lib/modules/*/kernel/drivers/cpufreq
 rm -rf /lib/modules/*/kernel/drivers/edac
-rm -rf /lib/modules/*/kernel/drivers/firmware	###
+#rm -rf /lib/modules/*/kernel/drivers/firmware	### EFI
 rm -rf /lib/modules/*/kernel/drivers/gpio
 rm -rf /lib/modules/*/kernel/drivers/hwmon
 rm -rf /lib/modules/*/kernel/drivers/infiniband	###
--- a/features.in/install2/tagged/image-scripts.d/.gitignore
+++ b/features.in/install2/tagged/image-scripts.d/.gitignore
--- a/features.in/live/live/image-scripts.d/03services
+++ b/features.in/live/live/image-scripts.d/03services
@@ -1,9 +1,28 @@
 #!/bin/sh
 # see also m-p-d::profiles/live/image-scripts.d/init3-services

-[ -x /sbin/chkconfig ] || exit 0
+[ -x /sbin/chkconfig -o -x /bin/systemctl ] || exit 0
+
+switch() {
+	case "$2" in
+	on)
+		cc=on; sc=enable;;
+	off)
+		cc=off; sc=disable;;
+	esac
+
+	{
+		[ ! -x /bin/systemctl ] || /bin/systemctl $sc $1.service
+		[ ! -x /sbin/chkconfig ] || /sbin/chkconfig $1 $cc
+	} 2>/dev/null
+}

 ENABLE="
+dm
+gdm
+kdm
+wdm
+prefdm
 alteratord
 livecd-evms
 livecd-fstab
@@ -37,6 +56,6 @@ 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
+for i in $ENABLE;  do switch $i on;  done
+for i in $DISABLE; do switch $i off; done
 :
--- a/features.in/luks/README
+++ b/features.in/luks/README
@@ -0,0 +1,2 @@
+Эта секретная фича добавляет в инсталяторы поддержку
+шифрования файловых систем с помощью LUKS при их создании.
--- a/features.in/luks/config.mk
+++ b/features.in/luks/config.mk
@@ -0,0 +1,2 @@
+use/luks:
+	@$(call add,BASE_PACKAGES,make-initrd-luks cryptsetup)
--- a/features.in/luks/stage1/scripts.d/11-initrd-luks
+++ b/features.in/luks/stage1/scripts.d/11-initrd-luks
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo 'FEATURES += luks' >> /etc/initrd.mk
--- a/features.in/pack/config.mk
+++ b/features.in/pack/config.mk
@@ -10,13 +10,13 @@ use/pack:
 # for direct bootable usbflash imaging
 use/pack/iso: use/pack boot/isolinux $(ISOHYBRID:%=use/isohybrid)
 ifeq (distro,$(IMAGE_CLASS))
-	@$(call set,IMAGE_PACKTYPE,isoboot)
+	@$(call set,IMAGE_PACKTYPE,boot)
 else
 	@$(call set,IMAGE_PACKTYPE,isodata)
 endif

 # virtual environments
-VE_ARCHIVES := tar cpio
+VE_ARCHIVES := tar cpio ubifs
 VE_COMPRESSORS := gz xz# there's no sense in bzip2 by now
 VE_ZIPS := $(call addsuffices, \
 		$(addprefix .,$(VE_COMPRESSORS)), \
--- a/features.in/stage2/stage1/scripts.d/03-test-kernel
+++ b/features.in/stage2/stage1/scripts.d/03-test-kernel
@@ -7,7 +7,7 @@ GZ_OPTS="-comp gzip -noI"
 XZ_OPTS="-comp xz"
 LZO_OPTS="-comp lzo -noI"

-verbose() { [ -n "$GLOBAL_VERBOSE" ] && echo "** $@" >&2; }
+verbose() { [ -z "$GLOBAL_VERBOSE" ] || echo "** $@" >&2; }
 fatal() { echo "** error: $@" >&2; exit 1; }

 configured()
--- a/features.in/stage2/stage1/scripts.d/80-make-initfs
+++ b/features.in/stage2/stage1/scripts.d/80-make-initfs
@@ -23,13 +23,10 @@ fi

 if make-initrd $MAKE_INITRD_OPTS; then
 	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
+	mkdir -p "$pdir"
+	gzip < /boot/initrd-$kver.img > "$pdir"/initfs
 else
+	verbose "make-initrd failed"
 	exit 1
 fi

--- a/features.in/syslinux/cfg.in/README
+++ b/features.in/syslinux/cfg.in/README
@@ -7,9 +7,9 @@
 с тем, чтобы легче было отсматривать и сводить:

 - параметры append перечисляются в следующем порядке:
-  + initrd=...
-  + по алфавиту те, что без аргументов
-  + по алфавиту те, что имеют аргументы
+  * initrd=...
+  * по алфавиту те, что без аргументов
+  * по алфавиту те, что имеют аргументы
 - в конце файла пустая строка

 Для проверки уникальности клавиатурных сокращений
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -1,6 +1,7 @@
 +icewm: use/x11/icewm; @:
 +razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
 +tde: use/x11/tde use/x11/kdm; @:
+kde: use/x11/kde use/x11/kdm4; @:

 use/x11/xorg:
 	@$(call add_feature)
@@ -36,6 +37,9 @@ use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5
 use/x11/kdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,kdebase-kdm<4)

+use/x11/kdm4: use/x11/runlevel5
+	@$(call add,THE_PACKAGES,kde4base-workspace-kdm)
+
 use/x11/gdm2.20: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,gdm2.20)

@@ -48,6 +52,9 @@ use/x11/razorqt: use/x11/xorg
 use/x11/tde: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,tde desktop))

+use/x11/kde: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,kde desktop))
+
 use/x11/xfce: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,xfce desktop))

--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -5,8 +5,10 @@ CURRENT_LINK := mkimage-profiles
 OUT_LINK := out

 # there were mkimage fixes induced by mkimage-profile development
+# - minimal version is bumped for critical bugfixes/features
+# - optimal one relates to the less universally relevant bits
 MKI_VER_MINIMAL = 0.1.7
-MKI_VER_OPTIMAL = 0.2.0
+MKI_VER_OPTIMAL = 0.2.5

 include distcfg.mk
 include functions.mk
--- a/lib/build.mk
+++ b/lib/build.mk
@@ -21,10 +21,12 @@ LOWSPACE = 1024
 START += time -f "%E %PCPU %Mk"

 # /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
+# armh (armv7l) doesn't have any but should cope with qemu-arm.static;
 # also check whether non-x86 build is running native
+EARCH := $(subst armh,arm,$(ARCH))
 ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
-ifeq (,$(findstring $(ARCH),$(shell uname -m)))
-export GLOBAL_HSH_USE_QEMU=$(ARCH)
+ifeq (,$(findstring $(EARCH),$(shell uname -m)))
+export GLOBAL_HSH_USE_QEMU=$(EARCH)
 endif
 else
 START += $(ARCH)
--- a/lib/log.mk
+++ b/lib/log.mk
@@ -10,7 +10,7 @@ endif
 HSH_VER_OPTIMAL = 1.3.22
 HSH_VERSION := $(shell hsh -V | sed -n 's/^.* version \([0-9.]\+\).*$$/\1/p')

-ifeq (-,$(shell rpmvercmp $(HSH_VERSION) $(HSH_VER_OPTIMAL) | tr -d [0-9]))
+ifeq (-,$(shell rpmvercmp $(HSH_VERSION) $(HSH_VER_OPTIMAL) | tr -d '[0-9]'))
 $(info warning: hasher-$(HSH_VERSION) is suboptimal, consider upgrading)
 endif

--- a/main.mk
+++ b/main.mk
@@ -34,7 +34,8 @@ include $(sort $(wildcard lib/*.mk))
 include conf.d/*.mk
 include features.in/*/config.mk

-# starts to look copypastey
+# FIXME: this is buggy since *.mk can expose parts conditionally
+#        (e.g. test.mk does DEBUG-only bits) and these will fail
 DISTRO_TARGETS := $(shell sed -n 's,^\(distro/[^:.]\+\):.*$$,\1,p' \
 		lib/distro.mk $(wildcard conf.d/*.mk) | sort -u)
 VE_TARGETS := $(shell sed -n 's,^\(ve/[^:.]\+\):.*$$,\1,p' \
--- a/pkg.in/lists/tagged/base+efi
+++ b/pkg.in/lists/tagged/base+efi
@@ -0,0 +1,7 @@
+gdisk
+parted
+dosfstools
+grub2-efi
+elilo
+efibootmgr
+installer-feature-efi-stage3
--- a/pkg.in/lists/tagged/base+extra
+++ b/pkg.in/lists/tagged/base+extra
@@ -0,0 +1,28 @@
+# Disk utils
+parted
+quota
+time
+acl
+
+# Applications/Editors
+vim-console
+
+# Filesystem utils
+dosfstools
+ntfs-3g
+reiserfsprogs
+cifs-utils
+extundelete
+
+# Applications/Networking
+lftp
+rsync
+tcpdump
+telnet
+
+# Applications/Shells
+bc
+mc
+
+# Development/Debuggers
+strace
--- a/pkg.in/lists/tagged/desktop+kde
+++ b/pkg.in/lists/tagged/desktop+kde
@@ -0,0 +1,15 @@
+kde4base-workspace-core
+kde4base-dolphin
+kde4-ksnapshot
+kde4-konsole
+kde4-gwenview
+kde4utils-ark
+kde4utils-kcalc
+kde4-kbluetooth
+kde4-kolourpaint
+kde4-okular
+kde4-i18n-ru
+kde4base-plasma-applets
+plasma-applet-showdesktop
+kde4multimedia-kmix
+ConsoleKit
--- a/pkg.in/lists/tagged/desktop+kde+extra
+++ b/pkg.in/lists/tagged/desktop+kde+extra
@@ -0,0 +1,5 @@
+kde4-amarok
+kde4-krusader
+kde4-digikam
+kde4-digikam-image-plugins
+smplayer
--- a/pkg.in/lists/tagged/live+builder
+++ b/pkg.in/lists/tagged/live+builder
@@ -0,0 +1,3 @@
+livecd-tmpfs
+livecd-online-repo
+mkimage-profiles
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -29,6 +29,7 @@ partimage
 gdisk
 cgdisk
 fixparts
+whdd

 # Applications
 binutils
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -14,9 +14,6 @@ endif
 GLOBAL_BOOTLOADER := $(BOOTLOADER)

 MKI_PACK_RESULTS = data
-PROPAGATOR_VERSION = ALT Linux
-PROPAGATOR_MAR_MODULES = ./modules
-PROPAGATOR_INITFS = ./initfs
 COPY_TREE = ./files

 include $(MKIMAGE_PREFIX)/targets.mk
@@ -29,6 +26,9 @@ STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))

 # propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
 ifneq "$(STAGE1_KFLAVOUR)" ""
+PROPAGATOR_VERSION = ALT Linux
+PROPAGATOR_MAR_MODULES = ./modules
+PROPAGATOR_INITFS = ./initfs
 BUILD_PROPAGATOR = build-propagator
 INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR)
 CHROOT_PACKAGES_REGEXP := $(call kpackages, \
--- a/sub.in/stage1/modules
+++ b/sub.in/stage1/modules
@@ -8,6 +8,8 @@ kernel/drivers/rtc
 kernel/drivers/scsi
 kernel/drivers/usb/host
 kernel/drivers/usb/storage
+kernel/drivers/virtio
+kernel/lib
 3c501.ko
 3c503.ko
 3c505.ko
Author	SHA1	Message	Date
Michael Shigorin	70d1761780	0.9.2-alt1 - enhanced uefi support	2012-12-17 17:56:45 +04:00
Michael Shigorin	537374aa4a	luks: drop obsolete comment That FIXME has been FIXED already.	2012-12-17 15:22:44 +04:00
Michael Shigorin	393ef79235	stage1: added virtio drivers I will test more in kvm I will test more in kvm I will test more in kvm ...	2012-12-17 14:47:42 +04:00
Michael Shigorin	2e776a082f	initial server-efi.iso Intermediate one: build-propagator is run off stage1, no mkimage changes for that matter so far. This means that m-p still duplicates mki-pack-boot to some extent but the way to dedup this is still not clear enough...	2012-12-17 14:40:55 +04:00
Michael Shigorin	5a61e2d4cc	efi: employ mkimage The initial approach required some quite involved postprocessing as described in http://www.altlinux.org/UEFI#HOWTO; after having ironed out the kinks so that initial EFI support could be merged into mkimage proper we're better off just using it, eh?	2012-12-17 14:40:55 +04:00
Michael Shigorin	8d6f58fcd1	simply: fix installer boot (go sysvinit) A next part in systemd conspiracy practice: this time it tried to take over the installer but was caught on site!	2012-12-17 14:40:45 +04:00
Denis Smirnov	106137afff	fix resolv.conf when build VE	2012-12-17 11:37:32 +04:00
Michael Shigorin	4d62c4ca24	gear-store-tags	2012-12-03 17:27:13 +02:00
Michael Shigorin	919b09313f	0.9.1-alt1 - initial kde4 support	2012-12-03 17:26:55 +02:00
Evgeny Sinelnikov	e00b52af47	Update kde minimal profile as distro/kde-lite	2012-12-03 17:19:35 +02:00
Evgeny Sinelnikov	91ebe4295b	Add kde minimal desktop support	2012-12-03 17:19:35 +02:00
Evgeny Sinelnikov	2776acc2a8	Add experimental desktop+kde	2012-12-03 17:19:35 +02:00
Evgeny Sinelnikov	36b36faf55	lib/log.mk: fix hasher check	2012-12-03 17:19:35 +02:00
Michael Shigorin	8d8b23e685	rescue+extra pkglist: added whdd As was proposed by Alexey Varakin in community@, whdd was built for ALT Linux by drool@ and pauli@ with some help by torabora@ and mithraen@; looks like it's a worthy addition to the rescue kit.	2012-12-03 17:18:27 +02:00
Michael Shigorin	40adf4ccf3	main.mk: escalate the comment to a warning The problem manifests itself when the naive parser ignores any conditions that might have been set in the makefiles included with subsequent attempt to run a target which has its actual rule defined within e.g. "ifdef DEBUG" clause (as is the case for conf.d/test.mk); that will fail with no proper diagnostics currently. Maybe this would be of some use (but then again maybe not): http://stackoverflow.com/questions/3063507/list-goals-targets-in-gnu-make	2012-12-03 17:18:27 +02:00
Michael Shigorin	e9f60f007c	03-test-kernel: silliest mistake II The previous part was fixed and discussed in commit c30490e2e884f8655a2704fa6a84e60b13876874; so much for a deduplication effort... This would result in almost immediate make[1]: *** [profile/populate] Error 2 as well.	2012-12-03 17:18:27 +02:00
Michael Shigorin	2e1e4d6f09	assumptions.txt: ported to make-3.82 already That is, p6/t6 continue to use 3.81 (while providing 3.82 alongside with it), and Sisyphus has moved to 3.82 before p7/t7. We support both versions by now.	2012-12-03 17:18:27 +02:00
Michael Shigorin	4df837b9d3	live.mk: split live-builder into proper and -mini While ildar@ has some reason for the slimmer image the somewhat standalone one is documented in examples for offline use, ruining it in-place is not an option. Let's just do a split (and lose a target-specific variable example in favour of a commodity pkglist by the way; oh well).	2012-12-03 17:18:26 +02:00
Ildar Mulyukov	e87399e1a6	live-builder: cut RPMs aka MAIN_PACKAGES from the image a live-builder appliance is (or may be) usually used for building software with many dependencies, hence needing access to external resources, e.g. apt repos with lib${NAME}-devel packages. This commit cuts RPM packages from the live-builder LiveCD.	2012-11-23 13:10:01 +06:00
Ildar Mulyukov	934a722bdd	documentation: fix lists and blocks in QUICKSTART	2012-11-22 11:14:02 +06:00
Ildar Mulyukov	4302943861	documentation: fix bulleted lists marked with '+'	2012-11-22 10:56:57 +06:00
Michael Shigorin	20ad22e55b	gear-store-tags	2012-11-19 23:33:53 +02:00
Michael Shigorin	a5ec5f2577	0.9.0-alt1 - initial uefi, luks, armh support - enhanced arm, gnome3/systemd, vm support	2012-11-19 23:32:45 +02:00
Michael Shigorin	5e9ba6fb1a	tar2vm: reworked to use sfdisk The issue (#28002) resulting in vm image build error reading Syntax error at or above line 5 in file '/etc/lilo-loop.conf' was caused by fdisk-2.22 changing its "-l" option output format to drop the very mention of the long irrelevant crap named "CHS". The problem is, however, that we still need that crap to piggyback a loop device's fake geometry to lilo while installing it there. Reported by icesik@.	2012-11-19 23:26:51 +02:00
Michael Shigorin	e179176b28	initial armh support Somewhat kludgy unfortunately and might need even more tweaking, I have only armv7l board handy at the moment to verify that the transformation is going to work. QEMU is bailing out here and now ("Exec format error"). Example sources.list.sisyphus.armh of the season: rpm http://ftp.altlinux.ru/pub/people/asdus/sisyphus armh classic rpm http://ftp.altlinux.ru/pub/people/asdus/sisyphus noarch classic	2012-11-19 23:26:51 +02:00
Andrey Liakhovets	edd959e182	Enable ubifs packing of result. An example for sam9x25-ek: make \ PACK_UBI_MIN_IO_SIZE=2KiB \ PACK_UBIFS_OPTS="-e 124KiB -c 1984" \ PACK_UBI_OPTS="-p 128KiB -s 2048" \ PACK_UBI_VOL_TYPE=dynamic \ PACK_UBI_VOL_NAME=rootfs \ PACK_UBI_VOL_FLAGS=autoresize \ HSH_EXCLUDE_DOCS=1 ARCH=arm APTCONF=apt.conf.sisyphus.arm ve/generic.ubifs https://bugzilla.altlinux.org/show_bug.cgi?id=27994#c0	2012-11-19 23:26:51 +02:00
Michael Shigorin	09cb29cb36	test.mk: initial desktop-luks It's beta too but holding off the feature seems counterproductive.	2012-11-19 23:26:51 +02:00
Michael Shigorin	99a25867b2	initial luks feature Based on timonbl4@'s advice; might need some bleeding edge packages right now, feel free to ask (everything should be in place by p7/branch though).	2012-11-19 23:26:51 +02:00
Timur Aitov	6ba5e45fbe	don't cleanup crypto libraries (for LUKS)	2012-11-19 23:26:51 +02:00
Michael Shigorin	bd427df77a	stage2: updated 80-make-initfs propagator-20121109-alt1 obsoleted initfs (and dropped mkinitfs script altogether); that was taken into account in both make-initrd-propagator and mkimage-profiles-desktop but not in mkimage proper, see also discussion in #27976.	2012-11-19 23:26:51 +02:00
Michael Shigorin	06b9785816	install2: drop empty tagged/image-scripts.d/ Tagged scripts got heavily postponed for the lack of practicability so far.	2012-11-19 23:26:51 +02:00
Michael Shigorin	595dfc2d02	test.mk: initial live-efi, icewm-efi Both do require postprocessing (see http://www.altlinux.org/UEFI) until mkimage receives xorriso support and efiboot.img is passed down there somehow, but it's beta than nothin' so far.	2012-11-19 23:26:51 +02:00
Michael Shigorin	653b8e1df8	initial EFI support EFI/UEFI is mostly about partitioning and bootloader setup, at least from a distribution's point of view; so the appropriate tools should be handy and firmware interface module should not be exterminated from installer images but get autoloaded instead. Please note that while there exists 32-bit x86 EFI we don't bother with it at the time being: it's relevant to some irrelevant Xeon systems as well as for the older Intel Macs (<2008) that are long out of fashion anyways. That is, initially we deal with x86_64 EFI only.	2012-11-19 23:26:51 +02:00
Michael Shigorin	12340b3165	initial live-gnome Thanks ildar@ for both the request and clarifications regarding the build of the minimalistic GNOME3 LiveCD. NB: current GNOME3 is hooked on systemd.	2012-11-19 23:26:50 +02:00
Michael Shigorin	165059b1bd	live.mk: use/live/ru related refactoring Introduced distro/.live-desktop-ru as a shortcut for distro/.live-desktop use/live/ru which occurs several times already (and the counter will increase right now).	2012-11-19 23:26:50 +02:00
Michael Shigorin	0efba3e42c	live: support systemctl to enable dm systemd is a tricky beast: getting it to actually launch gdm required considerable effort on the part of stupid myself. The relevant links: https://wiki.archlinux.org/index.php/Systemd#Running_DEs_under_systemd * http://unix.stackexchange.com/a/35626/15296 Still looks pretty dirty, and there's some duplication with a hook in features.in/slinux as well.	2012-11-19 23:26:50 +02:00
Michael Shigorin	6a6a0e1c01	live: enable dm service if present This was requested by aris@ for live-gnome.iso but is so far reasonable enough to do by default: the case of a LiveCD including X and a display manager but willing to get on with startx by default is rather nonexistant by now.	2012-11-19 23:26:50 +02:00
Michael Shigorin	6aa5402d8b	gear-store-tags	2012-11-12 00:10:45 +04:00