diff options
Diffstat (limited to 'config/build.cfg')
| -rw-r--r-- | config/build.cfg | 110 |
1 files changed, 12 insertions, 98 deletions
diff --git a/config/build.cfg b/config/build.cfg index 1ad2914..8163948 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -14,10 +14,6 @@ my $has_lxde = member('LXDE', @desktops); my $has_plasma = member('Plasma', @desktops); my $has_xfce = member('Xfce', @desktops); -my $distro_theme = 'Default'; -my $distro_release = 'Default'; -my $distro_config = lc($distro_release); - my $use_modules = to_bool($build->{settings}{pack}); my @user_config_dirs = ('/etc/skel', if_($default_user, '/home/' . $default_user)); @@ -56,7 +52,6 @@ my $_l = { qw(NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS), # network qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE), - qw(NETWORKING_REMOTE_ACCESS_SERVER), # config qw(CONFIG), # console @@ -72,48 +67,31 @@ my $_l = { compssListLevel => 5, include_packages => [ - if_($has_lxde, "mageia-lxde-config-$distro_release"), - - # i586 arch specific - if_($arch eq 'i586', - 'vboxadditions-kernel-desktop586-latest', - ), - - # x86_64 arch specific - if_($arch eq 'x86_64', - 'vboxadditions-kernel-desktop-latest', - ), - - # try to protect base packages from rpmlib/urpmi cascade bug - 'basesystem', 'x11-server-common','x11-driver-video', 'x11-driver-input', - 'x11-driver-video-vboxvideo', + if_($has_lxde, "mageia-lxde-config-Default"), # utils wanted - 'mc', 'btrfs-progs', 'shorewall-ipv6', 'hdparm', 'parted', 'glxinfo', 'patch', - 'bind-utils', 'mdadm', 'dmraid', 'usbutils', # we want lsusb - 'shared-mime-info', # needed for .desktop files to work atleast in gnome + 'mc', 'btrfs-progs', 'hdparm', 'patch', + 'bind-utils', 'mdadm', 'dmraid', 'vim-enhanced', # full ediitor 'dnf', 'dnf-plugins-core', # some users want dnf 'manatools', # just the ncurses version 'simple-scan', # s-c-p wants this if it detects a combined printer/scanner 'Xdialog', # provides nicer UI for lxcontrol - 'bluez-firmware', # missed firmware - # mageia specific - 'mageiawelcome', # nice helper app 'mageia-doc-mcc-en', # some nice docs # Gnome specific stuff if_($has_gnome, - 'task-gnome', 'gdm', # sometimes gets nuked during build - 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session', 'hexchat', + 'task-gnome', + 'gparted', # provides some options not currently supported in diskdrake + 'hexchat', # alternative IRC client 'adwaita-gtk2-theme', ), # Plasma specific stuff if_($has_plasma, - 'task-plasma5', 'sddm', # sometimes gets nuked during build + 'task-plasma5', ), # Xfce specific stuff @@ -126,12 +104,6 @@ my $_l = { # i586 arch specific if_($arch eq 'i586', '/^kernel-desktop-/', '/^vboxadditions-kernel-.*-desktop-/', - '/^libatlas3-/', - ), - - # x86_64 arch specific - if_($arch eq 'x86_64', - '/^lib64atlas3-/', ), # no server kernels @@ -142,27 +114,10 @@ my $_l = { # add them to the local repo, which means they are automatically excluded. 'grub', - # no devel packages on live media - 'gdb', 'gcc3.3', - 'empathy', 'gnome-builder', # pulls devel stuff - - # huge deps - 'denemo', # pulls in lilypond and texlive - 'virtuoso-opensource', # not needed on live media - 'mono', # bloat - # old stuff - 'aspell', 'aspell-en', - 'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader', - 'drakfax', 'efax', 'rxvt', - 'nspluginwrapper','nspluginwrapper-i386', # not needed anymore (mga #2001) - - # broken stuff - 'audacity', 'xguest', 'apper', + 'efax', # not wanted - 'al-anvar', # (mga #9752) - 'openssh-server', 'manatools-gui', #- no distribution license @@ -170,10 +125,8 @@ my $_l = { # Gnome specific stuff if_($has_gnome, - 'beagle', 'inkscape', - 'bluedevil', #- bluez-pin provide - 'pinentry-qt4', #- qt4 app - '/noatun/', #- prefer amarok + 'gnome-builder', + 'inkscape', # ??? 'polkit-kde-agent-1', ), ], @@ -197,19 +150,12 @@ my $_l = { 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', ], - post_install_nr => join(";", - "cp /tmp/media/$arch/release-notes.* /mnt", - "chmod 0644 /mnt/release-notes.*", - ), post_install => join(";", # systemd boots by default to multiuser.target (old init 3), so change to graphical (old init 5) "ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target", # have inittab match systemd defaulting to init 5 "perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' /etc/inittab", - - #- FIXME: in any::set_autologin, unlink if gdm/sddm conf file and binary exist - if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"), ), langs_always => [ 'en_US' ], @@ -231,7 +177,8 @@ my $_l = { # uncommon hardware qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd), # unneeded software - qw(chronyd ntpd snmpd), + qw(chronyd snmpd), + if_($has_gnome, qw(ntpd)), # slows down basic usage and install, reenabled after install qw(crond msec), ], @@ -259,16 +206,10 @@ my $_l = { # 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 - [ 'files/defaultspooler', '/etc/foomatic/defaultspooler', { mode => 0644 } ], - #- eject eject medium before halt/reboot [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644, no_install => 1 } ], [ 'files/halt.local', '/sbin/halt.local', { mode => 0755, no_install => 1 } ], - #- do not load usblp and trigger autosetupprintqueues in live since cups is not available - [ 'files/live.modprobe', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ], - # live media specific initrd [ 'files/live-dracut.conf', '/etc/dracut.conf.d/60-live.conf', { mode => 0644, no_install => 1 } ], @@ -281,11 +222,6 @@ my $_l = { # fix for sometimes wrong permissions [ 'files/draklive-install.d/run.d/home-live-permissions.sh', '/etc/draklive-install.d/run.d/home-live-permissions.sh', { mode => 755 } ], - # fix for /var/lib/gdm sometimes ending up as root:root - if_($has_gnome, - [ 'files/draklive-install.d/run.d/gdm-permissions.sh', '/etc/draklive-install.d/run.d/gdm-permissions.sh', { mode => 755 } ] - ), - if_($has_plasma, [ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ], [ 'files/draklive-install.d/remove.d/clear-sddm-state', '/etc/draklive-install.d/remove.d/clear-sddm-state', { mode => 0644 } ], @@ -296,14 +232,8 @@ my $_l = { [ 'files/draklive-install.d/firstboot', '/etc/draklive-install.d/sysconfig/firstboot', { mode => 0644 } ], [ 'files/draklive-install.d/services', '/etc/draklive-install.d/services', { mode => 0644 } ], - #- don't make kbluetoothrc display an annoying and useless popup window, and disable it by default - [ 'files/kbluetoothrc', '/etc/kde/kbluetoothrc', { mode => 0644 } ], - [ 'files/korgacrc', '/etc/kde/korgacrc', { mode => 0644 } ], (map { [ 'files/mgaonlinerc', $_ . '/.MgaOnline/mgaonline', { mode => 0644, no_install => 1 } ] } @user_config_dirs), - (map { [ 'files/draksnapshot.sysconfig', $_ . '/.draksnapshot', { mode => 0644, no_install => 1 } ] } @user_config_dirs), - [ 'files/compute-ooo-dicts.pl', '/usr/sbin/compute-ooo-dicts.pl', { mode => 0755 } ], - [ 'files/compute-i18n-list.pl', '/usr/sbin/compute-i18n-list.pl', { mode => 0755 } ], ], remove_files => [ (map { "/etc/modprobe.preload.d/$_" } qw(cpufreq pcmcia rfswitch)), @@ -329,13 +259,6 @@ my $_l = { "chown -R $default_user.$default_user /home/$default_user" ), - # remove readahead - "rm -f /.readahead_collect", - - #- adduser seems to create a sparse lastlog with a slot for all available users - #- which can be huge - '> /var/log/lastlog', - if_($has_gnome, # modify and compile schema to get draklive-install and Firefox in menu "sed -i 's/epiphany.desktop/firefox.desktop/' /usr/share/glib-2.0/schemas/glib2-branding.gschema.override", @@ -362,9 +285,6 @@ my $_l = { # disable HPLIP systray startup "echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop", - # 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", @@ -380,9 +300,6 @@ my $_l = { # set the initial wireless regulatory domain to "world", enabling # all possible wireless channels to be used. "sed -i -r 's/CRDA_DOMAIN=.*/CRDA_DOMAIN=00/' /etc/sysconfig/network", - - # try to avoid plymouth falling back to text mode (mga#19984) - "sed -i -r 's/DeviceTimeout=[0-9]+/DeviceTimeout=10/' /usr/share/plymouth/plymouthd.defaults", ), vga_mode => 788, @@ -392,9 +309,6 @@ my $_l = { type => 'squashfs', files => [ { path => '/root/drakx' }, - #- to skip a file list generated with: - #- find /usr/share/doc/HTML -mindepth 1 -maxdepth 1 -type d > /root/drakx/HTML.skipped - #{ source => '/root/drakx/HTML.skipped', rooted => 1 }, ], }, if_($use_modules, modules => [ |