summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/auto_inst.cfg.pl14
-rwxr-xr-xfiles/mga_rpms/GNOME/update_media.sh14
-rwxr-xr-xfiles/mga_rpms/KDE4/update_media.sh2
3 files changed, 16 insertions, 14 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 42af535..5665f75 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -199,7 +199,9 @@ $o = {
# block the kernels we dont want
if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-4\.3\.0-desktop-/', '/^nvidia-current-kernel-4\.3\.0-desktop-/', '/^nvidia340-kernel-4\.3\.0-desktop-', '/^nvidia304-kernel-4\.3\.0-desktop-', '/^vboxadditions-kernel-4\.3\.0-desktop-/'),
'/^kernel-server-/', '/^fglrx-kernel-4\.3\.0-server-/', '/^nvidia-current-kernel-4\.3\.0-server-/', '/^nvidia340-kernel-4\.3\.0-server-/', '/^nvidia304-kernel-4\.3\.0-server-/', '/^vboxadditions-kernel-4\.3\.0-server-/',
- if_($has_gnome, '/^fglrx-kernel-4\.3\.0-desktop/', 'x11-driver-video-fglrx'),
+ #if_($has_gnome,
+ '/^fglrx-kernel-4\.3\.0-desktop/', 'x11-driver-video-fglrx',
+ #),
'/^broadcom-wl-/',
if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'),
@@ -238,11 +240,11 @@ $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',
- ),
+ #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',
diff --git a/files/mga_rpms/GNOME/update_media.sh b/files/mga_rpms/GNOME/update_media.sh
index 3dd617a..7b9c285 100755
--- a/files/mga_rpms/GNOME/update_media.sh
+++ b/files/mga_rpms/GNOME/update_media.sh
@@ -1,5 +1,5 @@
-bcdmedia=/home/bcd/build_bcd/pieces/5
+bcdmedia=/home/bcd/build_bcd/pieces/cauldron
# create dirs if non-existant
mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info
@@ -9,13 +9,13 @@ rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm
rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/*
# add fglrx drivers
-cp $bcdmedia/i586/media/nonfree/release/x11-driver-video-fglrx-*.rpm i586/mga_rpms/nonfree/
-cp $bcdmedia/i586/media/nonfree/release/fglrx-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/
-cp $bcdmedia/i586/media/nonfree/release/fglrx-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/
+#cp $bcdmedia/i586/media/nonfree/release/x11-driver-video-fglrx-*.rpm i586/mga_rpms/nonfree/
+#cp $bcdmedia/i586/media/nonfree/release/fglrx-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/
+#cp $bcdmedia/i586/media/nonfree/release/fglrx-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/
-cp $bcdmedia/x86_64/media/nonfree/release/x11-driver-video-fglrx-*.rpm x86_64/mga_rpms/nonfree/
-cp $bcdmedia/x86_64/media/nonfree/release/fglrx-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/
-cp $bcdmedia/x86_64/media/nonfree/release/fglrx-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/
+#cp $bcdmedia/x86_64/media/nonfree/release/x11-driver-video-fglrx-*.rpm x86_64/mga_rpms/nonfree/
+#cp $bcdmedia/x86_64/media/nonfree/release/fglrx-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/
+#cp $bcdmedia/x86_64/media/nonfree/release/fglrx-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/
# add broadcom-wl
cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-common*.rpm i586/mga_rpms/nonfree/
diff --git a/files/mga_rpms/KDE4/update_media.sh b/files/mga_rpms/KDE4/update_media.sh
index 9122604..4ea00e2 100755
--- a/files/mga_rpms/KDE4/update_media.sh
+++ b/files/mga_rpms/KDE4/update_media.sh
@@ -1,5 +1,5 @@
-bcdmedia=/home/bcd/build_bcd/pieces/5
+bcdmedia=/home/bcd/build_bcd/pieces/cauldron
# create dirs if non-existant
mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info