From f894ed0689ea43947983e9654ccbe2912b9dbeba Mon Sep 17 00:00:00 2001 From: Liviu Chircu Date: Mon, 11 May 2015 19:46:28 +0300 Subject: [PATCH] build system: properly parse "uname -r" output Also handle "MAJOR.MINOR-SUB" types of strings (cherry picked from commit 999364ed550c7fe8031820cadd2db800fa95aae6) --- Makefile.defs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.defs b/Makefile.defs index 079ab8c22fd..b98a191f080 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -130,7 +130,7 @@ OSREL = $(shell uname -r) # numerical version (good for comparisons: A.B.C => A*1000000+B*1000+C) OSREL_N= $(shell echo $(OSREL) | sed -e 's/^[^0-9]*//' \ -e 's/^\([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*$$/\1/g' | \ - (IFS=. read A B C D; R=0; \ + (IFS=. read A B C D; [ -z "$$B" ] && B=0; [ -z "$$C" ] && C=0; R=0; \ [ -n "$$A" ] && R=`expr $$R \* 1000 + $$A` && \ [ -n "$$B" ] && R=`expr $$R \* 1000 + $$B` && \ [ -n "$$C" ] && R=`expr $$R \* 1000 + $$C`; echo $$R ) )