diff options
| -rw-r--r-- | config/auto_inst.cfg.pl | 6 | ||||
| -rwxr-xr-x | files/mga_rpms/update_media.sh | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index a647784..a1fea79 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -198,9 +198,9 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.19\.4-desktop-/', '/^nvidia-current-kernel-3\.10\.0-desktop-/', '/^nvidia340-kernel-3\.19\.4-desktop-', '/^nvidia304-kernel-3\.19\.4-desktop-', '/^vboxadditions-kernel-3\.19\.4-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-3\.19\.4-server-/', '/^nvidia-current-kernel-3\.19\.4-server-/', '/^nvidia340-kernel-3\.19\.4-server-/', '/^nvidia304-kernel-3\.19\.4-server-/', '/^vboxadditions-kernel-3\.19\.4-server-/', - '/^broadcom-wl-/', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.10\.0-desktop-/', '/^nvidia340-kernel-3\.19\.4-desktop-', '/^nvidia304-kernel-3\.19\.4-desktop-', '/^vboxadditions-kernel-3\.19\.4-desktop-/'), + '/^kernel-server-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.19\.4-server-/', '/^nvidia340-kernel-3\.19\.4-server-/', '/^nvidia304-kernel-3\.19\.4-server-/', '/^vboxadditions-kernel-3\.19\.4-server-/', + '/^broadcom-wl-/', 'x11-driver-video-fglrx', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'), diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh index 4ea00e2..fc1710b 100755 --- a/files/mga_rpms/update_media.sh +++ b/files/mga_rpms/update_media.sh @@ -8,6 +8,15 @@ mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/* +# add fglrx drvivers +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/ + # 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/ |