On 11/25/2016 9:52 AM, Robin Jarry wrote: > 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 at 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 <robin.jarry at 6wind.com> > --- > 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
What about: +-include /etc/lsb-release > + > +ifeq ($(DISTRIB_ID),Ubuntu) > +MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_ID)) s/DISTRIB_ID/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))" >
