From 9bd918dbb3353065a506b140fe668d54e34a3631 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Fri, 11 Apr 2014 15:58:46 +0200 Subject: [PATCH] MT#6265 Use proper version sorting for kerne headers > ls -d ${TARGET}/usr/src/linux-headers*amd64 | grep -v -- -rt-amd64 | sort -u -r /usr/src/linux-headers-3.2.0-4-amd64 /usr/src/linux-headers-3.13-0.bpo.1-amd64 > ls -d ${TARGET}/usr/src/linux-headers*amd64 | grep -v -- -rt-amd64 | sort -r -u -V /usr/src/linux-headers-3.13-0.bpo.1-amd64 /usr/src/linux-headers-3.2.0-4-amd64 --- deployment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment.sh b/deployment.sh index f3a0afa..68b2279 100755 --- a/deployment.sh +++ b/deployment.sh @@ -1251,7 +1251,7 @@ EOT if grml-chroot $TARGET dkms status | grep -v -- '-rt-amd64' | grep -q "^${rtpengine_name}.*: installed" ; then echo "${rtpengine_name} kernel package already installed, skipping" | tee -a /tmp/dkms.log else - KERNELHEADERS=$(basename $(ls -d ${TARGET}/usr/src/linux-headers*amd64 | grep -v -- -rt-amd64 | sort -u -r | head -1)) + KERNELHEADERS=$(basename $(ls -d ${TARGET}/usr/src/linux-headers*amd64 | grep -v -- -rt-amd64 | sort -u -r -V | head -1)) if [ -z "$KERNELHEADERS" ] ; then die "Error: no kernel headers found for building ${rtpengine_name} the kernel module." fi @@ -1835,7 +1835,7 @@ vagrant_configuration() { grml-chroot $TARGET apt-get -y install libc6-dev gcc fake_uname - KERNELHEADERS=$(basename $(ls -d ${TARGET}/usr/src/linux-headers*amd64 | grep -v -- -rt-amd64 | sort -u -r | head -1)) + KERNELHEADERS=$(basename $(ls -d ${TARGET}/usr/src/linux-headers*amd64 | grep -v -- -rt-amd64 | sort -u -r -V | head -1)) if [ -z "$KERNELHEADERS" ] ; then die "Error: no kernel headers found for building the VirtualBox Guest Additions kernel module." fi