summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-18 23:46:55 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-18 23:46:55 +0100
commitc4322da5f75572cde16dfc4a3c95eab997f60457 (patch)
treef8f654d92168bde6af0074cfeb2a67b0ee15e47a
parent885d6cda77ae32b858710e026ca8ff553b5abb3e (diff)
downloaddraklive-config-c4322da5f75572cde16dfc4a3c95eab997f60457.tar
draklive-config-c4322da5f75572cde16dfc4a3c95eab997f60457.tar.gz
draklive-config-c4322da5f75572cde16dfc4a3c95eab997f60457.tar.bz2
draklive-config-c4322da5f75572cde16dfc4a3c95eab997f60457.tar.xz
draklive-config-c4322da5f75572cde16dfc4a3c95eab997f60457.zip
update_media.sh: add broadcom-wl-kernel-latest, use desktop586 for i586.
-rwxr-xr-xfiles/mga_rpms/update_media.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh
index 826a32e..2274714 100755
--- a/files/mga_rpms/update_media.sh
+++ b/files/mga_rpms/update_media.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
bcdmedia=/home/bcd/build_bcd/pieces/5
@@ -14,9 +15,13 @@ copy_latest()
else
name=$2
fi
+ if [ $arch = "i586" ] ; then
+ name=${name/-desktop-/-desktop586-}
+ fi
path=`ls -1v $bcdmedia/$arch/media/$repo/{release,updates}/$name.rpm 2> /dev/null | tail -1`
if [ -z $path ] ; then
echo "Couldn't find $name for $arch"
+ echo "ABORTING"
exit 1
else
cp $path $arch/mga_rpms/$repo/
@@ -45,8 +50,8 @@ copy_latest core dkms-2*
copy_latest core gcc-4*
copy_latest core gcc-cpp-4*
copy_latest core glibc-devel*
-copy_latest core kernel-desktop*-devel-4*
-copy_latest core kernel-desktop*-devel-latest-4*
+copy_latest core kernel-desktop-devel-4*
+copy_latest core kernel-desktop-devel-latest-4*
copy_latest core kernel-userspace-headers-*
copy_latest core lib mpc3-1*
copy_latest core lib ncurses-devel*
@@ -68,6 +73,7 @@ copy_latest nonfree x11-driver-video-nvidia-current-*
# add broadcom-wl
copy_latest nonfree dkms-broadcom-wl-*
copy_latest nonfree broadcom-wl-common-*
+copy_latest nonfree broadcom-wl-kernel-desktop-latest-*
# add broadcom wireless configs
copy_latest core broadcom-bcma-config-*