diff options
Diffstat (limited to 'config/auto_inst.cfg.pl')
| -rw-r--r-- | config/auto_inst.cfg.pl | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 9a1f6cd..350e8c1 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -199,8 +199,8 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-*-desktop-/', '/^nvidia-current-kernel-*-desktop-/', '/^nvidia304-kernel-*-desktop-', '/^nvidia173-kernel-*-desktop-/', '/^vboxadditions-kernel-*-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-*-server-/', '/^nvidia-current-kernel-*-server-/', '/^nvidia304-kernel-*-server-/', '/^nvidia173-kernel-*-server-/', '/^vboxadditions-kernel-*-server-/', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3.12.3-desktop-/', '/^nvidia-current-kernel-3.12.3-desktop-/', '/^nvidia304-kernel-3.12.3-desktop-', '/^nvidia173-kernel-3.12.3-desktop-/', '/^vboxadditions-kernel-3.12.3-desktop-/'), + '/^kernel-server-/', '/^fglrx-kernel-3.12.3-server-/', '/^nvidia-current-kernel-3.12.3-server-/', '/^nvidia304-kernel-3.12.3-server-/', '/^nvidia173-kernel-3.12.3-server-/', '/^vboxadditions-kernel-3.12.3-server-/', '/^broadcom-wl-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'), @@ -222,6 +222,10 @@ $o = { 'audacity', 'broadcom-bcma-config', 'broadcom-ssb-config', + + + # uClibc & co +# 'uClibc', 'libuClibc0.9.30.3', 'libuClibc-zlib1', 'lib64uClibc0.9.30.3', 'lib64uClibc-zlib1', if_($ENV{DRAKLIVE_REGION} eq 'int', 'ardour', 'ardour3', 'lftp', 'lm_sensors', 'kscd', 'tvtime', 'kamera', '/^plasma-applet-system-monitor-/', 'dragon', 'k3b', ), ], @@ -233,15 +237,15 @@ $o = { if_($has_moblin, 'task-moblin'), # do we still need ? - #if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'), - #if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'), + if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'), + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'), if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest', 'nvidia173-kernel-desktop586-latest', 'vboxadditions-kernel-desktop586-latest'), if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'nvidia173-kernel-desktop-latest', 'vboxadditions-kernel-desktop-latest', 'gummiboot'), - 'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia173', 'x11-driver-video-nvidia304', 'x11-driver-video-vboxvideo', - - 'basesystem', 'bluez-firmware', 'mageiawelcome', + 'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia304', 'x11-driver-video-nvidia173', 'x11-driver-video-vboxvideo', + 'basesystem', + 'bluez-firmware', 'mageiawelcome', 'usbutils', # we want lsusb 'shared-mime-info', # needed for .desktop files to work atleast in gnome 'dmraid', 'mdadm', 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch', @@ -254,7 +258,7 @@ $o = { if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'), - if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', ),#, 'ibus-ui-gtk3'), + if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', 'gnome-classic-session',),#, 'ibus-ui-gtk3'), if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i, 'samba-client', |