diff options
Diffstat (limited to 'config/build.cfg')
| -rw-r--r-- | config/build.cfg | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/config/build.cfg b/config/build.cfg index a6d5ca4..7cf2dcd 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -103,7 +103,6 @@ my $_l = { # mageia specific 'mageiawelcome', # nice helper app 'mageia-doc-mcc-en', # some nice docs - 'grub2-mageia-theme', # Gnome specific stuff if_($has_gnome, @@ -138,22 +137,15 @@ my $_l = { # no server kernels '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/', - # no legacy bootloaders, we default to grub2 - 'grub', 'lilo', - - # no efi stuff - only needed for install, and shipped in live core repo - 'grub2-efi', 'efibootmgr', 'efivar', + # No bootloaders, but we need to keep one to satisfy basesystem requirements. + # We will zap it later. The grub2 bootloaders are needed for install, so we + # add them to the local repo, which means they are automatically excluded. + 'grub', # no devel packages on live media - 'glibc-devel', 'gdb', 'gcc', 'gcc3.3', 'dkms', + 'gdb', 'gcc3.3', 'empathy', 'gnome-builder', # pulls devel stuff - # shipped in live nonfree repo - 'dkms-broadcom-wl', 'broadcom-wl-common', - 'broadcom-bcma-config', 'broadcom-ssb-config', - '/^x11-driver-video-fglrx/', - '/^x11-driver-video-nvidia/', - # huge deps 'denemo', # pulls in lilypond and texlive 'virtuoso-opensource', # not needed on live media @@ -189,6 +181,21 @@ my $_l = { if_($has_plasma, 'sddm'), 'gdm', ], + local_repo_packages => [ + # core + 'broadcom-bcma-config', + 'broadcom-ssb-config', + 'dkms', + 'efibootmgr', 'efivar', + 'grub2', 'grub2-efi', 'grub2-mageia-theme', + if_($arch eq 'i586', 'kernel-desktop586-devel-latest'), + if_($arch eq 'x86_64', 'kernel-desktop-devel-latest'), + # nonfree + 'dkms-broadcom-wl', + 'dkms-nvidia304', 'x11-driver-video-nvidia304', + 'dkms-nvidia340', 'x11-driver-video-nvidia340', + 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', + ], post_install_nr => join(";", "cp /tmp/media/$arch/release-notes.* /mnt", @@ -249,14 +256,6 @@ my $_l = { [ 'files/live.51-mageia-resume.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ], [ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ], - # add local repos - if_($arch eq 'i586', - [ 'files/mga_rpms/i586/mga_rpms', '/var/local' ], - ), - if_($arch eq 'x86_64', - [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local' ], - ), - # add initial dns resolver for online medias [ 'files/resolv.conf', '/etc/resolv.conf', { mode => 0644 } ], @@ -363,15 +362,11 @@ my $_l = { "ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak", ), - # add local medias - "urpmi.addmedia -q 'Live Core' /var/local/mga_rpms/core with media_info/hdlist.cz", - "urpmi.addmedia -q 'Live Nonfree' /var/local/mga_rpms/nonfree with media_info/hdlist.cz", - # disable HPLIP systray startup "echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop", - # remove pre-installed grub2, we need to be able to select grub2 vs grub2-efi at install time - "rpm -e --nodeps grub2", + # remove pre-installed lilo, we don't need it + "rpm -e --nodeps lilo", # allow draklive-install to spawn subtasks that access the display "echo 'session optional pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1", |