only block fglrx on Gnome media

4 files changed, 77 insertions, 7 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 854f4ae..5b19745 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -198,9 +198,10 @@ $o = {
            'mono',
 
 	   # block the kernels we dont want
-	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.19\.8-desktop-/', '/^nvidia340-kernel-3\.19\.8-desktop-', '/^nvidia304-kernel-3\.19\.8-desktop-', '/^vboxadditions-kernel-3\.19\.8-desktop-/'),
-           '/^kernel-server-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.19\.8-server-/', '/^nvidia340-kernel-3\.19\.8-server-/', '/^nvidia304-kernel-3\.19\.8-server-/', '/^vboxadditions-kernel-3\.19\.8-server-/',
-	   '/^broadcom-wl-/', 'x11-driver-video-fglrx',
+	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/',  '/^fglrx-kernel-3\.19\.8-desktop-/', '/^nvidia-current-kernel-3\.19\.8-desktop-/', '/^nvidia340-kernel-3\.19\.8-desktop-', '/^nvidia304-kernel-3\.19\.8-desktop-', '/^vboxadditions-kernel-3\.19\.8-desktop-/'),
+           '/^kernel-server-/', '/^fglrx-kernel-3\.19\.8-server-/', '/^nvidia-current-kernel-3\.19\.8-server-/', '/^nvidia340-kernel-3\.19\.8-server-/', '/^nvidia304-kernel-3\.19\.8-server-/', '/^vboxadditions-kernel-3\.19\.8-server-/',
+	   if_($has_gnome, '/^fglrx-kernel-3\.19\.8-desktop/', 'x11-driver-video-fglrx'),
+	   '/^broadcom-wl-/',
 
 	    if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'),
 
@@ -241,6 +242,12 @@ $o = {
            if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest',  'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest'),
            if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest',  'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'gummiboot'),
 
+	   if_(!$has_gnome,
+		if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest'),
+		if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest'),
+		'x11-driver-video-fglrx',
+	   ),
+
 	   'x11-server-common', 'x11-driver-video-vboxvideo', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia340', 'x11-driver-video-nvidia304',
 	   'basesystem', 'x11-driver-video', 'x11-driver-input',
 	   'bluez-firmware', 'mageiawelcome',
diff --git a/config/live.cfg b/config/live.cfg
index 0f6d1df..b156397 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -53,12 +53,23 @@ my $_l = {
             [ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ],
             
             # add local repos
-            if_($live->{settings}{arch} eq 'i586',
-        	[ 'files/mga_rpms/i586/mga_rpms', '/var/local/mga_rpms' ],
+	    if_($live->{settings}{desktop} eq 'GNOME',
+        	if_($live->{settings}{arch} eq 'i586',
+        	    [ 'files/mga_rpms/GNOME/i586/mga_rpms', '/var/local/mga_rpms' ],
+        	),
+        	if_($live->{settings}{arch} eq 'x86_64',
+        	    [ 'files/mga_rpms/GNOME/x86_64/mga_rpms', '/var/local/mga_rpms' ],
+        	),
             ),
-            if_($live->{settings}{arch} eq 'x86_64',
-        	[ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ],
+	    if_($live->{settings}{desktop} eq 'KDE4',
+        	if_($live->{settings}{arch} eq 'i586',
+        	    [ 'files/mga_rpms/KDE4/i586/mga_rpms', '/var/local/mga_rpms' ],
+        	),
+        	if_($live->{settings}{arch} eq 'x86_64',
+        	    [ 'files/mga_rpms/KDE4/x86_64/mga_rpms', '/var/local/mga_rpms' ],
+        	),
             ),
+
             # 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
diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/GNOME/update_media.sh
index 20c257d..20c257d 100755
--- a/files/mga_rpms/update_media.sh
+++ b/files/mga_rpms/GNOME/update_media.sh
diff --git a/files/mga_rpms/KDE4/update_media.sh b/files/mga_rpms/KDE4/update_media.sh
new file mode 100755
index 0000000..4ea00e2
--- /dev/null
+++ b/files/mga_rpms/KDE4/update_media.sh
@@ -0,0 +1,52 @@
+
+bcdmedia=/home/bcd/build_bcd/pieces/cauldron
+
+# create dirs if non-existant
+mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info
+
+# clean dirs
+rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm
+rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/*
+
+# add broadcom-wl
+cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-common*.rpm i586/mga_rpms/nonfree/
+cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/
+cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/
+
+cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-common-*.rpm x86_64/mga_rpms/nonfree/
+cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/
+cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/
+
+# add broadcom wireless configs
+cp $bcdmedia/i586/media/core/release/broadcom-*-config-*.rpm i586/mga_rpms/core/
+cp $bcdmedia/x86_64/media/core/release/broadcom-*-config-*.rpm x86_64/mga_rpms/core/
+
+# add grub2 stuff
+cp $bcdmedia/i586/media/core/release/grub2-2*.rpm i586/mga_rpms/core/
+cp $bcdmedia/i586/media/core/release/grub2-efi-2*.rpm i586/mga_rpms/core/
+cp $bcdmedia/i586/media/core/release/grub2-mageia-theme-*.rpm i586/mga_rpms/core/
+cp $bcdmedia/i586/media/core/release/os-prober-*.rpm i586/mga_rpms/core/
+cp $bcdmedia/i586/media/core/release/efibootmgr-*.rpm i586/mga_rpms/core/
+cp $bcdmedia/i586/media/core/release/efivar-*.rpm i586/mga_rpms/core/
+cp $bcdmedia/i586/media/core/release/libefivar0-*.rpm i586/mga_rpms/core/
+
+cp $bcdmedia/x86_64/media/core/release/grub2-2*.rpm x86_64/mga_rpms/core/
+cp $bcdmedia/x86_64/media/core/release/grub2-efi-2*.rpm x86_64/mga_rpms/core/
+cp $bcdmedia/x86_64/media/core/release/grub2-mageia-theme-*.rpm x86_64/mga_rpms/core/
+cp $bcdmedia/x86_64/media/core/release/os-prober-*.rpm x86_64/mga_rpms/core/
+cp $bcdmedia/x86_64/media/core/release/efibootmgr-*.rpm x86_64/mga_rpms/core/
+cp $bcdmedia/x86_64/media/core/release/efivar-*.rpm x86_64/mga_rpms/core/
+cp $bcdmedia/x86_64/media/core/release/lib64efivar0-*.rpm x86_64/mga_rpms/core/
+
+# add repo pubkeys
+cp $bcdmedia/i586/media/core/release/media_info/pubkey i586/mga_rpms/core/media_info/
+cp $bcdmedia/x86_64/media/core/release/media_info/pubkey x86_64/mga_rpms/core/media_info/
+
+cp $bcdmedia/i586/media/nonfree/release/media_info/pubkey i586/mga_rpms/nonfree/media_info/
+cp $bcdmedia/x86_64/media/nonfree/release/media_info/pubkey x86_64/mga_rpms/nonfree/media_info/
+
+# create hdlists
+genhdlist2 i586/mga_rpms/core
+genhdlist2 i586/mga_rpms/nonfree
+genhdlist2 x86_64/mga_rpms/core
+genhdlist2 x86_64/mga_rpms/nonfree