From 41f3868799b3d3cee63434741afe830f02c3a0a0 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 16 May 2015 11:35:59 +0300 Subject: only block fglrx on Gnome media --- files/mga_rpms/GNOME/update_media.sh | 61 ++++++++++++++++++++++++++++++++++++ files/mga_rpms/KDE4/update_media.sh | 52 ++++++++++++++++++++++++++++++ files/mga_rpms/update_media.sh | 61 ------------------------------------ 3 files changed, 113 insertions(+), 61 deletions(-) create mode 100755 files/mga_rpms/GNOME/update_media.sh create mode 100755 files/mga_rpms/KDE4/update_media.sh delete mode 100755 files/mga_rpms/update_media.sh (limited to 'files') diff --git a/files/mga_rpms/GNOME/update_media.sh b/files/mga_rpms/GNOME/update_media.sh new file mode 100755 index 0000000..20c257d --- /dev/null +++ b/files/mga_rpms/GNOME/update_media.sh @@ -0,0 +1,61 @@ + +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 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/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/ +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 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 diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh deleted file mode 100755 index 20c257d..0000000 --- a/files/mga_rpms/update_media.sh +++ /dev/null @@ -1,61 +0,0 @@ - -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 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/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/ -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 -- cgit v1.2.1