From d8cbd172136509f0c3eecd2a3b2ebd61f94830cb Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 25 Feb 2017 18:21:10 +0000 Subject: auto_inst.cfg.pl: revised package selection. - add task-xfce4, manatools, and gparted on Xfce DVDs - skip gnome-builder (requires devel packages which we skip) - explicitly skip the dkms-broadcom-wl package --- config/auto_inst.cfg.pl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index d2bf390..bed7dc6 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -86,10 +86,10 @@ $o = { # no devel packages on live media 'glibc-devel', 'gdb', 'gcc', 'gcc3.3', 'dkms', - 'empathy', # pulls devel stuff + 'empathy', 'gnome-builder', # pulls devel stuff # shipped in live nonfree repo - '/^broadcom-wl-/', + 'dkms-broadcom-wl', 'broadcom-wl-common', 'broadcom-bcma-config', 'broadcom-ssb-config', '/^x11-driver-video-fglrx/', '/^x11-driver-video-nvidia/', @@ -172,6 +172,12 @@ $o = { 'task-plasma5', 'sddm', # sometimes gets nuked during build 'manatools-qt' # take new tools for a spin ), + # Xfce specific stuff + if_($has_xfce, + 'task-xfce4', + 'manatools-gtk', # take new tools for a spin + 'gparted', # provides some options not currently supported in diskdrake + ), ], 'preferred_packages' => join(',', $has_plasma ? 'sddm' : 'gdm'), -- cgit v1.2.1