diff options
author | Thomas Backlund <tmb@mageia.org> | 2014-01-04 20:39:28 +0100 |
---|---|---|
committer | Thomas Backlund <tmb@mageia.org> | 2014-01-04 20:39:28 +0100 |
commit | b67df736b3443c0b0841c8da7f15ad5643ce8ca3 (patch) | |
tree | 07d37215c77e66608074c502e7683b317c19abd5 /config | |
parent | d090a8b3f9982f928435fdb444ddb7a870349490 (diff) | |
download | draklive-config-b67df736b3443c0b0841c8da7f15ad5643ce8ca3.tar draklive-config-b67df736b3443c0b0841c8da7f15ad5643ce8ca3.tar.gz draklive-config-b67df736b3443c0b0841c8da7f15ad5643ce8ca3.tar.bz2 draklive-config-b67df736b3443c0b0841c8da7f15ad5643ce8ca3.tar.xz draklive-config-b67df736b3443c0b0841c8da7f15ad5643ce8ca3.zip |
add mga3 final build configs
Diffstat (limited to 'config')
-rw-r--r-- | config/auto_inst.cfg.pl | 46 | ||||
-rw-r--r-- | config/live.cfg | 46 | ||||
-rw-r--r-- | config/settings-livecd.cfg | 2 |
3 files changed, 77 insertions, 17 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 8224b7d..29d4a73 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -83,10 +83,10 @@ $o = { 'imagemagick', 'kipi-plugins-batchprocess', 'kipi-plugins-dngconverter', 'fonts-ttf-decoratives', ), - 'lib64atlas3-x86_64', + '/^lib64atlas3-/', ), if_($ENV{DRAKLIVE_ARCH} eq 'i586', - 'libatlas3-sse3'), + '/^libatlas3-/',), if_($ENV{DRAKLIVE_PRODUCT} !~ /gaming/i, #- non-DVD products #- from task-kde Suggests @@ -103,10 +103,10 @@ $o = { 'nepomuk-scribo', # need space on kde disks - 'kdepim4-core', 'kaddressbook', 'knode', 'knotes', 'kontact', 'korganizer', 'nepomuk', 'soprano-plugin-virtuoso', + 'kdepim4-core', 'kaddressbook', 'knode', 'knotes', 'kontact', 'korganizer', 'nepomuk', 'kipi-plugins-piwigoexport', 'kipi-plugins-kopete', 'kipi-plugins-panorama', 'kipi-plugins-vkontakte', 'kipi-plugins-yandexfotki', 'kipi-plugins-smug', 'kipi-plugins-shwup', 'kipi-plugins-flashexport', - 'kopete', + 'kopete', 'kactivitymanagerd-nepomuk-plugin', 'kipi-plugins-expoblending', # pulls in hugin 'enblend', @@ -144,7 +144,6 @@ $o = { 'libreoffice-base', '/^nvidia.*-doc-html/', if_($has_kde4, - 'k3b', 'liblm_sensors3', 'xpdf-common', 'htdig', 'mirrordir', 'acr38u', 'ekiga', 'kdeaccessibility4', @@ -168,11 +167,11 @@ $o = { ), #- bluez-pin provide - if_(!$has_kde4, 'kbluetooth'), + if_(!$has_kde4, 'kbluetooth'),# 'plasma-applet-kimpanel-backend-ibus'), if_(!$has_kde4, 'compiz-decorator-kde4'), #- provides compiz-decorator if_(!$has_kde4, 'pinentry-qt4'), #- qt4 app - 'kdebase-kate', 'kdeaddons-kate', #- development tool + #'kdebase-kate', 'kdeaddons-kate', #- development tool '/noatun/', #- prefer amarok 'rxvt', @@ -199,9 +198,9 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/'), - '/^kernel-netbook-/', - '/^kernel-server-/', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', 'fglrx-kernel-3.8.13-desktop-1.mga3', 'nvidia-current-kernel-3.8.13-desktop-1.mga3', 'nvidia304-kernel-3.8.13-desktop-1.mga3', 'nvidia173-kernel-3.8.13-desktop-1.mga3', 'vboxadditions-kernel-3.8.13-desktop-1.mga3'), + '/^kernel-server-/', 'fglrx-kernel-3.8.13-server-1.mga3', 'nvidia-current-kernel-3.8.13-server-1.mga3', 'nvidia304-kernel-3.8.13-server-1.mga3', 'nvidia173-kernel-3.8.13-server-1.mga3', 'vboxadditions-kernel-3.8.13-server-1.mga3', + '/^broadcom-wl-/', # not needed anymore (mga #2001) 'nspluginwrapper', @@ -209,6 +208,19 @@ $o = { #- no distribution license 'flash-player-plugin', + + # xguest sucks + 'xguest', + + # not wanted (mga #9752) + 'al-anvar', + + # broken + 'audacity', + + 'broadcom-bcma-config', 'broadcom-ssb-config', + + if_($ENV{DRAKLIVE_REGION} eq 'int', 'ardour', 'ardour3', 'lftp', 'lm_sensors', 'kscd', 'tvtime', 'kamera', '/^plasma-applet-system-monitor-/', 'dragon', 'k3b', ), ], 'default_packages' => [ if_($has_kde4, "$distro_config-kde4-config"), @@ -217,18 +229,24 @@ $o = { if_($has_moblin, 'task-moblin'), - 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', 'fglrx-kernel-3.8.13-desktop586-1.mga3', 'nvidia-current-kernel-3.8.13-desktop586-1.mga3', 'nvidia304-kernel-3.8.13-desktop586-1.mga3', 'nvidia173-kernel-3.8.13-desktop586-1.mga3', 'vboxadditions-kernel-3.8.13-desktop586-1.mga3'), + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0', 'fglrx-kernel-3.8.13-desktop-1.mga3', 'nvidia-current-kernel-3.8.13-desktop-1.mga3', 'nvidia304-kernel-3.8.13-desktop-1.mga3', 'nvidia173-kernel-3.8.13-desktop-1.mga3', 'vboxadditions-kernel-3.8.13-desktop-1.mga3', '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', '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', + 'mageia-doc-mcc-en', + + if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', ), + #- live resize/install/copy tools if_($ENV{DRAKLIVE_MEDIA} eq 'usb', 'draklive-resize'), if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'), - if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3'), + if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted',),#, 'ibus-ui-gtk3'), if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i, 'samba-client', diff --git a/config/live.cfg b/config/live.cfg index 3f9ff82..b824763 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -45,6 +45,21 @@ my $_l = { [ 'files/register.desktop', '/home/live/Desktop/register.desktop', { mode => 0755 } ], [ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ], ), + # blacklist pata_acpi + [ '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 } ], + + # add local repos + if_($live->{settings}{arch} eq 'i586', + [ 'files/mga_rpms/i586/mga_rpms', '/var/local/mga_rpms' ], + ), + if_($live->{settings}{arch} eq 'x86_64', + [ '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 } ], # 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 @@ -65,6 +80,10 @@ my $_l = { #- disable speedboot for first boot after disk installation [ '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/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 } ]), #- sysconfig files for first boot @@ -175,7 +194,7 @@ my $_l = { #- FIXME: test with live USB r/w #"chrpath -d /usr/lib/ooo-${ooo_version}/program/soffice.bin", #- workaround rpm bug that leaves a corrupted rpm DB in chroot - "rm -f /var/lib/rpm/__db.*", + #"rm -f /var/lib/rpm/__db.*", "rm -f /.readahead_collect", #- adduser seems to create a sparse lastlog with a slot for all available users #- which can be huge @@ -196,6 +215,13 @@ my $_l = { #), "d=/var/lib/flash-player-plugin/; [ -d \$d ] && rm -f \$d/*.rpm", + + # add local medias + "urpmi.addmedia 'Live Core' /var/local/mga_rpms/core with media_info/hdlist.cz", + "urpmi.addmedia 'Live Nonfree' /var/local/mga_rpms/nonfree with media_info/hdlist.cz", + + #grub2 + "urpmi --auto grub2 ||:", ), additional_media => [ if_($live->{settings}{updates_repository}, @@ -224,7 +250,7 @@ my $_l = { }, regions => { #- the "all" region has a magical behavior and selects all langs - int => [qw(de en es fr it pl pt_BR ru)], + int => [qw(en)], guadec => [qw(de en es fr it nb nn nl pl pt_BR ro ru tr)], 'Europe-Americas' => [qw(bg cs da de el en es et fi fr hr hu it ky lt lv nb nl nn no pl pt pt_BR ro ru sv tr uk uz)], #'africa-asia' => [qw(de en es fr it nb nn nl pl pt_BR ro ru tr ar he hi id ko ms zu ja zh_CN zh_TW)], @@ -248,6 +274,22 @@ my $_l = { 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/*', '' ], + ), + # FIXME: add doc and autorun + #[ 'extra/livecd/autorun/*', ''], + #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) + ], + ), + if_($live->{settings}{product} =~ /LiveDVD/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/*', '' ], + ), # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg index 46b260c..04e1d0b 100644 --- a/config/settings-livecd.cfg +++ b/config/settings-livecd.cfg @@ -10,7 +10,7 @@ region=int pack= name=Mageia product=LiveCD -version=3-alpha3 +version=3 commercial=0 default_user=live builddir=/home/draklive/var-data/build |