0.9.4-alt1

- restricted boot
efi: slightly enhanced documentation
2013-01-15 00:02:26 +04:00 · 2013-01-14 18:33:25 +02:00 · 2013-01-14 18:24:40 +02:00 · 2013-01-14 18:14:47 +02:00 · 2013-01-14 18:05:16 +02:00 · 2013-01-14 17:36:10 +02:00
78 changed files with 258 additions and 50 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.1
+Version: 0.9.4
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -16,7 +16,7 @@ BuildRequires: /proc

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

 # Recommends: graphviz qemu-img

@@ -78,6 +78,15 @@ cp -a * %buildroot%mpdir
 %doc %docs/*

 %changelog
+* Mon Jan 14 2013 Michael Shigorin <mike@altlinux.org> 0.9.4-alt1
+- restricted boot
+
+* 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

--- a/.gear/tags/d63253dbdac5ab2f0846cb09fb86d5f43c0e53fb
+++ b/.gear/tags/d63253dbdac5ab2f0846cb09fb86d5f43c0e53fb
@@ -1,6 +0,0 @@
-object a5ec5f257792941c753e21d581c08f251217eb3e
-type commit
-tag v0.9.0
-tagger Michael Shigorin <mike@altlinux.org> 1353360826 +0200
-
-uefi, luks, armh
--- a/.gear/tags/e0c9f3e51f9d4cf7dd205a0f15586d5866e1eaf2
+++ b/.gear/tags/e0c9f3e51f9d4cf7dd205a0f15586d5866e1eaf2
@@ -0,0 +1,6 @@
+object 29388ef555bcc2811d5713e3b6b8a22413f9e1c7
+type commit
+tag v0.9.3
+tagger Michael Shigorin <mike@altlinux.org> 1356984082 +0200
+
+regular
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-d63253dbdac5ab2f0846cb09fb86d5f43c0e53fb v0.9.0
+e0c9f3e51f9d4cf7dd205a0f15586d5866e1eaf2 v0.9.3
--- 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/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -2,7 +2,7 @@
 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; @:

@@ -35,7 +35,7 @@ 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-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)))
@@ -68,8 +68,8 @@ 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-ru use/live/autologin 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,45 @@
+# 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 +wireless use/live/ru \
+	use/live/install use/live/repo use/x11/3d-free use/systemd \
+	use/firmware/wireless use/efi/signed 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,LIVE_PACKAGES,net-tools)
+	@$(call add,LIVE_PACKAGES,uvcview)
+	@$(call add,LIVE_PACKAGES,powertop)
+	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
+	@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
+	@$(call set,KFLAVOURS,std-def)
+	@$(call try,SAVE_PROFILE,yes)
+
+distro/.regular-gtk: distro/.regular-desktop use/x11/gdm2.20; @:
+
+distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind; @:
+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)
+	@$(call add,THE_KMODULES,sound)
+
+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
+	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
+
+distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4; @:
+distro/regular-razorqt: distro/.regular-desktop +razorqt; @:
+
+endif
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -9,8 +9,9 @@ distro/server-nano: distro/.server-base \
 	@$(call add,BASE_LISTS,$(call tags,server network))
 	@$(call add,BASE_PACKAGES,dhcpcd cpio)

-distro/server-mini: distro/.server-base use/server/mini use/cleanup/x11-alterator
-	@$(call set,KFLAVOURS,el-smp)
+distro/server-mini: distro/.server-base use/server/mini \
+	use/cleanup/x11-alterator use/efi
+	@$(call set,KFLAVOURS,led-ws)

 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
 	use/firmware/server use/firmware/wireless use/power/acpi/button
--- 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
@@ -40,6 +40,7 @@ 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/features.in/README
+++ b/features.in/README
@@ -23,9 +23,14 @@
 построенных на одном базовом, можно воспользоваться подкаталогом
 с именем исходного базового субпрофиля (см. $src, $dst в Makefile).

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

 Каталог lib/ является специфическим для фич, определяющих
 построение конкретного вида образа -- см. build-*/.
--- a/features.in/build-ve/image-scripts.d/03-services
+++ b/features.in/build-ve/image-scripts.d/03-services
--- a/features.in/build-ve/image-scripts.d/04-inittab
+++ b/features.in/build-ve/image-scripts.d/04-inittab
--- a/features.in/build-ve/image-scripts.d/05-mtab
+++ b/features.in/build-ve/image-scripts.d/05-mtab
--- a/features.in/build-ve/image-scripts.d/06-syslog
+++ b/features.in/build-ve/image-scripts.d/06-syslog
--- a/features.in/build-ve/image-scripts.d/07-fstab
+++ b/features.in/build-ve/image-scripts.d/07-fstab
--- a/features.in/build-ve/image-scripts.d/08-resolv
+++ b/features.in/build-ve/image-scripts.d/08-resolv
@@ -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/build-ve/image-scripts.d/90-firsttime
+++ b/features.in/build-ve/image-scripts.d/90-firsttime
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Run scripts from /etc/firsttime.d at first start
+[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"
--- a/features.in/build-vm/image-scripts.d/00-root
+++ b/features.in/build-vm/image-scripts.d/00-root
--- a/features.in/build-vm/image-scripts.d/03-services
+++ b/features.in/build-vm/image-scripts.d/03-services
--- a/features.in/build-vm/image-scripts.d/04-inittab
+++ b/features.in/build-vm/image-scripts.d/04-inittab
--- a/features.in/build-vm/image-scripts.d/06-syslog
+++ b/features.in/build-vm/image-scripts.d/06-syslog
--- a/features.in/build-vm/image-scripts.d/07-kernel
+++ b/features.in/build-vm/image-scripts.d/07-kernel
--- a/features.in/build-vm/image-scripts.d/90-firsttime
+++ b/features.in/build-vm/image-scripts.d/90-firsttime
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Run scripts from /etc/firsttime.d at first start
+[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"
--- a/features.in/cleanup/image-scripts.d/90-cleanup-pkgs
+++ b/features.in/cleanup/image-scripts.d/90-cleanup-pkgs
--- a/features.in/cleanup/install2/image-scripts.d/90-cleanup-pkgs
+++ b/features.in/cleanup/install2/image-scripts.d/90-cleanup-pkgs
--- a/features.in/cleanup/live/image-scripts.d/80-locales
+++ b/features.in/cleanup/live/image-scripts.d/80-locales
--- a/features.in/cleanup/live/image-scripts.d/90-cleanup-docs
+++ b/features.in/cleanup/live/image-scripts.d/90-cleanup-docs
--- a/features.in/cleanup/live/image-scripts.d/90-cleanup-pkgs
+++ b/features.in/cleanup/live/image-scripts.d/90-cleanup-pkgs
--- a/features.in/cleanup/live/image-scripts.d/99-cleanupdb
+++ b/features.in/cleanup/live/image-scripts.d/99-cleanupdb
--- a/features.in/efi/README
+++ b/features.in/efi/README
@@ -1,5 +1,9 @@
 Фича добавляет в образы необходимое для поддержки EFI/UEFI.

+Конфигурируется заданием загрузчика (EFI_BOOTLOADER)
+и файла сертификата (EFI_CERT) при помощи целей;
+пример использования доступен в ../../conf.d/regular.mk
+
 См. тж.:
 * http://www.altlinux.org/UEFI
 * http://www.rodsbooks.com/efi-bootloaders/
--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -1,7 +1,28 @@
+ifeq (x86_64,$(ARCH))
+
+EFI_LISTS := $(call tags,base efi)
+
 use/efi:
-	@$(call add,THE_LISTS,$(call tags,base 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 try,EFI_BOOTLOADER,elilo)	# default one
+
+use/efi/refind: use/efi
+	@$(call set,EFI_BOOTLOADER,refind)
+
+use/efi/signed: use/efi
+	@$(call set,EFI_CERT,altlinux)

 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
-	@$(call set,KFLAVOURS,led-ws)	### CONFIG_FB_EFI
+	@$(call set,KFLAVOURS,led-ws)
+
+else
+
+# ignore on an unsupported target arch but make it hybrid at least
+use/efi use/efi/refind use/efi/signed use/efi/debug: use/isohybrid
+
+endif
--- a/features.in/install2/install2/image-scripts.d/10-bootloader
+++ b/features.in/install2/install2/image-scripts.d/10-bootloader
--- a/features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat
+++ b/features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat
--- a/features.in/install2/install2/image-scripts.d/90-install2-cleanup-docs
+++ b/features.in/install2/install2/image-scripts.d/90-install2-cleanup-docs
--- a/features.in/install2/install2/image-scripts.d/90-install2-cleanup-drivers
+++ b/features.in/install2/install2/image-scripts.d/90-install2-cleanup-drivers
--- a/features.in/install2/install2/image-scripts.d/90-install2-cleanup-l10n
+++ b/features.in/install2/install2/image-scripts.d/90-install2-cleanup-l10n
--- a/features.in/install2/install2/image-scripts.d/98-system
+++ b/features.in/install2/install2/image-scripts.d/98-system
--- a/features.in/install2/install2/image-scripts.d/99-cleanupdb
+++ b/features.in/install2/install2/image-scripts.d/99-cleanupdb
--- 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
--- 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/lowmem/install2/image-scripts.d/85-cleanup-lowmem
+++ b/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem
--- a/features.in/luks/config.mk
+++ b/features.in/luks/config.mk
@@ -1,2 +1,5 @@
+LUKS_LISTS := $(call tags,security luks)
+
 use/luks:
-	@$(call add,BASE_PACKAGES,make-initrd-luks cryptsetup)
+	@$(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
@@ -1,4 +1,3 @@
 #!/bin/sh

-# FIXME: move into luks feature
 echo 'FEATURES += luks' >> /etc/initrd.mk
--- a/features.in/pack/config.mk
+++ b/features.in/pack/config.mk
@@ -10,7 +10,7 @@ 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
--- a/features.in/rescue/rescue/image-scripts.d/98-init-rescue
+++ b/features.in/rescue/rescue/image-scripts.d/98-init-rescue
--- a/features.in/slinux/live/image-scripts.d/50-services
+++ b/features.in/slinux/live/image-scripts.d/50-services
--- a/features.in/wireless/README
+++ b/features.in/wireless/README
@@ -0,0 +1 @@
+Эта фича занимается добавлением поддержки беспроводных соединений.
--- a/features.in/wireless/config.mk
+++ b/features.in/wireless/config.mk
@@ -0,0 +1,6 @@
+wireless: use/wireless; @:
+
+use/wireless:
+	@$(call add_feature)
+	@$(call add,THE_KMODULES,bcmwl rt3070 staging)
+	@$(call add,THE_PACKAGES,wireless-tools rfkill)
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -55,8 +55,17 @@ use/x11/tde: use/x11/xorg
 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_LISTS,$(call tags,e17 desktop))
+
+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/image.in/image-scripts.d/01-rootdir
+++ b/image.in/image-scripts.d/01-rootdir
--- 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)
--- a/pkg.in/lists/tagged/desktop+e17
+++ b/pkg.in/lists/tagged/desktop+e17
@@ -0,0 +1,3 @@
+e17-default
+evas_generic_loaders
+gnome-icon-theme
--- a/pkg.in/lists/tagged/desktop+e17+extra
+++ b/pkg.in/lists/tagged/desktop+e17+extra
@@ -0,0 +1,3 @@
+gst-plugins-*
+gst-ffmpeg
+gnome-mplayer
--- 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/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -90,7 +90,6 @@ nfs-utils
 ngrep
 nmap
 p0f
-postfix
 rsync
 scanssh
 #stunnel
--- 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
--- a/sub.in/stage2/image-scripts.d/00-stage1
+++ b/sub.in/stage2/image-scripts.d/00-stage1
--- a/sub.in/stage2/image-scripts.d/01-rootdir
+++ b/sub.in/stage2/image-scripts.d/01-rootdir
--- a/sub.in/stage2/image-scripts.d/50-udev
+++ b/sub.in/stage2/image-scripts.d/50-udev
--- a/sub.in/stage2/image-scripts.d/85-cleanup-cjk
+++ b/sub.in/stage2/image-scripts.d/85-cleanup-cjk
--- a/sub.in/stage2/image-scripts.d/85-cleanup-legacy
+++ b/sub.in/stage2/image-scripts.d/85-cleanup-legacy
--- a/sub.in/stage2/image-scripts.d/90-cleanup-bloat-bin
+++ b/sub.in/stage2/image-scripts.d/90-cleanup-bloat-bin
--- a/sub.in/stage2/image-scripts.d/90-cleanup-drm
+++ b/sub.in/stage2/image-scripts.d/90-cleanup-drm
--- a/sub.in/stage2/image-scripts.d/97-cleanup-blacklisted
+++ b/sub.in/stage2/image-scripts.d/97-cleanup-blacklisted
--- a/sub.in/stage2/image-scripts.d/98-depmod
+++ b/sub.in/stage2/image-scripts.d/98-depmod
--- a/sub.in/stage2/image-scripts.d/99-cleanup-boot
+++ b/sub.in/stage2/image-scripts.d/99-cleanup-boot
Author	SHA1	Message	Date
Michael Shigorin	a133490be9	0.9.4-alt1 - restricted boot	2013-01-15 00:02:26 +04:00
Michael Shigorin	3ff5f6a195	efi: slightly enhanced documentation The variables are best influenced by targets and not directly to avoid architecture dependent clashes.	2013-01-14 18:33:25 +02:00
Michael Shigorin	2234e6b70f	regular.mk: test refind with regular-icewm.iso The current refind support implementation doesn't boot with either USB Flash or CD-ROM for me (due to the different actual volumes, FAT vs El Torito, accordingly). And when it does, a host with Secure Boot present and not disabled yet would turn the unsigned kernel down unlike ELILO (due to rEFInd using "natural" calls to boot it). Both issues are reported upstream; in the meanwhile let's migrate a single test image but build the rest with elilo.	2013-01-14 18:24:40 +02:00
Michael Shigorin	36a707bbb2	efi: refind support mkimage > 0.2.5 should have received enhanced UEFI support including the ability to setup refind (#28349); make the feature ready for that.	2013-01-14 18:14:47 +02:00
Michael Shigorin	1db42ffcb1	regular.mk: use/efi/signed Let's switch the UEFI SecureBoot (aka RestrictedBoot) shim on for all the regular images.	2013-01-14 18:05:16 +02:00
Michael Shigorin	8c8d7c24d1	efi: initial signed bootloader support The implementation goes the shim[1] way as described here[2]; many thanks to Matthew Garrett and Rod Smith. [1] http://mjg59.dreamwidth.org/20303.html [2] http://www.rodsbooks.com/efi-bootloaders/secureboot.html	2013-01-14 17:36:10 +02:00
Michael Shigorin	084c5af4cb	regular.mk: add uvcview, powertop All of these individual packages should get sorted out and shifted to pkglists at some time.	2013-01-11 00:32:31 +04:00
Michael Shigorin	8c8a65a104	regular-tde: added NetworkManager Suggested by rom_as@; see also #25713 at the moment.	2013-01-11 00:32:31 +04:00
Michael Shigorin	b7c1e3bda2	initial desktop+e17+extra pkglist Thanks aris@ for advice again.	2013-01-11 00:32:31 +04:00
Michael Shigorin	95bc7fedd6	added desktop+e17 pkglist, use it in x11 It's not e17-default alone right now, gnome-icon-theme package appears requisite at the moment so that menus and IBar aren't half-empty regarding graphics. Thanks aris@ for the advice and lots of patience with me.	2013-01-11 00:32:31 +04:00
Michael Shigorin	ed79d011b7	regular.mk: added net-tools ifconfig(8) was requested by rom_as@ and someone at opennet too. It's legacy but habits are valuable nevertheless.	2013-01-11 00:32:31 +04:00
Michael Shigorin	2cdb7d3df9	regular.mk: use/wireless ...instead of preliminary "statically linked" bits.	2013-01-11 00:32:31 +04:00
Michael Shigorin	61e4b26ffe	initial features.in/wireless The creeping wireless bits should be thrown together, including kernel modules, firmware, CLI/GUI controls, and any plumbing required.	2013-01-11 00:32:31 +04:00
Michael Shigorin	56b473b2da	regular.mk: use std-def So far it's what should be tested, after all... and #27941 is not so clearly about the kernel.	2013-01-11 00:32:31 +04:00
Michael Shigorin	d6d7662ef8	x11: added evas_generic_loaders to e17 packages This should really be done in e17-default but until it's there... (thanks aris@ for advice)	2013-01-11 00:32:30 +04:00
Michael Shigorin	0b71c5fb07	regular: added rescue+extra pkglist The things like fdisk are very useful on a livecd/liveflash to carry in one's pocket indeed.	2013-01-11 00:32:30 +04:00
Michael Shigorin	d8de9b292b	rescue+extra: postfix is a server, not a tool Just drop it from this pkglist.	2013-01-11 00:32:30 +04:00
Michael Shigorin	24c1a45673	regular += wireless drivers Thanks someone for feedback: http://www.opennet.ru/openforum/vsluhforumID3/88025.html#285	2013-01-11 00:32:30 +04:00
Michael Shigorin	380dcb88d8	server.mk: add UEFI, move off el-smp UEFI support is pretty requisite by now; and el-smp hasn't seen updates for almost half a year by now so an actively maintained one is clearly preferred.	2013-01-11 00:32:30 +04:00
Denis Smirnov	7f805cdf79	Rename all scripts in */image-scripts.d to format \d\d-scriptname	2013-01-06 12:05:32 +04:00
Denis Smirnov	c509ddb954	/etc/firsttime.d support	2013-01-06 00:10:46 +04:00
Michael Shigorin	dfb2d2adef	gear-store-tags	2012-12-31 22:01:27 +02:00
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
				`@@ -0,0 +1 @@`
				`Эта фича занимается добавлением поддержки беспроводных соединений.`