From patchwork Fri Nov 25 11:33:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Jarry X-Patchwork-Id: 17260 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 4E5785681; Fri, 25 Nov 2016 12:34:09 +0100 (CET) Received: from mail-wj0-f174.google.com (mail-wj0-f174.google.com [209.85.210.174]) by dpdk.org (Postfix) with ESMTP id CC377567E for ; Fri, 25 Nov 2016 12:34:05 +0100 (CET) Received: by mail-wj0-f174.google.com with SMTP id v7so56511585wjy.2 for ; Fri, 25 Nov 2016 03:34:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pcszs9vqGX7+IsC4evLSbBSF+DcUJSoC2Cb9fG8gXH4=; b=nlMeVCNQIQzaF39+5A5qltqCT5JWKSMP3LZ5VQrxykvnqyHNmNJpGZR9Wlz75YGJGI mUwLxGrDgwaT8sXubsfyE4yGQJJsnp7vidO/bCEs7GM3VaiJbYchEzS6TXaBFah+M1Z5 RvhI7Dl9nlQzCm0dzBZ10zOQYDmEZ71+ocFh8hJPh84tAV3dj8nUEBRxu/ti7K3z2lQ4 ECV9UofLGpafQUSXAaGRFdP21GwQFnc+k1Dy1READ7f3cmydBfXejcT8zE9XvrJvE8sP Qq5eCMwFapkD9dhVKL43ufd0Y6Acq9AlYwsMYmXGJ3QSwC4yeXi+Q9rps2xnC3IU5Qcg BqzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Pcszs9vqGX7+IsC4evLSbBSF+DcUJSoC2Cb9fG8gXH4=; b=i4/8XV6qdrK+CnFeCm2DkgR2OlLVfsNIXYndd12s6BX7+EtJkixh3dRncFcsD1tYXk GZDklZfutUcarry3UlCk1fHHTU3QBO7Wv4PESvvtqoPTPtbkTogaUtluH5ICNjlCBZ7v NjFx5fsyPkDkdUd56WRtc7OJb9V4OY3B7XOquHL3zx8to87NQIOEZ5yxU4WOPKESP5jE rHsPJ8juQVRHl6FJzSLZjorCwothsg5HwEw8lRjAguUJ9L9EmH5Fx4DZMRB5clYJ6Eet e+3yLGRIR+6uFz3iy55QXgsbDsQSyKVW7MkIW4DmMNKsNCTFkgl1w0wiUI1F4AC/+GEF 5OSQ== X-Gm-Message-State: AKaTC03fb1XxLuTruluYtrx0roMSephMz4BFYOIGgCQn9APt0Zzl6lhkqOYrXZZ1Z3hdt1kj X-Received: by 10.194.108.10 with SMTP id hg10mr8130352wjb.58.1480073645395; Fri, 25 Nov 2016 03:34:05 -0800 (PST) Received: from tom.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id f126sm12919648wme.22.2016.11.25.03.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Nov 2016 03:34:04 -0800 (PST) From: Robin Jarry To: Ferruh Yigit Cc: dev@dpdk.org Date: Fri, 25 Nov 2016 12:33:54 +0100 Message-Id: <1480073634-14079-1-git-send-email-robin.jarry@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1480067361-6208-1-git-send-email-robin.jarry@6wind.com> References: <1480067361-6208-1-git-send-email-robin.jarry@6wind.com> Subject: [dpdk-dev] [PATCH v2] kni: avoid using lsb_release script 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The lsb_release script is part of an optional package which is not always installed. On the other hand, /etc/lsb-release is always present even on minimal Ubuntu installations. root@ubuntu1604:~# dpkg -S /etc/lsb-release base-files: /etc/lsb-release Read the file if present and use the variables defined in it. Signed-off-by: Robin Jarry --- lib/librte_eal/linuxapp/kni/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/Makefile b/lib/librte_eal/linuxapp/kni/Makefile index 4e99e07e7aec..62a957ce8534 100644 --- a/lib/librte_eal/linuxapp/kni/Makefile +++ b/lib/librte_eal/linuxapp/kni/Makefile @@ -44,8 +44,12 @@ 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) -MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(shell lsb_release -sr | tr -d .) +ifneq ($(wildcard /etc/lsb-release),) +-include /etc/lsb-release +endif + +ifeq ($(DISTRIB_ID),Ubuntu) +MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE)) UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \ | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1) MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))"