0.9.3-alt1

- regular images
initial regular images
2012-12-31 21:41:19 +02:00 · 2012-12-31 21:39:31 +02:00 · 2012-12-31 21:39:31 +02:00 · 2012-12-31 21:36:04 +02:00 · 2012-12-31 22:16:57 +04:00 · 2012-12-31 18:10:12 +04:00
57 changed files with 428 additions and 111 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.6
+Version: 0.9.3
 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,22 @@ cp -a * %buildroot%mpdir
 %doc %docs/*

 %changelog
+* Mon Dec 31 2012 Michael Shigorin <mike@altlinux.org> 0.9.3-alt1
+- regular images
+
+* 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--
+
 * Mon Nov 05 2012 Michael Shigorin <mike@altlinux.org> 0.8.6-alt1
 - docs subpackage (HTML/PDF book)

--- a/.gear/tags/88fce54e081dd8b4d8664f30193e8ce371d172b2
+++ b/.gear/tags/88fce54e081dd8b4d8664f30193e8ce371d172b2
@@ -1,6 +0,0 @@
-object 91a4cc986fcc061bed80a3c8f7cee114b8986db1
-type commit
-tag v0.8.5
-tagger Michael Shigorin <mike@altlinux.org> 1351541298 +0200
-
-diffable logs
--- a/.gear/tags/f44512183492762791baf8f4e5bdca5f18dc6017
+++ b/.gear/tags/f44512183492762791baf8f4e5bdca5f18dc6017
@@ -0,0 +1,6 @@
+object 70d17617801d6567ed3c5b5f41f05efa123ded57
+type commit
+tag v0.9.2
+tagger Michael Shigorin <mike@altlinux.org> 1355752625 +0400
+
+uefi++
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-88fce54e081dd8b4d8664f30193e8ce371d172b2 v0.8.5
+f44512183492762791baf8f4e5bdca5f18dc6017 v0.9.2
--- 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/tags2lists
+++ b/bin/tags2lists
@@ -30,4 +30,4 @@ transformed="$(sed \
 	-e "s, *) *, ) ,g")"

 [ "$DEBUG" = 2 ] && echo "`basename $0`: transformed = \"$transformed\"" >&2
-[ -z "$transformed" ] || find $transformed | sed 's,^\./,,'
+[ -z "$transformed" ] || find $transformed | sed 's,^\./,,' | grep -v '\.sw.$'
--- 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
@@ -2,26 +2,30 @@
 ifeq (distro,$(IMAGE_CLASS))

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

 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; @:
@@ -29,9 +33,9 @@ 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
+distro/live-rescue: distro/live-icewm use/efi
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
 	@$(call add,LIVE_LISTS,openssh \
 		$(call tags,(base || extra) && (archive || rescue || network)))
@@ -54,16 +58,18 @@ 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
-	@$(call add,LIVE_PACKAGES,enlightenment)
+distro/live-e17: distro/.live-desktop-ru use/live/autologin \
+	use/x11/e17 use/x11/gdm2.20; @:

 distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
 	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -0,0 +1,37 @@
+# regular build/usage images
+ifeq (distro,$(IMAGE_CLASS))
+
+# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
+distro/.regular-desktop: distro/.base +live use/live/ru \
+	use/live/install use/live/repo use/x11/3d-free use/systemd \
+	use/efi use/luks +vmguest use/memtest \
+	use/branding use/syslinux/ui/gfxboot
+	@$(call add,LIVE_PACKAGES,openssh strace alterator-standalone)
+	@$(call add,LIVE_PACKAGES,cpufreq-simple)
+	@$(call add,LIVE_PACKAGES,livecd-online-repo apt-repo)
+	@$(call add,LIVE_PACKAGES,xdg-user-dirs)
+	@$(call add,LIVE_PACKAGES,synaptic-usermode)
+	@$(call add,LIVE_PACKAGES,firefox-ru)
+	@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
+	@$(call try,SAVE_PROFILE,yes)
+
+distro/.regular-gtk: distro/.regular-desktop use/x11/gdm2.20; @:
+
+distro/regular-icewm: distro/.regular-gtk +icewm; @:
+distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
+distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
+
+distro/regular-mate: distro/.regular-gtk
+	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
+
+distro/regular-e17: distro/.regular-gtk use/x11/e17; @:
+	@$(call add,LIVE_PACKAGES,xterm xorg-xnest)
+
+distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
+	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
+
+distro/regular-tde: distro/.regular-desktop +tde; @:
+distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4; @:
+distro/regular-razorqt: distro/.regular-desktop +razorqt; @:
+
+endif
--- 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
@@ -3,9 +3,6 @@ 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; @:

@@ -22,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)

@@ -33,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/README
+++ b/features.in/README
@@ -23,9 +23,14 @@
 построенных на одном базовом, можно воспользоваться подкаталогом
 с именем исходного базового субпрофиля (см. $src, $dst в Makefile).

+Рекомендуется давать несколько различающиеся имена скриптам,
+которые одна и та же фича может добавлять в различные стадии,
+чтобы они не выглядели одинаково в логе сборки.
+
 Наиболее востребованные цели можно снабжать "ярлычками" вроде
 "+icewm" с тем, чтобы сделать более краткими и выразительными
-использующие их правила.  Просьба не злоупотреблять количеством.
+использующие их правила.  Просьба не злоупотреблять количеством,
+такие имена предполагается показывать в интерфейсе к профилю.

 Каталог lib/ является специфическим для фич, определяющих
 построение конкретного вида образа -- см. build-*/.
--- 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,22 @@
+ifeq (x86_64,$(ARCH))
+
+EFI_LISTS := $(call tags,base efi)
+
+use/efi:
+	@$(call add_feature)
+	@$(call set,MKI_VER_MINIMAL,0.2.5)	# see #28219
+	@$(call add,THE_LISTS,$(EFI_LISTS))
+	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
+	@$(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)
+
+else
+
+# ignore on an unsupported target arch but make it hybrid at least
+use/efi use/efi/debug: use/isohybrid
+
+endif
--- 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/config.mk
+++ b/features.in/live/config.mk
@@ -21,9 +21,15 @@ use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_PACKAGES,pciutils)
 	@$(call add,SYSLINUX_CFG,localboot)

+# preconfigure apt for both live and installed-from-live systems
+use/live/repo:
+	@$(call add,LIVE_PACKAGES,livecd-online-repo)
+	@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
+
 # alterator-based permanent installation
 use/live/install: use/metadata use/syslinux/localboot.cfg
 	@$(call add,LIVE_PACKAGES,livecd-install)
+	@$(call add,LIVE_PACKAGES,livecd-installer-features)

 # text-based installation script
 use/live/textinstall: use/syslinux/localboot.cfg
--- a/features.in/live/live/image-scripts.d/03-services
+++ b/features.in/live/live/image-scripts.d/03-services
@@ -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/live/live/image-scripts.d/20-locale
+++ b/features.in/live/live/image-scripts.d/20-locale
@@ -1,8 +1,10 @@
 #!/bin/sh -efu
 # if no means for locale setup are employed,
-# it should still be somewhat reasonable
+# it should still be at least marginally reasonable
 # NB: keyboard layout not included!

+if [ -s /etc/sysconfig/i18n ]; then exit 0; fi
+
 mkdir -p /etc/sysconfig
 cat >> /etc/sysconfig/i18n << _EOF_
 # mkimage-profiles live 20-locale hook
--- a/features.in/live/live/image-scripts.d/35-xdg-user-dirs
+++ b/features.in/live/live/image-scripts.d/35-xdg-user-dirs
@@ -2,5 +2,11 @@
 # Turn on xdg-user-dirs.
 # NB: not yet available on t6/p6 hence the warning

-control xdg-user-dirs enabled ||
+. shell-config
+
+if control xdg-user-dirs enabled; then
+	shell_config_set /etc/xdg/user-dirs.defaults MOVIES 'Documents/Videos'
+	shell_config_set /etc/xdg/user-dirs.defaults PHOTOS 'Documents/Pictures'
+else
 	echo "** warning: control xdg-user-dirs failed" >&2
+fi
--- a/features.in/live/live/image-scripts.d/40-autologin
+++ b/features.in/live/live/image-scripts.d/40-autologin
@@ -48,15 +48,20 @@ if [ -f "$GDM_CONF" ]; then
 	add_nopasswdlogin_group gdm ||:
 fi

-## kdm3 autologin
-# TODO: iterate over kdm{,4} if feasible
-KDMRC=/etc/X11/kdm/kdmrc
-if [ -f "$KDMRC" ]; then
+autologin_kdm() {
 	sed -i \
 		-e '/AutoLoginEnable/ s,^.*$,AutoLoginEnable=true,' \
 		-e '/AutoLoginUser/ s,^.*$,AutoLoginUser='$USER',' \
-		"$KDMRC"
-fi
+		"$1"
+}
+
+## kdm3 autologin
+KDMRC=/etc/X11/kdm/kdmrc
+if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi
+
+## kdm4 autologin
+KDMRC=/etc/X11/kdm4/kdmrc
+if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi

 ## nodm autologin (the last since the most intrusive)
 # FIXME nodm and xinitrc should be modified (also in p6)
--- 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,5 @@
+LUKS_LISTS := $(call tags,security luks)
+
+use/luks:
+	@$(call add,THE_LISTS,$(LUKS_LISTS))
+	@$(call add,RESCUE_LISTS,$(LUKS_LISTS))
--- 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
@@ -1,7 +1,7 @@
 #!/bin/sh -efux
 # NB: /etc/initrd.mk carefully prepared by earlier scripts

-verbose() { [ -n "$GLOBAL_VERBOSE" ] && echo "** 80-make-initfs: $@" >&2; }
+verbose() { [ -z "$GLOBAL_VERBOSE" ] || echo "** 80-make-initfs: $@" >&2; }

 kver="$(rpm -qa 'kernel-image*' \
 	    --qf '%{installtime} %{version}-%{name}-%{release}\n' \
@@ -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,8 +52,20 @@ 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/kde4: use/x11/xorg
+	@$(call add,THE_PACKAGES,kde4-default)
+
 use/x11/xfce: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,xfce desktop))

 use/x11/cinnamon: use/x11/xorg use/x11/drm
 	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
+
+use/x11/e17: use/x11/xorg use/x11/3d-free
+	@$(call add,THE_PACKAGES,e17-default)
+
+use/x11/lxde: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,lxde 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
@@ -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|not found)\.))$$
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$

 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
@@ -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/lib/profile.mk
+++ b/lib/profile.mk
@@ -56,7 +56,7 @@ profile/init: distclean
 		| tee $(BUILDDIR)/sources.list; \
 		echo; \
 	} $(LOG); \
-	if ! grep -q "[	 ]$(ARCH)[ 	]" $(BUILDDIR)/sources.list; then \
+	if ! grep -q "\<$(ARCH)\>" $(BUILDDIR)/sources.list; then \
 		echo -n "requested arch '$$ARCH' unavailable" >&2; \
 		if [ -z "$(APTCONF)" ]; then \
 			echo " (no APTCONF)"; \
--- 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/desktop+lxde
+++ b/pkg.in/lists/tagged/desktop+lxde
@@ -0,0 +1,22 @@
+openbox
+
+pcmanfm2
+
+lxde-common
+lxde-lxpanel
+lxde-lxsession
+lxde-lxsession-edit
+lxde-lxrandr
+lxde-lxtask
+lxde-lxshortcut
+lxde-lxappearance
+lxde-lxappearance-obconf
+
+menu-cache
+altlinux-freedesktop-menu-lxde
+
+# lxterminal is reportedly sub-par
+#lxde-lxterminal
+sakura
+
+tango-icon-theme
--- a/pkg.in/lists/tagged/desktop+lxde+extra
+++ b/pkg.in/lists/tagged/desktop+lxde+extra
@@ -0,0 +1,13 @@
+tango-icon-theme-extras
+
+leafpad
+galculator
+deadbeef
+mtpaint
+parcellite
+
+# gqview has thumbnails support, gpicview doesn't
+gqview
+
+# file-roller is recommended over xarchiver and not that fatty yet
+file-roller
--- a/pkg.in/lists/tagged/desktop+mate
+++ b/pkg.in/lists/tagged/desktop+mate
@@ -35,7 +35,7 @@ mate-power-manager
 mate-screensaver
 mate-terminal
 mate-utils
-mate-utils-mate-system-log
+#mate-utils-mate-system-log

 mate-file-manager-extensions
 mate-file-manager-image-converter
@@ -45,6 +45,5 @@ 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/desktop+nm
+++ b/pkg.in/lists/tagged/desktop+nm
@@ -0,0 +1,10 @@
+NetworkManager
+NetworkManager-vpnc
+NetworkManager-openvpn
+NetworkManager-pptp
+#NetworkManager-l2tp
+NetworkManager-openvpn-gnome
+NetworkManager-pptp-gnome
+NetworkManager-vpnc-gnome
+#NetworkManager-l2tp-gnome
+usb-modeswitch
--- a/pkg.in/lists/tagged/desktop+regular
+++ b/pkg.in/lists/tagged/desktop+regular
@@ -0,0 +1,23 @@
+synaptic
+
+alterator-browser-qt
+alterator-standalone
+
+alterator-root
+alterator-users
+alterator-auth
+alterator-nsswitch
+
+alterator-net-general
+alterator-net-pppoe
+alterator-net-pptp
+alterator-net-openvpn
+alterator-net-eth
+alterator-net-wifi
+
+alterator-net-shares
+alterator-proxy
+
+#alterator-datetime
+
+system-config-printer
--- a/pkg.in/lists/tagged/desktop+xfce
+++ b/pkg.in/lists/tagged/desktop+xfce
@@ -1,12 +1,2 @@
-xfce4-taskmanager
-xfce4-appfinder
-xfce4-settings
-xfcalendar
-xfce4-mixer
-gst-plugins-base
-xfce4-minimal
-xfce4-panel
-xfce4-icon-theme
-xfce4-session
-xfconf-utils
-Thunar
+xfce4-full
+gnome-icon-theme
--- 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/pkg.in/lists/tagged/security+luks
+++ b/pkg.in/lists/tagged/security+luks
@@ -0,0 +1,3 @@
+make-initrd-luks
+alterator-luks
+cryptsetup
--- 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
@@ -128,6 +130,9 @@ ne.ko
 netconsole.ko
 netwave_cs.ko
 nfs.ko
+nfsv2.ko
+nfsv3.ko
+nfsv4.ko
 ni52.ko
 ni65.ko
 nls_cp866.ko
Author	SHA1	Message	Date
Michael Shigorin	29388ef555	0.9.3-alt1 - regular images	2012-12-31 21:41:19 +02:00
Michael Shigorin	d0d76633bb	initial regular images See http://www.altlinux.org/Регулярные_сборки_образов for the idea behind this set of images; in short, it's not a bunch of polished end-user distros in a moment but rather to facilitate Sisyphus package base testing in as-is state during branch pre-release time.	2012-12-31 21:39:31 +02:00
Michael Shigorin	43c6fce4d1	live: fix 20-locale It shouldn't overwrite the pre-existing configuration but should fire if there's none.	2012-12-31 21:39:31 +02:00
Michael Shigorin	d94232fb87	live: updated 40-autologin to support kdm4 Was long overdue already but let's leave that in 2012. :)	2012-12-31 21:36:04 +02:00
Michael Shigorin	a1c0e82e31	live: add use/live/repo This one provides apt configuration for the LiveCD itself as well as extra hooks for a livecd-install made system.	2012-12-31 22:16:57 +04:00
Michael Shigorin	78326d393a	luks: it's not just BASE packages Installable live systems can have LUKS as well and it's welcome addition to rescue images too.	2012-12-31 18:10:12 +04:00
Michael Shigorin	bd606e6c60	build.mk: extended error regex yet again This time it's xorriso : FAILURE : -volid: Text too long (33 > 32) and todo-- as well.	2012-12-31 18:10:12 +04:00
Michael Shigorin	b9e93b699e	luks: added alterator-luks It's a separate installation step to set the LUKS password; see also #28200 for (terse) discussion and instructions on getting this actually working for a distro.	2012-12-31 18:10:12 +04:00
Michael Shigorin	9a86d7ec40	lists: initial desktop+nm For MATE regular images right now but should be more widely useful.	2012-12-31 18:10:12 +04:00
Michael Shigorin	2701a01f19	initial lxde pkglists Thanks gns@ for his help in figuring these out; some metapackage related optimization is still due.	2012-12-31 18:10:12 +04:00
Michael Shigorin	cf6411b3a1	desktop+xfce: refactor using metapackages These are out there in Sisyphus and should be used instead of copious lines in a package list. Thanks sem@ for proposing gnome-icon-theme to supplement the lack of icons in the default theme; note that tango set doesn't quite cut it, even with extras. Thunar -> thunar; xfcalendar -> orage	2012-12-31 18:10:12 +04:00
Michael Shigorin	cd9303e7b1	live: xdg-user-dirs tweak Borrowed from m-p-d's init-xdg-user-dirs, of course.	2012-12-26 18:52:33 +02:00
Michael Shigorin	06c62ae440	live: mv 03services 03-services Slowly fixing up the discrepancies...	2012-12-26 18:52:33 +02:00
Michael Shigorin	874c078eea	x11: added use/x11/kde4 There's use/x11/kde already but that serves somewhat different purpose as of today; the naming issue (kde vs kde4) was tersely discussed with sin@ at the time of the merge of his KDE4 image related bits and it's still not that clear. Let's try this way and see if existing images would be ported to use/x11/kde4.	2012-12-26 18:15:33 +04:00
Michael Shigorin	e7a4b39083	implement and use/x11/e17 This marks 0.17.0 hitting Sisyphus to much delight.	2012-12-26 18:15:33 +04:00
Michael Shigorin	d94ecb94d1	desktop+mate: fix build with 1.5 A few things have changed...	2012-12-26 18:15:33 +04:00
Michael Shigorin	3ae69fa5dc	live.mk: live-rescue += use/efi The whole live-rescue needs a massive facelift regarding applications included and user experience achieved (remember that folks are going to be stressed enough already with data lost or system(s) not booting, and probably offline as well); but at least it's UEFI bootable now.	2012-12-26 18:03:27 +04:00
Michael Shigorin	cd0db8d363	efi: handle rescue as well The rescue feature intentionally doesn't pick up THE_PACKAGES and THE_LISTS into stage2, so add EFI ones explicitly.	2012-12-26 18:02:11 +04:00
Michael Shigorin	162a824009	live.mk: rescue += EFI It was long overdue since (U)EFI support for live images has been there for some six weeks or so already.	2012-12-26 17:15:59 +04:00
Michael Shigorin	bad7fb53ca	tags2lists: filter out vim swap files The (funny but somewhat confusing) problem manifests itself as E: Couldn't find package Binary during a build run in the profile where a tagged packagelist referenced by a specific target being built is open with vim (which results in .FILE.sw? temporary file lying aside).	2012-12-26 17:15:59 +04:00
Michael Shigorin	d045fe49e5	features.in: extended README a bit The script hook naming advice and "+name" puropose explanation seem to have been missing.	2012-12-26 17:15:59 +04:00
Michael Shigorin	b6eb7cb732	efi: skip on unsupported target architectures There's a possibility to run into IA32 EFI but that's rather uninteresting hardware (ancient Xeon servers and <s>outdated</s> early Intel Mac laptops). Just drop it on the floor. As x86_64 UEFI support would result in "2D hybrid(r)(tm)" image which boots with all combinations of BIOS/UEFI by CD\|DVD/Flash (or at least should boot), some downgrace seems due: use/efi will turn use/isohybrid on non-x86_64 -- which will require further tweaks on PPC/ARM some day.	2012-12-26 17:07:19 +04:00
Michael Shigorin	5da4b440be	gear-store-tags	2012-12-17 17:57:11 +04:00
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
Michael Shigorin	a1119b74fe	0.8.7-alt1 - regressions--	2012-11-12 00:01:43 +04:00
Michael Shigorin	e6c59ac3f3	moved distro/syslinux from test.mk back to live.mk Thanks go to ildar@ for spotting this: my ~/.mkimage/profiles.mk routinely contains DEBUG = 1 line which effectively masked this regression in commit `307fb51f15`. Wouldn't be a big deal but syslinux.iso is recommended in tutorial docs being slim and fast-building, and it's also what's buildable locally in live-builder.iso environment.	2012-11-12 00:01:43 +04:00
Michael Shigorin	6711fd92db	lib/profile.mk: slightly improved arch test ildar@ noted that the test involving whitespace is too quirky for some quirky enough cases like rpm-dir file:/var/cache/apt/archives . x86_64 -- let's introduce word boundaries there.	2012-11-12 00:01:32 +04:00
Michael Shigorin	c30490e2e8	80-make-initfs: fix the silliest mistake ever Of course the "weird" [ ... ] \|\| ... construct meant to avoid the non-zero exit status of the whole thing wasn't employed where it actually does make the difference! Thanks ildar@ for hitting and reporting this, as in + verbose '/usr/lib64/propagator exists' + '[' -n '' ']' mki-scripts: .../stage1/scripts.d/80-make-initfs: unable to run script. make[3]: *** [run-scripts] Error 1	2012-11-10 17:59:30 +04:00
Michael Shigorin	45cddfd25a	stage1: added nfsv*.ko to modules The newer kernels have versioned NFS support code moved into a few separate modules with nice self-explanatory messages reading "Protocol not supported" if one has managed to overlook this; thanks boyarsh@ for heads-up (based on f545923271f9d1938d1887632ab4697c4c009039 m-p-d).	2012-11-09 16:14:38 +04:00
Michael Shigorin	5300949cc5	gear-store-tags	2012-11-05 17:53:00 +04:00