0.9.8-alt1

- live fixes/tweaks galore
live.mk: use "net-eth" for kiosks
2013-02-18 21:50:46 +02:00 · 2013-02-18 21:48:41 +02:00 · 2013-02-18 21:48:41 +02:00 · 2013-02-18 21:48:41 +02:00 · 2013-02-18 21:48:30 +02:00 · 2013-02-18 22:15:10 +04:00
15 changed files with 52 additions and 25 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.7
+Version: 0.9.8
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,9 @@ cp -a * %buildroot%mpdir
 %doc %docs/*

 %changelog
+* Mon Feb 18 2013 Michael Shigorin <mike@altlinux.org> 0.9.8-alt1
+- live fixes/tweaks galore
+
 * Mon Feb 11 2013 Michael Shigorin <mike@altlinux.org> 0.9.7-alt1
 - going nightly

--- a/.gear/tags/a3ac943cc53163809f63f514f0f0cc33fff19119
+++ b/.gear/tags/a3ac943cc53163809f63f514f0f0cc33fff19119
@@ -1,6 +0,0 @@
-object 5fcc2aaa78b5704b4bc4ec448322680efa2cc332
-type commit
-tag v0.9.6
-tagger Michael Shigorin <mike@altlinux.org> 1360001972 +0400
-
-assorted fixes
--- a/.gear/tags/fcadfe94c9b21f15c0df26817b8f8fd04134a61e
+++ b/.gear/tags/fcadfe94c9b21f15c0df26817b8f8fd04134a61e
@@ -0,0 +1,6 @@
+object eb569544ca7b9fa44358fe8f1fff109d684ca3a6
+type commit
+tag v0.9.7
+tagger Michael Shigorin <mike@altlinux.org> 1360605773 +0400
+
+going nightly
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-a3ac943cc53163809f63f514f0f0cc33fff19119 v0.9.6
+fcadfe94c9b21f15c0df26817b8f8fd04134a61e v0.9.7
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -7,11 +7,12 @@ 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: distro/.base +live use/live/install use/live/net-eth \
+	use/plymouth/live use/efi; @:
 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
+distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
+	use/syslinux/timeout/1 use/cleanup use/efi/signed use/live/net-eth
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')

@@ -31,9 +32,10 @@ distro/live-builder: distro/live-builder-mini use/dev/repo
 distro/live-install: distro/.live-base use/live/textinstall; @:
 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-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
+distro/live-razorqt: distro/.live-desktop +razorqt; @:
 distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
+distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:

 distro/live-rescue: distro/live-icewm use/efi
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
@@ -42,9 +44,9 @@ distro/live-rescue: distro/live-icewm use/efi

 distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
-	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
+	@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
-	@$(call set,KFLAVOURS,led-ws)
+	@#$(call set,KFLAVOURS,led-ws)

 # NB: flash/java plugins are predictable security holes
 distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -3,14 +3,12 @@ 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 \
+	use/live/install use/live/repo use/live/net-eth 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_LISTS,$(call tags,base regular))
 	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
 	@$(call add,LIVE_LISTS,domain-client)
-	@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
-	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net)
 	@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
 	@$(call set,KFLAVOURS,std-def)
 	@$(call add,KMODULES,r8168)
@@ -33,6 +31,7 @@ distro/regular-e17: distro/.regular-gtk use/x11/e17

 distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
 	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
+	@$(call add,LIVE_PACKAGES,fontconfig-infinality)

 distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:

--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -1,3 +1,5 @@
+efi: use/efi; @:
+
 ifeq (x86_64,$(ARCH))

 EFI_LISTS := $(call tags,base efi)
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -14,7 +14,8 @@ use/live/x11: use/live use/firmware use/x11/xorg
 	@$(call add,LIVE_PACKAGES,xinit)

 # optimized out: use/x11/xorg
-use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
+use/live/desktop: use/live/base use/x11/wacom use/live/sound \
+	+vmguest +power +efi
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
 	@$(call add,LIVE_LISTS,$(call tags,base l10n))
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
@@ -52,3 +53,8 @@ use/live/ru: use/live

 use/live/sound: use/live
 	@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
+
+# eth0 instead of enp0s3
+use/live/net-eth: use/live
+	@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
+	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)
--- a/features.in/live/live/image-scripts.d/40-autologin
+++ b/features.in/live/live/image-scripts.d/40-autologin
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh

 if [ ! -x /usr/bin/X ]; then
 	echo "SKIP autologin: X not installed" >&2
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -72,3 +72,6 @@ use/x11/e17: use/x11/xorg use/x11/3d-free

 use/x11/lxde: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,lxde desktop))
+
+use/x11/fvwm: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,fvwm desktop))
--- a/pkg.in/lists/tagged/base+regular
+++ b/pkg.in/lists/tagged/base+regular
@@ -5,11 +5,11 @@ strace
 powertop
 acpi

-livecd-net-eth
 livecd-online-repo
 apt-repo
 update-kernel
 synaptic-usermode
+eepm

 alterator-standalone
 cpufreq-simple
--- a/pkg.in/lists/tagged/desktop+fvwm
+++ b/pkg.in/lists/tagged/desktop+fvwm
@@ -0,0 +1,6 @@
+fvwm
+fvwm-doc
+fvwm-icons
+fvwm-themes
+fvwm-crystal
+xterm
--- a/pkg.in/lists/tagged/desktop+live
+++ b/pkg.in/lists/tagged/desktop+live
@@ -3,4 +3,6 @@ xinit
 xinitrc
 livecd-setlocale
 installer-feature-runlevel5-stage3
+os-prober
+sudo
 su
--- a/pkg.in/lists/tagged/desktop+lxde
+++ b/pkg.in/lists/tagged/desktop+lxde
@@ -1,6 +1,7 @@
 openbox

 pcmanfm2
+eject

 lxde-common
 lxde-lxpanel
@@ -16,4 +17,7 @@ lxde-lxshortcut
 menu-cache
 altlinux-freedesktop-menu-lxde

+# NB: an lxde-settings is required by lxde-common
+lxde-settings-altlinux
+
 tango-icon-theme
--- a/pkg.in/lists/tagged/desktop+lxde+extra
+++ b/pkg.in/lists/tagged/desktop+lxde+extra
@@ -1,8 +1,8 @@
 tango-icon-theme-extras

-# lxterminal is reportedly sub-par (gns@) but official (aen@)
-lxde-lxterminal
-#sakura
+#lxde-lxterminal
+sakura
+fonts-bitmap-terminus

 leafpad
 galculator
Author	SHA1	Message	Date
Michael Shigorin	867b2f65c9	0.9.8-alt1 - live fixes/tweaks galore	2013-02-18 21:50:46 +02:00
Michael Shigorin	13094e7901	live.mk: use "net-eth" for kiosks Added use/live/net-eth so that autoconfigured images still work in predictable manner. May those breaking trivial cases walk with zillion of cdrom, modem, ethernet etc device nodes all around them!	2013-02-18 21:48:41 +02:00
Michael Shigorin	18e6406588	desktop+lxde: use altlinux settings The inobvious issue is that while lxde-settings is required by lxde-common and provided by both lxde-settings-{altlinux,upstream}, we can't just add the needed one via PACKAGES since the LISTS' deps are expanded already with -upstream taking lexicographical precedence. This might become more serious if/when there are several useful packages, -upstream isn't AFAIK (thanks gns@ for explanation).	2013-02-18 21:48:41 +02:00
Michael Shigorin	f7a97306fb	desktop+lxde: added eject for pcmanfm A tiny small utility that gives us the ability to eject that noisy disc.	2013-02-18 21:48:41 +02:00
Michael Shigorin	92ff4c1cc8	desktop+lxde+extra: well, use sakura Citing the initial comment: "lxterminal is reportedly sub-par (gns@) but official (aen@)"; the functionality PoV finally won. Terminus fonts added to account for presets. See also #28567.	2013-02-18 21:48:30 +02:00
Michael Shigorin	ba2ca7e578	base+regular: added eepm As per lav@'s proposition at LVEE.	2013-02-18 22:15:10 +04:00
Michael Shigorin	971732bfe6	live.mk: specify exact browser livecd-webkiosk used to support firefox only but has been changed to do chromium either; now we need to be more specific.	2013-02-18 22:14:42 +04:00
Michael Shigorin	acf17cd785	live.mk: live-webkiosk-mini: use generic kernel led-ws doesn't work for me with make-initrd 0.8.0-alt1 yet...	2013-02-18 22:14:42 +04:00
Michael Shigorin	6fa08c52e7	live.mk: added EFI support to kiosk images UEFI systems encountered should work too.	2013-02-18 22:14:42 +04:00
Michael Shigorin	8645219667	live: added EFI to use/live/desktop Its support is quite mature and practically useful by now. Let's also add a convenient alias.	2013-02-18 22:14:42 +04:00
Michael Shigorin	a89fff3c6a	live: fixed 40-autologin It was bailing out due to the grossly unneeded -e; thanks dans@ for bringing my attention to this right at LVEE 2013 Winter.	2013-02-18 22:14:42 +04:00
Michael Shigorin	8fc64a023f	desktop+live: added sudo, os-prober sudo added by popular demand, see also this subthread: http://lists.altlinux.org/pipermail/sisyphus/2013-February/359726.html os-prober added on dubrsl@'s request (#altlinux) after having a look at m-p-d as well.	2013-02-14 21:31:14 +04:00
Michael Shigorin	5fd2be3edd	regular.mk: font tweaks for cinnamon Vladimir Didenko suggested including fontconfig-infinality into regular-cinnamon.iso, see this subthread: http://lists.altlinux.org/pipermail/sisyphus/2013-February/359724.html	2013-02-14 21:30:36 +04:00
Michael Shigorin	cbf8426add	live.mk: facelift due to fvwm addition Added fvwm flavour specially for perestoronin from da LOR. As if it wasn't enough, - added UEFI support to desktop/,live-desktop intermediate target; - added live installation capability to desktop/.livecd-install; - added "net-eth" subfeature to get good ol' eth0 insteal of enp0s3; - dropped use/x11/autologin as live subprofile sets up a supported DM for automatic login anyways.	2013-02-14 21:25:58 +04:00
Michael Shigorin	e5fdaacc94	x11: added fvwm support It's becoming a relatively popular request ;-)	2013-02-14 21:25:38 +04:00
Michael Shigorin	91466e6643	net-eth: moved from regular.mk to live feature It'd be better for this commit to appear before 0.9.7 (and clobber the original one) but at least the added functionality has been tested; time to generalize it.	2013-02-14 21:25:38 +04:00
Michael Shigorin	375e1afe34	gear-store-tags	2013-02-11 22:03:27 +04:00