From 80d01ddf8a454770b8d3be08b8f8b82b89fe1105 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 4 Jan 2014 22:15:58 +0100 Subject: add mga4-beta2 configs --- config/auto_inst.cfg.pl | 20 ++++++++++++-------- config/live.cfg | 30 ++++++++++++++++++++---------- config/settings-livecd.cfg | 5 +++-- 3 files changed, 35 insertions(+), 20 deletions(-) (limited to 'config') 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', diff --git a/config/live.cfg b/config/live.cfg index d1f9a2a..b25c26f 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -41,7 +41,7 @@ my $_l = { ), # fix gnome-shell not showing draklive-install and register icons on desktop in live mode if_($live->{settings}{desktop} eq 'GNOME', - #[ 'files/draklive-install.desktop', '/home/live/Desktop/draklive-install.desktop', { mode => 0755, no_install => 1 } ], + #[ 'files/draklive-install.desktop', '/usr/share/applications/mageia-draklive-install.desktop', { mode => 0755, no_install => 1 } ], [ 'files/register.desktop', '/usr/share/applications/register.desktop', { mode => 0644 } ], [ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ], ), @@ -49,7 +49,7 @@ my $_l = { [ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ], # lock bluedevil, radeon-firmware, kernel-firnware-nonfree - #[ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ], + [ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ], # shorewall fixes #[ 'files/shorewall-interfaces', '/etc/shorewall/interfaces', { mode => 0644 } ], @@ -63,7 +63,7 @@ my $_l = { [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ], ), # default to grub legacy - #[ 'files/bootloader.pm', '/usr/lib/libDrakX/bootloader.pm', { mode => 0644 } ], + [ 'files/bootloader.pm', '/usr/lib/libDrakX/bootloader.pm', { mode => 0644 } ], # disable suspend and hibernate in live mode [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ], #- make cups the default spooler @@ -85,14 +85,14 @@ my $_l = { [ 'files/draklive-install.d/remove.d/disable-speedboot', '/etc/draklive-install.d/remove.d/disable-speedboot', { mode => 0644 } ], # copy mgalive fix for installer progress bar - [ 'files/90mgalive/mgalive-root.sh', '/usr/lib/dracut/modules.d/90mgalive/mgalive-root.sh', { mode => 0755 } ], - [ 'files/90mgalive/module-setup.sh', '/usr/lib/dracut/modules.d/90mgalive/module-setup.sh', { mode => 0755 } ], - [ 'files/draklive-install', '/usr/sbin/draklive-install', { mode => 0755 } ], + #[ 'files/90mgalive/mgalive-root.sh', '/usr/lib/dracut/modules.d/90mgalive/mgalive-root.sh', { mode => 0755 } ], + #[ 'files/90mgalive/module-setup.sh', '/usr/lib/dracut/modules.d/90mgalive/module-setup.sh', { mode => 0755 } ], + #[ 'files/draklive-install', '/usr/sbin/draklive-install', { mode => 0755 } ], if_($live->{settings}{desktop} eq 'KDE4', [ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ]), #if_($live->{settings}{desktop} eq 'GNOME', - # [ 'files/draklive-install.d/run.d/gsettings.sh', '/etc/draklive-install.d/run.d/gsettings.sh', { mode => 755 } ]), + #[ 'files/draklive-install.d/run.d/gsettings.sh', '/etc/draklive-install.d/run.d/gsettings.sh', { mode => 755 } ]), #- sysconfig files for first boot [ $live->{settings}{media} eq 'usb' ? "files/finish-install.$live->{settings}{media}" : @@ -275,14 +275,19 @@ my $_l = { media => { storage => 'cdrom', bootloader_timeout => 10, - boot_entries => [ "" => "", "linux" => " install", "harddisk" => "" ], + boot_entries => [ "" => "", "linux" => " install", "safe" => "", "harddisk" => "" ], if_($live->{settings}{product} =~ /LiveCD/i, source => build_one_label($live), pre => [ 'for i in seq 1 5; do showlabels --removable | grep '.build_one_label($live).'; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ], extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ], files => [ if_($live->{settings}{arch} eq 'x86_64', - [ 'files/UEFI/*', '' ], + if_($live->{settings}{desktop} eq 'KDE4', + [ 'files/UEFI/KDE4/*', '' ], + ), + if_($live->{settings}{desktop} eq 'GNOME', + [ 'files/UEFI/GNOME/*', '' ], + ), ), # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], @@ -295,7 +300,12 @@ my $_l = { extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ], files => [ if_($live->{settings}{arch} eq 'x86_64', - [ 'files/UEFI/*', '' ], + if_($live->{settings}{desktop} eq 'KDE4', + [ 'files/UEFI/KDE4/*', '' ], + ), + if_($live->{settings}{desktop} eq 'GNOME', + [ 'files/UEFI/GNOME/*', '' ], + ), ), # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg index fb004bc..2deff2f 100644 --- a/config/settings-livecd.cfg +++ b/config/settings-livecd.cfg @@ -1,16 +1,17 @@ #repository=/distrib/mageia/distrib/cauldron repository=/home/bcd/build_bcd/pieces/cauldron +#repository=/home/draklive/distrib/cauldron # updates_repository=/distrib/mageia/distrib/cauldron # updates_repository=/home/bcd/build_bcd/pieces/cauldron additional_repository= arch=i586 desktop=KDE4 media=DVD -region=all +region=int pack= name=Mageia product=LiveDVD -version=4-beta1 +version=4-beta2 commercial=0 default_user=live builddir=/home/draklive/var-data/build -- cgit v1.2.1