From patchwork Fri Nov 25 09:52:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Jarry X-Patchwork-Id: 17259 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 CA25E4A63; Fri, 25 Nov 2016 10:53:57 +0100 (CET) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id 8942F47CE for ; Fri, 25 Nov 2016 10:53:56 +0100 (CET) Received: by mail-wm0-f43.google.com with SMTP id f82so86168834wmf.1 for ; Fri, 25 Nov 2016 01:53:56 -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; bh=vzVKKz9b+u5WGOXl8OiHpvjiMKoUEpUZEHyb9/O9MCA=; b=C0nel9+e7hNf+Su5lNU0KEZIWXKk5XQUvKRkm0dzLo9YiNVSHUicBZnmW8OC3SGQuc i714DUZ5WNUuwuS/XxT+LVCX/rcj8lmwiCuO8Jrzvj2ddA3mF51/nMJJ/tCs3TYDY7j3 MrmFxopo83kMGJMC/vqb4FOXZpsqz+YbvGA9v+4w7cAaEZ8vMWv2BxQYFAiOwxCsqQfm v9to03nH1F/r/G5WNR/RcJfkvwz3zpoBqjj/nXnUOHspAdsqhQSlNj+t38LQJkbQ0g9s o/RB32xNhQG1YoKzJed6pEuuybQJd81JbTaOO3KWmA9SDgWEl/v770YHZqjfXwYwNzYm Be3g== 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; bh=vzVKKz9b+u5WGOXl8OiHpvjiMKoUEpUZEHyb9/O9MCA=; b=eCgbFMdUZNRrUwo5vRwUj/oKg+CL3TbD6I1Nugz3NQaXw/fBE/CUgPeee9BoiQDlyY zAxCi/I5MB/SgE44cZWUIbi38lm4/1JPKVCLITcs8fPbJO3tJO98+A82kzxCXl9vOCvz CVO3YY0fkcoeckOgPvEh2pN+X5LrzV7Yu0PcoefxJqkVw7Vkun9H0A7hrnh7eUT3wIoW tYFkU2PJ3NIrsHzMF08Y+lvdI6o+m6wLvtvrSaaQ0VH0/BHDC5jZ1mebLgWv+1qZBecV EF4y/QvEuoZkSjKYEwx2SuIGX8bxG5GAn52CHHpl+uGtnrXMZ/DJYrOHLDf3POAQkEVI JaWg== X-Gm-Message-State: AKaTC02k7YcsbnJpZVD5NbXxgBzakZEa8OKbEnb6HBjaDD6dyWBwdwncKnaSPeqQMzobJDGo X-Received: by 10.28.95.85 with SMTP id t82mr6235427wmb.56.1480067636183; Fri, 25 Nov 2016 01:53:56 -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 m145sm12531944wma.3.2016.11.25.01.53.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Nov 2016 01:53:55 -0800 (PST) From: Robin Jarry To: Ferruh Yigit Cc: dev@dpdk.org Date: Fri, 25 Nov 2016 10:52:55 +0100 Message-Id: <1480067575-6543-1-git-send-email-robin.jarry@6wind.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH] 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..63b9ac8779f8 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_ID)) 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))"