Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_dev into testing

3 files changed, 32 insertions, 39 deletions

diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
index ed6ed9b..f03d321 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
@@ -54,31 +54,31 @@ ttf-ms-fonts
 
 #xorg-video-drivers
 #xf86-video-amd
-xf86-video-apm
-xf86-video-ark
-xf86-video-ati
-xf86-video-chips
-xf86-video-cirrus
+#::xf86-video-apm
+#::xf86-video-ark
+#::xf86-video-ati
+#::xf86-video-chips
+#::xf86-video-cirrus
 xf86-video-dummy
 xf86-video-fbdev
-xf86-video-glint
-xf86-video-i128
-xf86-video-i740
+#::xf86-video-glint
+#::xf86-video-i128
+#::xf86-video-i740
 #xf86-video-i810
 #xf86-video-imstt
 xf86-video-intel
-xf86-video-mga
-xf86-video-neomagic
-xf86-video-nv
-xf86-video-openchrome
+#::xf86-video-mga
+#::xf86-video-neomagic
+#::xf86-video-nv
+#::xf86-video-openchrome
 #xf86-video-radeonhd
-xf86-video-rendition
-xf86-video-s3
-xf86-video-s3virge
-xf86-video-savage
-xf86-video-siliconmotion
-xf86-video-sis
-xf86-video-sisusb
+#::xf86-video-rendition
+#::xf86-video-s3
+#::xf86-video-s3virge
+#::xf86-video-savage
+#::xf86-video-siliconmotion
+#::xf86-video-sis
+#::xf86-video-sisusb
 #xf86-video-tdfx
 xf86-video-trident
 xf86-video-tseng
@@ -90,7 +90,7 @@ xf86-video-vesa
 #xf86-video-vga
 #xf86-video-via
 xf86-video-vmware
-xf86-video-voodoo
+#::xf86-video-voodoo
 
 # X apps
 #luser
@@ -131,6 +131,8 @@ esound
 #Window Manager
 fluxbox
 feh
+alt_wm
+
 
 #Other
 dbus
@@ -156,16 +158,8 @@ avahi
 
 #Wireless
 b43-fwcutter
-#ipw2100-fw
-#ipw2200-fw
-#ipw3945
-#ipw3945-ucode
-#ipw3945d
-#madwifi
-#madwifi-utils
 ndiswrapper
 ndiswrapper-utils
-#netcfg
 tiacx
 tiacx-firmware
 wireless_tools
@@ -184,7 +178,7 @@ runit-scripts
 media_dirs
 
 #---
-tweaker
+#tweaker
 ethtool
 nfs-utils
 netkit-telnet-ssl
@@ -207,20 +201,14 @@ tablet-encode
 ntfs-3g
 joyutils
 ffmpeg-svn
-#myth2ipod
-#myt2xvid3 #--unsupported and doesn't work
-#mediaserv
 
 #---Firewire
 libraw1394
 libavc1394
+
 # wrapper for mplayer
 mplayer-wrapper
 
-# in-place commercial remover (for user job)
-# moved to linhes-scripts
-#removecommercials
-
 #Modules for Atheros base NICs
 #atl1e
 
@@ -233,3 +221,5 @@ windowmaker-crm-git
 xcursor-themes
 ceton
 ceton-scripts
+
+mythexport
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks
index 6ea3023..92d7346 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks
@@ -13,7 +13,7 @@ mythweb
 nfs-utils
 samba
 mplayer
-xine-ui
+#xine-ui
 lcdproc
 mythappletrailers
 mythstream
@@ -55,7 +55,10 @@ pyorbit
 pyrex
 startup-notification
 xulrunner
+supplemental-web
+#alt_wm
 #mythmovies
 #myth2ipod
 #myt2xvid3
 #mediaserv
+mythexport
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/menu.lst b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/menu.lst
index 8a8e3b2..0ecc2a7 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/menu.lst
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/menu.lst
@@ -37,13 +37,13 @@ hiddenmenu
 # (0) normal
 title  LinHes
 root   (hd0,0)
-kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit  console=tty1
+kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit vmalloc=192M console=tty1
 initrd /boot/kernel26.img
 
 # (1) bootsplash
 title  LinHes-splashy
 root   (hd0,0)
-kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet  vga=0x314 splash=silent,theme:linhes console=tty1
+kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit vmalloc=192M quiet  vga=0x314 splash=silent,theme:linhes console=tty1
 initrd /boot/kernel26.img
 
 # (2) noautologin