aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-05-12 14:46:37 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-12 14:46:37 +0000
commit3d1983013913944feb43e7af23b02b839c17aa3c (patch)
treeb57080aeda5342a41c6d6574f7524be8cbb08a84
parentc47054669387cea51baf130c60007d8fa515fe10 (diff)
parentbece504b9a40c33f666aa9a85c7d4e57adfe19fe (diff)
Merge "Adjust kernel numbers comparison"
-rw-r--r--build/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/build/Makefile b/build/Makefile
index ca704c0c0..7e4d5a09d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -82,9 +82,8 @@ all:
@make -C docker
@lsb_release -a | grep Ubuntu > /dev/null 2>&1 || (echo 'Ubuntu is the only supported Linux distribution for this build system'; exit 1)
@KERNEL_VER=$$(uname -r); \
- KERNEL_VER="$${KERNEL_VER%.*-*}"; \
- KERNEL_VER="$${KERNEL_VER//.}"; \
- [ $$KERNEL_VER -ge 319 ] || (echo 'Kernel version must be 3.19 or newer'; exit 1)
+ KERNEL_ARRAY=($${KERNEL_VER//./ }); \
+ if [ $${KERNEL_ARRAY[0]} -lt 3 ] || [[ $${KERNEL_ARRAY[0]} -eq 3 && $${KERNEL_ARRAY[1]} -lt 19 ]] ; then (echo 'Kernel version must be 3.19 or newer'; exit 1) ; fi
@docker/runcontext $(DOCKERIMG) wget -q www.google.com > /dev/null 2>&1 || (echo 'No docker network connectivity or name server - check your network- and docker settings'; exit 1)
@docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) iso