From: Pawel Wodkowski Date: Wed, 20 Aug 2014 09:42:53 +0000 (+0100) Subject: kni: fix build on Ubuntu 12.04 X-Git-Tag: spdx-start~10469 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=35170c52d0ae33dc30e69bcf681e5a17168bf11e;p=dpdk.git kni: fix build on Ubuntu 12.04 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 Acked-by: Thomas Monjalon --- diff --git a/lib/librte_eal/linuxapp/kni/Makefile b/lib/librte_eal/linuxapp/kni/Makefile index 27991914b2..e0218e72d6 100644 --- a/lib/librte_eal/linuxapp/kni/Makefile +++ b/lib/librte_eal/linuxapp/kni/Makefile @@ -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