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
24 changed files with 187 additions and 39 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.2
+Version: 0.9.3
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,9 @@ 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

--- a/.gear/tags/25f0420130990a8bfd7b5e91435ac54c7f8eee33
+++ b/.gear/tags/25f0420130990a8bfd7b5e91435ac54c7f8eee33
@@ -1,6 +0,0 @@
-object 919b09313f3be5702cb8e83f9d0372f4d06ed6f3
-type commit
-tag v0.9.1
-tagger Michael Shigorin <mike@altlinux.org> 1354548428 +0200
-
-kde4
--- 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 @@
-25f0420130990a8bfd7b5e91435ac54c7f8eee33 v0.9.1
+f44512183492762791baf8f4e5bdca5f18dc6017 v0.9.2
--- 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,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/features.in/README
+++ b/features.in/README
@@ -23,9 +23,14 @@
 построенных на одном базовом, можно воспользоваться подкаталогом
 с именем исходного базового субпрофиля (см. $src, $dst в Makefile).

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

 Каталог lib/ является специфическим для фич, определяющих
 построение конкретного вида образа -- см. build-*/.
--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -1,10 +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,$(call tags,base efi))
+	@$(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/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/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/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_PACKAGES,e17-default)
+
+use/x11/lxde: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,lxde desktop))
--- 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+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/security+luks
+++ b/pkg.in/lists/tagged/security+luks
@@ -0,0 +1,3 @@
+make-initrd-luks
+alterator-luks
+cryptsetup
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