From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from www.guy-engineering.com (ns2.lexterieur.net [66.246.138.142]) by dpdk.org (Postfix) with ESMTP id AD20B7E75 for ; Fri, 24 Oct 2014 01:31:38 +0200 (CEST) Received: from c-71-59-213-38.hsd1.or.comcast.net ([71.59.213.38] helo=localhost.localdomain) by www.guy-engineering.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84) (envelope-from ) id 1XhS15-0001Hp-R9 for dev@dpdk.org; Thu, 23 Oct 2014 19:42:04 -0400 From: Alexander Guy To: dev@dpdk.org Date: Thu, 23 Oct 2014 16:39:32 -0700 Message-Id: <1414107572-17073-1-git-send-email-alexander@andern.org> X-Mailer: git-send-email 2.1.1 Subject: [dpdk-dev] [PATCH] kni: fix building on Ubuntu-hybrids X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 23:31:39 -0000 In the case where a userspace reports itself as Ubuntu, but the kernel isn't providing the expected version signature interface, turn off Ubuntu specializations. This situation happens often enough in development environments, and with multi-distribution build servers (e.g. chroot, containers). Signed-off-by: Alexander Guy --- lib/librte_eal/linuxapp/kni/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/kni/Makefile b/lib/librte_eal/linuxapp/kni/Makefile index e0218e7..fb673d9 100644 --- a/lib/librte_eal/linuxapp/kni/Makefile +++ b/lib/librte_eal/linuxapp/kni/Makefile @@ -44,7 +44,7 @@ MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -I$(SRCDIR)/ethtool/ixgbe -I$(SRCDIR)/e MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h MODULE_CFLAGS += -Wall -Werror -ifeq ($(shell lsb_release -si 2>/dev/null),Ubuntu) +ifeq ($(shell test -f /proc/version_signature && 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 | cut -d- -f1,2 | tr .- $(comma)) -- 2.1.1