kni: fix build on Ubuntu 12.04
authorPawel Wodkowski <pawelx.wodkowski@intel.com>
Wed, 20 Aug 2014 09:42:53 +0000 (10:42 +0100)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Thu, 21 Aug 2014 21:01:40 +0000 (23:01 +0200)
On Ubuntu 12.04.4 file '/proc/version_signature' contains
'Ubuntu 3.11.0-15.25~precise1-generic 3.11.10'. This introduce compilation
error since '~precise1' will not be discarded. This patch discards
everything after '~' inclusively.

Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
lib/librte_eal/linuxapp/kni/Makefile

index 2799191..e0218e7 100644 (file)
@@ -47,7 +47,7 @@ MODULE_CFLAGS += -Wall -Werror
 ifeq ($(shell lsb_release -si 2>/dev/null),Ubuntu)
 MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(shell lsb_release -sr | tr -d .)
 UBUNTU_KERNEL_CODE := $(shell cut -d' ' -f2 /proc/version_signature | \
-                        cut -d- -f1,2 | tr .- $(comma))
+                        cut -d'~' -f1 | cut -d- -f1,2 | tr .- $(comma))
 MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))"
 endif