From 0858fa8d1571cfb67ffe430e15c40191c6a43552 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 2 Oct 2013 09:24:59 +0000 Subject: [PATCH] Update nvidia-snapshot to be URL and arches agnostic --- nvidia-snapshot.sh | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/nvidia-snapshot.sh b/nvidia-snapshot.sh index 42cc470..5c0ce57 100755 --- a/nvidia-snapshot.sh +++ b/nvidia-snapshot.sh @@ -12,19 +12,23 @@ cleanup() { unset CDPATH pwd=$(pwd) -version=$(grep Version xorg-x11-drv-nvidia*.spec | cut -f 2 -d ':' | sed 's/ //g') +nvspec=$(ls ${pwd}/xorg-x11-drv-nvidia*.spec) +version=$(grep ^Version: ${nvspec} | awk '{print $2}') +arches="$(grep ^ExclusiveArch: ${nvspec} | awk '{print $2,$3,$4}')" -for arch in x86 x86_64 ; do - if [ ! -e NVIDIA-Linux-${arch}-${version}.run ] ; then - wget -N ftp://download.nvidia.com/XFree86/Linux-${arch}/${version}/NVIDIA-Linux-${arch}-${version}.run - fi - sh NVIDIA-Linux-${arch}-${version}.run --extract-only --target nvidiapkg-${arch} -done -if [ ! -e NVIDIA-Linux-armv7l-gnueabihf-${version}.run ] ; then - wget -N ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/${version}/NVIDIA-Linux-armv7l-gnueabihf-${version}.run +#Avoid to re-create an existing tarball + [ -e ${pwd}/nvidia-kmod-data-${version}.tar.xz ] && exit 0 + +for arch in ${arches} ; do + nvarch=${arch} + [ ${arch} == i686 ] && nvarch=x86 + [ ${arch} == armv7hl ] && nvarch=armv7l-gnueabihf + if [ ! -e NVIDIA-Linux-${nvarch}-${version}.run ] ; then + spectool --gf -S ${nvspec} fi -sh NVIDIA-Linux-armv7l-gnueabihf-${version}.run --extract-only --target nvidiapkg-armv7hl + sh NVIDIA-Linux-${nvarch}-${version}.run --extract-only --target nvidiapkg-${arch} +done -tar -cjf nvidia-kmod-data-${version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel +tar Jcf nvidia-kmod-data-${version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel