0.9.10-alt1

- fonts: axios!
live.mk: drop efi support for kiosk base target
2013-03-18 16:37:00 +02:00 · 2013-03-18 16:37:00 +02:00 · 2013-03-18 16:37:00 +02:00 · 2013-03-18 16:37:00 +02:00 · 2013-03-18 16:36:59 +02:00 · 2013-03-18 16:36:59 +02:00
39 changed files with 378 additions and 72 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.9.9
+Version: 0.9.10
 Release: alt1

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

 %changelog
+* Mon Mar 18 2013 Michael Shigorin <mike@altlinux.org> 0.9.10-alt1
+- fonts: axios!
+
 * Tue Feb 26 2013 Michael Shigorin <mike@altlinux.org> 0.9.9-alt1
 - regular refactoring

--- a/.gear/tags/432f34bfd2a6ee1047c2c7263bca2038fe14f3e7
+++ b/.gear/tags/432f34bfd2a6ee1047c2c7263bca2038fe14f3e7
@@ -0,0 +1,6 @@
+object 6605eb61bdecf70b2de7ca5cf96d0b1fa341aab6
+type commit
+tag v0.9.9
+tagger Michael Shigorin <mike@altlinux.org> 1361826022 +0400
+
+regular refactoring
--- a/.gear/tags/8d35fba8114a4fbbe13732612090cb6d588a2da3
+++ b/.gear/tags/8d35fba8114a4fbbe13732612090cb6d588a2da3
@@ -1,5 +0,0 @@
-object f10f3b18db6d96ee957c14501ee24309729e247d
-type commit
-tag v0.9.8.1
-tagger Michael Shigorin <mike@altlinux.org> 1361292966 +0200
-
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-8d35fba8114a4fbbe13732612090cb6d588a2da3 v0.9.8.1
+432f34bfd2a6ee1047c2c7263bca2038fe14f3e7 v0.9.9
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -6,20 +6,19 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg

 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:

-distro/.desktop-network: distro/.desktop-mini +vmguest
+distro/.desktop-network: distro/.desktop-mini use/stage2/net-eth +vmguest
 	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
+	@$(call add,BASE_PACKAGES,udev-rule-generator-net sysklogd)
 	@$(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/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite
 	@$(call set,KFLAVOURS,std-def)

+distro/tde: distro/.desktop-network +tde; @:
 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
@@ -10,12 +10,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/live/install use/live/net-eth \
+distro/.live-desktop: distro/.base +live use/live/install use/stage2/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 +power \
-	use/syslinux/timeout/1 use/cleanup use/efi/signed use/live/net-eth
+	use/syslinux/timeout/1 use/cleanup use/stage2/net-eth
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')

@@ -45,20 +45,25 @@ distro/live-rescue: distro/live-icewm use/efi
 	@$(call add,LIVE_LISTS,openssh \
 		$(call tags,(base || extra) && (archive || rescue || network)))

-distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
+# NB: this one doesn't include the browser, needs to be chosen downstream
+distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
-	@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
+	@$(call add,LIVE_PACKAGES,alsa-utils udev-alsa)
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
-	@#$(call set,KFLAVOURS,led-ws)
+
+distro/live-webkiosk-mini: distro/.live-webkiosk
+	@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)

 # NB: flash/java plugins are predictable security holes
 distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
 	@$(call add,LIVE_PACKAGES,mozilla-plugin-adobe-flash)
 	@$(call add,LIVE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
-	@$(call add,LIVE_PACKAGES,alsa-utils udev-alsa)

 distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:

+distro/live-webkiosk-chromium: distro/.live-webkiosk
+	@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)
+
 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)
@@ -83,4 +88,6 @@ distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
 	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
 	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)

+distro/live-sugar: distro/.live-desktop-ru use/x11/sugar; @:
+
 endif
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -1,15 +1,18 @@
 # regular build/usage images
 ifeq (distro,$(IMAGE_CLASS))

+# common ground
+distro/.regular-bare: distro/.base +vmguest +wireless \
+	use/efi/signed use/luks use/memtest use/stage2/net-eth use/kernel/net
+	@$(call try,SAVE_PROFILE,yes)
+
 # WM base target
-distro/.regular-base: distro/.base +live +wireless use/live/ru \
-	use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
-	use/efi/signed use/luks +vmguest use/memtest use/branding \
-	use/kernel/net
-	@$(call add,LIVE_LISTS,$(call tags,base regular))
+distro/.regular-base: distro/.regular-bare +live use/live/ru use/live/install \
+	use/live/repo use/x11/3d-free use/luks use/branding
+	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
 	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
 	@$(call add,THE_BRANDING,indexhtml notes alterator)
-	@$(call try,SAVE_PROFILE,yes)
+	@$(call add,THE_BRANDING,graphics)

 # DE base target
 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
@@ -20,14 +23,24 @@ distro/.regular-desktop: distro/.regular-base \
 	@$(call set,KFLAVOURS,std-def)

 distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
-	@$(call add,THE_BRANDING,graphics)

 distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm
 	@$(call add,LIVE_PACKAGES,xxkb mutt)
+	@$(call add,LIVE_PACKAGES,deepsolver deepsolver-repo)
 	@$(call set,KFLAVOURS,un-def)

+distro/regular-wmaker: distro/.regular-desktop use/x11/lightdm/gtk \
+	use/x11/wmaker
+	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
+	@$(call add,LIVE_PACKAGES,xxkb)
+
+distro/regular-gnustep: distro/regular-wmaker use/x11/gnustep +plymouth
+	@$(call add,THE_BRANDING,graphics)
+
 distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
-distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
+
+distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality
+	@$(call add,LIVE_LISTS,$(call tags,desktop nm))

 distro/regular-mate: distro/.regular-gtk
 	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
@@ -35,9 +48,9 @@ distro/regular-mate: distro/.regular-gtk
 distro/regular-e17: distro/.regular-gtk use/x11/e17
 	@$(call add,LIVE_PACKAGES,xterm)

-distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
+distro/regular-cinnamon: distro/.regular-desktop \
+	use/x11/cinnamon use/fonts/infinality
 	@$(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; @:

@@ -45,10 +58,16 @@ distro/regular-tde: distro/.regular-desktop +tde +plymouth
 	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
 	@$(call add,LIVE_PACKAGES,kdegames kdeedu)

-distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 +plymouth
-	@$(call add,LIVE_PACKAGES,kde4-regular)
-	@$(call add,LIVE_PACKAGES,plasma-applet-networkmanager)
+distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
+	use/fonts/zerg +plymouth
+	@$(call add,LIVE_LISTS,$(call tags,regular kde4))

 distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:

+distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
+
+distro/regular-rescue: distro/.regular-bare use/rescue \
+	use/syslinux/ui/menu use/hdt use/efi/refind
+	@$(call set,KFLAVOURS,un-def)
+
 endif
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -10,7 +10,7 @@ distro/server-nano: distro/.server-base \
 	@$(call add,BASE_PACKAGES,dhcpcd cpio)

 distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
-	use/cleanup/x11-alterator use/efi
+	use/cleanup/x11-alterator use/efi use/stage2/net-eth
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)

 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -6,6 +6,8 @@ use/firmware:
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,firmware-linux)

+use/firmware/full: use/firmware/server use/firmware/laptop
+
 use/firmware/cpu: use/firmware
 	@$(call add,THE_PACKAGES,firmware-amd-ucode)
 	@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
@@ -21,7 +23,7 @@ use/firmware/wireless: use/firmware
 	@$(call add,THE_KMODULES,bcmwl ndiswrapper)
 	@$(call add,THE_PACKAGES,firmware-acx100)
 	@#$(call add,THE_PACKAGES,firmware-i2400m)
-	@$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
+	@#$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
 	@#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
--- a/features.in/fonts/config.mk
+++ b/features.in/fonts/config.mk
@@ -0,0 +1,15 @@
+use/fonts:
+	@$(call add_feature)
+	@$(call xport,FONT_FEATURES_ENABLE)
+	@$(call xport,FONT_FEATURES_DISABLE)
+
+# just stating that kernels and font habits are pretty individual
+use/fonts/zerg: use/fonts
+	@$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \
+		hinting style-full sub-pixel-rgb)
+	@$(call set,FONT_FEATURES_DISABLE,no-antialias lcdfilter-none \
+		unhinted no-sub-pixel)
+
+# nothing configured to add_feature, let's skip that this time
+use/fonts/infinality:
+	@$(call add,THE_PACKAGES,libfreetype-infinality fontconfig-infinality)
--- a/features.in/fonts/stage2/image-scripts.d/50-fontconfig
+++ b/features.in/fonts/stage2/image-scripts.d/50-fontconfig
@@ -0,0 +1,33 @@
+#!/bin/sh
+# fontconfig-config-config
+
+verbose="${GLOBAL_VERBOSE:+-v}"
+verbose() { [ -z "$GLOBAL_VERBOSE" ] || echo "HOOK: 50-fontconfig: $@"; }
+verbose "has started"
+
+CONF_DIR="/etc/fonts/conf.d"
+AVAIL_DIR="/etc/fonts/conf.avail"
+
+list() { ls "$1"/??-"$2".conf 2>/dev/null; }
+
+enable() {
+	for i in "$@"; do
+		if ! list "$CONF_DIR" "$i"; then
+			AVAIL="$(list "$AVAIL_DIR" "$i" | head -1)"
+			if [ -n "$AVAIL" ]; then
+				ln -s $verbose "$AVAIL" "$CONF_DIR/$CONF_ADD"
+			fi
+		fi
+	done
+}
+
+disable() {
+	for i in "$@"; do
+		$(list "$CONF_DIR" "$i") | xargs -r rm -f $verbose --
+	done
+}
+
+disable $GLOBAL_FONT_FEATURES_DISABLE
+enable  $GLOBAL_FONT_FEATURES_ENABLE
+
+:
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -53,8 +53,3 @@ 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/03-services
+++ b/features.in/live/live/image-scripts.d/03-services
@@ -34,6 +34,7 @@ livecd-save-nfs
 livecd-setauth
 livecd-setlocale
 livecd-net-eth
+livecd-install-wmaker
 network
 NetworkManager
 connman
--- a/features.in/live/live/image-scripts.d/90-rm-fbdev
+++ b/features.in/live/live/image-scripts.d/90-rm-fbdev
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# a temporary workaround for #28669 (fall back to vesa)
+rm -f /usr/lib*/X11/modules/drivers/fbdev_drv.so
--- a/features.in/ltsp/config.mk
+++ b/features.in/ltsp/config.mk
@@ -3,7 +3,7 @@
 use/ltsp:
 	@$(call add_feature)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
-	@$(call add,MAIN_LISTS,ltsp-client ltsp-client.$(ARCH))
+	@$(call add,MAIN_LISTS,ltsp-client)
 	@$(call add,BASE_LISTS,ltsp)

 use/ltsp/base: use/ltsp use/firmware
--- a/features.in/rescue/config.mk
+++ b/features.in/rescue/config.mk
@@ -1,5 +1,6 @@
 use/rescue: use/stage2 sub/stage2@rescue use/syslinux/sdab.cfg \
-	use/firmware/server +wireless
+	use/firmware/full +wireless
 	@$(call add_feature)
 	@$(call add,RESCUE_LISTS, openssh \
-		$(call tags,(base || extra) && (rescue || network)))
+		$(call tags,(base || extra || server || misc) && \
+			(rescue || network || security)))
--- a/features.in/stage2/config.mk
+++ b/features.in/stage2/config.mk
@@ -6,6 +6,11 @@ use/stage2: sub/stage1
 use/stage2/kms:
 	@$(call add,STAGE1_KMODULES_REGEXP,drm.*)

+# eth0 instead of enp0s3
+use/stage2/net-eth: use/stage2
+	@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
+	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)
+
 # NB: sub/stage2 isn't used standalone but rather
 #     as a base for various livecd modifications
 #     (currently install2, live, rescue)
--- a/features.in/vmguest/config.mk
+++ b/features.in/vmguest/config.mk
@@ -1,13 +1,14 @@
 +vmguest: use/vmguest/virtualbox use/vmguest/kvm; @:

-use/vmguest/virtualbox:
+use/vmguest:
 	@$(call add_feature)
+
+use/vmguest/virtualbox: use/vmguest
 	@$(call add,THE_KMODULES,virtualbox-addition drm)
 	@$(call add,THE_PACKAGES,virtualbox-guest-additions)

 # NB: only reasonable for X11-bearing images
-use/vmguest/kvm:
-	@$(call add_feature)
+use/vmguest/kvm: use/vmguest
 	@$(call add,THE_PACKAGES,spice-vdagent)

 # see also use/install2/kvm
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -76,3 +76,12 @@ use/x11/lxde: use/x11/xorg

 use/x11/fvwm: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,fvwm desktop))
+
+use/x11/sugar: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,sugar desktop))
+
+use/x11/wmaker: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,wmaker desktop))
+
+use/x11/gnustep: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,gnustep desktop))
--- a/pkg.in/lists/ltsp
+++ b/pkg.in/lists/ltsp
@@ -2,8 +2,8 @@ ltsp-server
 ltsp-server-basic
 openssh-server

-#alterator-ltsconf
-#alterator-standalone
+alterator-ltsconf
+alterator-standalone

 alsa-plugins
 alsa-plugins-pulse
--- a/pkg.in/lists/ltsp-client
+++ b/pkg.in/lists/ltsp-client
@@ -3,3 +3,7 @@ ltsp-client-full
 ltsp-client-nxsession
 # ouch!
 mc
+
+kernel-image-led-ws
+kernel-modules-drm-led-ws
+kernel-modules-alsa-led-ws
--- a/pkg.in/lists/ltsp-client.i586
+++ b/pkg.in/lists/ltsp-client.i586
@@ -1,3 +0,0 @@
-kernel-image-ltsp-client
-kernel-modules-drm-ltsp-client
-kernel-modules-alsa-ltsp-client
--- a/pkg.in/lists/ltsp-client.x86_64
+++ b/pkg.in/lists/ltsp-client.x86_64
@@ -1,3 +0,0 @@
-kernel-image-std-def
-kernel-modules-drm-std-def
-kernel-modules-alsa-std-def
--- a/pkg.in/lists/tagged/base+live
+++ b/pkg.in/lists/tagged/base+live
@@ -1,5 +1,6 @@
 wget
 rsync
 apt
+fdisk
 vim-console
 mc
--- a/pkg.in/lists/tagged/base+regular
+++ b/pkg.in/lists/tagged/base+regular
@@ -15,5 +15,4 @@ alterator-standalone
 cpufreq-simple
 xdg-user-dirs
 firefox-ru
-uvcview
 eject
--- a/pkg.in/lists/tagged/base+rescue
+++ b/pkg.in/lists/tagged/base+rescue
@@ -18,3 +18,6 @@ man-pages
 sysfsutils
 sysklogd
 util-linux
+
+# Package management
+apt-repo
--- a/pkg.in/lists/tagged/desktop+gnustep
+++ b/pkg.in/lists/tagged/desktop+gnustep
@@ -0,0 +1,68 @@
+
+gnustep-back
+gnustep-base
+gnustep-charsets
+gnustep-dbuskit
+gnustep-dirs
+gnustep-easydiff
+gnustep-gmastermind
+gnustep-gmines
+gnustep-gorm
+gnustep-gshisen
+gnustep-gui
+gnustep-gworkspace
+gnustep-make
+gnustep-mknfonts
+gnustep-pdfkit
+gnustep-projectcenter
+gnustep-renaissance
+gnustep-simplewebkit
+gnustep-sqlclient
+gnustep-steptalk
+gnustep-sudoku
+gnustep-systempreferences
+gnustep-themes-Gtk
+gnustep-ucsdata
+gnustep-xcode
+libgnustep-objc2
+
+gnustep-AddressManager
+gnustep-CDPlayer
+gnustep-FTP
+gnustep-FisicaLab
+gnustep-GNUMail
+gnustep-GSPdf
+gnustep-Gemas
+gnustep-Graphos
+gnustep-HighlighterKit
+gnustep-IMImage
+gnustep-LaternaMagica
+gnustep-NoteBook
+gnustep-PRICE
+gnustep-Pantomime
+gnustep-RpmViewer
+gnustep-SimpleAgenda
+gnustep-TextEdit
+gnustep-Zipper
+gnustep-themes-Neos
+gnustep-themes-Nesedah
+gnustep-themes-Narcissus
+gnustep-silver.theme
+gnustep-cddb.bundle
+
+gnustep-Ghack
+gnustep-RSSkit
+gnustep-Grr
+#gnustep-IconManager
+gnustep-LapisPuzzle
+gnustep-MPDCon
+gnustep-TimeMon
+##gnustep-PictureFrame	is not even alpha quality yet
+
+gnustep-SGContentViewer
+gnustep-Preview
+
+gnustep-terminal
+
+# a text editor
+leafpad
--- a/pkg.in/lists/tagged/desktop+lxde
+++ b/pkg.in/lists/tagged/desktop+lxde
@@ -13,11 +13,13 @@ lxde-lxshortcut
 lxde-lxappearance
 lxde-lxappearance-obconf
 lxde-lxshortcut
+lxde-lxinput

 menu-cache
 altlinux-freedesktop-menu-lxde

 # NB: an lxde-settings is required by lxde-common
-lxde-settings-altlinux
+lxde-settings-upstream

+lxde-icon-theme
 tango-icon-theme
--- a/pkg.in/lists/tagged/desktop+lxde+extra
+++ b/pkg.in/lists/tagged/desktop+lxde+extra
@@ -1,6 +1,6 @@
 tango-icon-theme-extras

-#lxde-lxterminal
+lxde-lxterminal
 sakura
 fonts-bitmap-terminus

--- a/pkg.in/lists/tagged/desktop+razorqt
+++ b/pkg.in/lists/tagged/desktop+razorqt
@@ -1,5 +1,5 @@
 razorqt
-arora
+qupzilla
 qtfm
 qterminal
 juffed
--- a/pkg.in/lists/tagged/desktop+regular
+++ b/pkg.in/lists/tagged/desktop+regular
@@ -9,7 +9,7 @@ alterator-auth
 alterator-nsswitch

 alterator-net-general
-alterator-net-pppoe
+alterator-net-pppoe rp-pppoe-client
 alterator-net-pptp
 alterator-net-openvpn
 alterator-net-eth
@@ -18,6 +18,9 @@ alterator-net-wifi
 alterator-net-shares
 alterator-proxy

+alterator-x11
+alterator-xkb
+
 #alterator-datetime

 system-config-printer
--- a/pkg.in/lists/tagged/desktop+sugar
+++ b/pkg.in/lists/tagged/desktop+sugar
@@ -0,0 +1,56 @@
+sugar
+sugar-abacus
+sugar-analyze
+sugar-calculator
+sugar-calendario
+sugar-chat
+sugar-clock
+sugar-connect
+sugar-countries
+sugar-cp-all
+sugar-cp-datetime
+sugar-cp-frame
+sugar-cp-keyboard
+sugar-cp-language
+sugar-cp-modemconfiguration
+sugar-cp-network
+sugar-cp-power
+sugar-cp-updater
+sugar-distance
+sugar-emulator
+sugar-finance
+sugar-flip
+sugar-getiabooks
+sugar-help
+sugar-imageviewer
+sugar-infoslicer
+sugar-log
+sugar-logos
+sugar-measure
+sugar-memorize
+sugar-moon
+sugar-nutrition
+sugar-playgo
+sugar-portfolio
+sugar-presence-service
+sugar-pukllanapac
+sugar-recall
+sugar-record
+sugar-ruler
+sugar-speak
+sugar-stopwatch
+sugar-terminal
+sugar-turtleart
+sugar-typing-turtle
+sugar-view-slides
+sugar-visualmatch
+sugar-write
+sugar-xoirc
+sugar-xomail
+sugar-base
+sugar-datastore
+sugar-paint
+sugar-settings-manager
+sugar-toolkit
+sugar-toolkit-gtk3
+metacity-gnome
--- a/pkg.in/lists/tagged/desktop+wmaker
+++ b/pkg.in/lists/tagged/desktop+wmaker
@@ -0,0 +1,10 @@
+WindowMaker
+
+wmsystemtray
+wmdf
+wmnd
+wmsm
+wmacpi
+wmfire
+wmclock
+wmaker-theme-club07
--- a/pkg.in/lists/tagged/regular+kde4
+++ b/pkg.in/lists/tagged/regular+kde4
@@ -0,0 +1,15 @@
+kde4-regular
+
+plasma-applet-networkmanager
+
+pulseaudio-daemon
+alsa-plugins-pulse
+phonon-gstreamer
+pavucontrol
+
+synaptic-kde
+synaptic-usermode-
+gtk2-theme-oxygen-gtk
+gtk3-theme-oxygen-gtk
+altlinux-freedesktop-menu-kde4
+altlinux-freedesktop-menu-shallow-menu
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -21,6 +21,7 @@ lvm2
 mdadm
 ms-sys
 parted
+partclone
 sdparm
 sfdisk
 smartmontools
@@ -52,24 +53,47 @@ findutils
 file
 less

-# Filesystem utils
-dosfstools
+# Filesystem maintenance
+btrfs-progs
 e2fsprogs
+f2fs-tools
 jfsprogs
-ntfs-3g
-recover
-recoverdm
+logfsprogs
+nilfs-utils
+reiser4progs
 reiserfsprogs
 xfsprogs
-btrfs-progs
+
+# Compressed filesystem image
+clicfs-utils
+cloop-utils
+squashfsprogs
+squashfsprogs3
+squashfsprogs-xz
+
+# Foreign filesystems
+dosfstools
+exofs-utils
+fatresize
+fuse-zfs
+hfsprogs
+ntfs-3g
+ocfs2-tools
+
+# Filesystem recovery/cleanup
 ext3grep
-dmsdos
 extundelete
+foremost
+magicrescue
+recover
+recoverdm
 scalpel
+sleuthkit
 testdisk
 testdisk-doc
-zerofree
 wipefreespace
+xfsdump
+zerofree

 # Applications/Networking
 arpwatch
@@ -87,6 +111,7 @@ mtr
 netcat
 netlist
 nfs-utils
+cifs-utils
 ngrep
 nmap
 p0f
--- a/pkg.in/lists/tagged/rescue+fs
+++ b/pkg.in/lists/tagged/rescue+fs
@@ -1,8 +1,5 @@
 #anyfs-tools
 cpipe
+pv
 dar
-ddrescue
-foremost
-sleuthkit
-xfsdump
-#zfs-fuse
+dmsdos
--- a/pkg.in/lists/tagged/rescue+misc
+++ b/pkg.in/lists/tagged/rescue+misc
@@ -0,0 +1,34 @@
+# BDB
+db4.8-utils
+
+# Networking
+drbd83-tools
+iscsitarget-utils
+ntp-utils
+
+# Optical media
+dvd+rw-tools
+readom
+xorriso
+
+# Magnetic tapes
+dvgrab
+mt-st
+mtx
+
+# Hardware
+irda-utils
+lm_sensors3
+lshw
+smbios-utils
+
+# Misc^2
+kexec-tools
+multipath-tools
+
+# initrd helpers
+make-initrd-devmapper
+make-initrd-mdadm
+make-initrd-lvm
+make-initrd-multipath
+make-initrd-nfs
--- a/pkg.in/lists/xorg
+++ b/pkg.in/lists/xorg
@@ -10,13 +10,12 @@ xorg-drv-modesetting
 xorg-drv-multimedia
 xorg-drv-nouveau
 xorg-drv-nv
-xorg-drv-s3
+#xorg-drv-s3
 xorg-drv-s3virge
 xorg-drv-savage
 xorg-drv-sis
 xorg-drv-synaptics
 xorg-drv-vesa
-xorg-drv-video
 xorg-drv-void
 xorg-drv-qxl

@@ -24,6 +23,7 @@ xorg-drv-qxl
 xorg-dri-intel

 xauth
+
 xorg-utils

 x-cursor-theme-jimmac
--- a/sub.in/stage1/modules
+++ b/sub.in/stage1/modules
@@ -168,7 +168,7 @@ qlogicfas408.ko
 qlogicfas.ko
 qlogicfc.ko
 qlogicisp.ko
-r8169.ko
+r8168.ko
 raid_class.ko
 reiserfs.ko
 rrunner.ko
Author	SHA1	Message	Date
Michael Shigorin	890172bfed	0.9.10-alt1 - fonts: axios!	2013-03-18 16:37:00 +02:00
Michael Shigorin	88e2dcdcee	live.mk: drop efi support for kiosk base target UEFI means quite a chunk of additional packages that aren't really required for the base target aimed at presumably minimalistic images.	2013-03-18 16:37:00 +02:00
Michael Shigorin	9e3ca09dd4	conf.d/live.mk: firefox/chromium kiosk support As implemented in livecd-webkiosk-0.2.	2013-03-18 16:37:00 +02:00
Michael Shigorin	e4de48d477	xorg: re-added xorg-utils instead of its deps Thanks sem@ for restoring xorg-utils, things are good again :) (basically reverts `d1a6eed839`)	2013-03-18 16:37:00 +02:00
Michael Shigorin	e75e1f4458	ltsp += alterator-{standalone,ltsconf} Looks like the cause to temporarily omit these is irrelevant.	2013-03-18 16:36:59 +02:00
Michael Shigorin	cdf86ff1da	desktop.mk: the now-missing links Added sysklogd and udev-rule-generator-net there too; if someone needs to inherit a systemd based image from distro/.desktop-network don't break the existing behaviour please. Rebased tde flavours to .desktop-network as these were the actual target to fix.	2013-03-18 16:36:59 +02:00
Michael Shigorin	97e4d03a75	desktop.mk: fall back to std-def for now There's some peculiarity causing Sisyphus' initrd (namely led-ws and make-initrd{,-propagator} of today to die with this message while booting the resulting ISO: initrd: Running /scripts/pre/prepare/000-propagator FATAL ERROR IN INIT: mkdir I can't recover from this,please reboot manually and send bugreport.	2013-03-18 16:36:59 +02:00
Michael Shigorin	e37df0c72b	regular.mk: enable plymouth for gnustep flavour It might be in the base target if gdm3 weren't exposing bugs...	2013-03-18 16:36:59 +02:00
Michael Shigorin	a65d1c420c	regular.mk: added wmaker livecd-install button The setup has to be livecd-only thus made as a service, not a hook.	2013-03-18 16:36:59 +02:00
Michael Shigorin	d31a2ff745	regular.mk: initial regular-{wmaker,gnustep} Thanks aen@ for the whole pkglist and vast amounts of advice and inspiration; thanks real@ and kostyalamer for the packages themselves.	2013-03-18 16:36:59 +02:00
Michael Shigorin	f4844483b9	x11: added generic sugar ...and introduced regular-sugar flavour immediately, it's rather working by now.	2013-03-18 16:36:59 +02:00
Michael Shigorin	0e01a08378	initial desktop+sugar pkglist Now waiting for the package base to stabilize...	2013-03-18 16:36:59 +02:00
Michael Shigorin	c5642bfb67	base+live: added fdisk It's required by make-initrd-propagator in "rw slice" mode when the remainder of an USB Flash drive is prepared and used for persistent storage; fdisk is also immensely useful in general.	2013-03-18 16:36:59 +02:00
Michael Shigorin	be7507a9c4	firmware: dropped firmware-carl9170 It's been merged into recent firmware-linux, apparently.	2013-03-18 16:36:59 +02:00
Michael Shigorin	9c766cd9e4	live: temporary #28669 workaround (drop fbdev) Please see the bug for explanations; too bad I chose to limit this workaround to experimental gnustep image yesterday when aen@ suggested to apply it universally...	2013-03-18 16:36:59 +02:00
Michael Shigorin	d3b9d7578a	desktop+razorqt: s/arora/qupzilla/ Arora is long unsupported and left known buggy (#26937); QupZilla is alive and kickin', on the other hand.	2013-03-18 16:36:59 +02:00
Michael Shigorin	19eb870338	regular.mk: pull desktop+regular in too Whoops, and I was mildly wondering where are alterator modules... thanks Speccyfighter again for bringing attention to the issue which has turned out to be ultimately caused by an overlooked bit being missing.	2013-03-18 16:36:33 +02:00
Michael Shigorin	07ac06abda	desktop+regular: added alterator-{x11,xkb} Added xkb module as per Speccyfighter's request on the forum and x11 one due to aen@'s advice (which is fairly reasonable).	2013-03-13 02:42:48 +04:00
Michael Shigorin	03ea74647f	rescue+extra: added fatresize too The real issue was that regular-tde.iso was discovered to lack FAT support in alterator-vm (known as #28470); as the filesystem specific packages are pulled in via rescue lists let's add it here along with dosfstools. Thanks Speccyfighter at forum.altlinux.org for spotting this.	2013-03-13 02:29:23 +04:00
Michael Shigorin	d1a6eed839	xorg: dropped xorg-drv-video, xorg-utils 1.14 package set doesn't provide these convenient metapackages anymore, unfortunately.	2013-03-12 13:15:23 +04:00
Michael Shigorin	27c49b2599	regular+kde4: keep synaptic-usermode outside As zerg@ noted there's synaptic-kde already; I managed to overlook that synaptic-usermode still gets into kde4 image as it's put into base+regular pkglist. Thanks aen@ for spotting.	2013-03-11 12:28:30 +02:00
Michael Shigorin	97816c354a	ltsp: switch to led-ws on both x86 arches The mechanics were simple and funny but having unified kernel available is even better ;-)	2013-03-10 19:02:27 +02:00
Michael Shigorin	937a80015a	xorg: dropped xorg-drv-s3 (no more in 1.14) I've got some Trio64 cards, even...	2013-03-10 19:02:26 +02:00
Michael Shigorin	0fe3eed725	desktop.mk, server.mk: added use/stage2/net-eth ...so that enp0s3 is just not there.	2013-03-10 19:02:26 +02:00
Michael Shigorin	28e3cf21ef	regular.mk: added hdt to rescue It was proposed by someone and looks pretty reasonable.	2013-03-10 19:01:34 +02:00
Michael Shigorin	c6d9cae4b1	regular.mk: added graphics branding to base Sort of unification; still the background of the regular builds should rather be the particular DE's authentic one in the ideal case.	2013-03-10 18:59:48 +02:00
Michael Shigorin	dcdd444f61	rescue+misc: added make-initrd-* plymouth helper omitted as it's not mission critical usually.	2013-03-06 01:21:03 +02:00
Michael Shigorin	0f77f9749d	base+rescue: added apt-repo apt-get is requisite for a network-enabled livecd with rw overlay since it's almost universal then.	2013-03-06 01:21:03 +02:00
Michael Shigorin	92fb8bd361	rescue: add security related pkglists as well It's currently security+extra.	2013-03-06 01:21:03 +02:00
Michael Shigorin	1f94112e7f	initial rescue+misc Things that weren't fit in the other rescue pkglists went here; more are sure to follow.	2013-03-06 01:21:03 +02:00
Michael Shigorin	0c6cfd855e	rescue: added server+network It happens to hold a noticeable share of what might go into rescue+misc, so why duplicate.	2013-03-06 01:21:03 +02:00
Michael Shigorin	a860b1792e	rescue+{extra,fs}: facelift and exchange Quite a few filesystem specific tools and utilities went into extra, some of them pulled back from fs since the proper categorization will clearly require even more effort. Added utilities for: f2fs, nilfs, logfs, reiser4fs, clicfs, cloop, ocfs2, exofs, zfs, cifs.	2013-03-06 01:21:03 +02:00
Michael Shigorin	32cc9a67dd	live, stage2: net-eth moved It would be better to put it into stage2 in the first place but this somehow went over my head; rescue made a reminder.	2013-03-06 01:21:03 +02:00
Michael Shigorin	07d58b91cc	regular.mk: introduced regular-rescue This one was just asking to be built for quite a long time; http://sourceforge.net/apps/trac/smartmontools/wiki/LiveCDs specifically accenting use of smartmontools 6.0 has finally persuaded me to roll out yet another rescue livecd, that is on the regular basis.	2013-03-06 01:20:59 +02:00
Michael Shigorin	546fae5961	rescue: extended firmware support As the firmware feature got more involved, this one has successfully dodged the change but is amended now.	2013-03-06 01:20:37 +02:00
Michael Shigorin	50dccfc04d	firmware: added "full" target The reason is to contain the implementation details within this feature while adding the ability to include everything it can provide (e.g., for rescue images).	2013-03-06 01:20:37 +02:00
Michael Shigorin	12206fbbd3	regular.mk: generalize infinality font setup It's been delegated to a fonts subfeature.	2013-03-06 01:20:37 +02:00
Michael Shigorin	fa96c6be18	fonts: added infinality fontconfig setup support Thanks cow@ for both the packages and suggestion.	2013-03-06 01:20:37 +02:00
Michael Shigorin	4657181828	regular.mk: kde4 font setup KDE4 is maintained by zerg@ as well as the vast RM experience connected to it; so use/fonts/zerg there.	2013-03-06 01:20:37 +02:00
Michael Shigorin	5f44404182	initial fonts feature This includes an updated version of 50-fontconfig script which actually works (the preliminary one attached to #28612 didn't); thanks zerg@ and cow@ for providing the incentive to introduce it. Based on m-p-d and installer-feature-kdesktop-fontconfig.	2013-03-06 01:20:37 +02:00
Michael Shigorin	e03f103169	vmguest: fix targets Thanks make(1) for the warning, `vmguest' target was getting pulled in twice indeed.	2013-03-06 01:20:37 +02:00
Michael Shigorin	96ecdc90df	regular.mk: added NM to lxde ...by popular demand, see also http://forum.altlinux.org/index.php/topic,28619.html	2013-03-06 01:20:36 +02:00
Michael Shigorin	ee52093576	base+regular: dropped uvcview Forum feedback has shown that it's a bit surprising given the lack of other multimedia applications in baseline package set; aen@ suggested to leave it out and hardware support testing requires much more than that anyways.	2013-03-06 01:20:36 +02:00
Michael Shigorin	35689d158d	stage1: replace r8169 with r8168 The issue is that r8169 is rather broken nowadays while r8168 tends to work on the same hardware; see also #28473. Thanks zerg@ for having hinted that it's stage1 modules, not the root squashfs.	2013-03-06 01:20:36 +02:00
Michael Shigorin	83705cd8ab	regular-kde4: refactored and extended pkglist The metapackage was fine, the "only one" additional package was more or less okay, but there came a dozen more so it's now reasonable to stash these into a separate pkglist.	2013-03-06 01:20:36 +02:00
Michael Shigorin	4e56d663f5	desktop+lxde+extra: put both terminal emulators in ...so that the benefits and shortcomings of each "as is" in Sisyphus are more obvious.	2013-03-06 01:20:36 +02:00
Michael Shigorin	240907f533	regular.mk: added fontconfig-infinality to lxde ...and refactored its use in cinnamon image too; this isn't a permanent solution though, slated to move into fonts feature. Thanks gns@ for suggestion.	2013-03-06 01:20:36 +02:00
Michael Shigorin	57ddb85d5b	desktop+lxde: minor tweaks Thanks aen@ for figuring these out and suggesting them.	2013-03-06 01:20:36 +02:00
Michael Shigorin	8f48544d94	regular.mk: merged regular-deepsolver into regular-icewm There isn't much sense to keep an entirely separate flavour as deepsolver starts being actually useful and icewm is a somewhat special flavour for those who know their ways around Linux plumbing.	2013-03-06 01:20:34 +02:00
Michael Pozhidaev	f52eecc8db	Distro target set changes: - regular-deepsolver.iso target is added using regular-icewm.iso as a base.	2013-03-05 18:55:58 +07:00
Michael Shigorin	b86a4f8f1c	gear-store-tags	2013-02-26 01:00:30 +04:00