From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: Simon Kagstrom <simon.kagstrom@netinsight.net>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] kni: Use utsrelease.h to determine Ubuntu kernel version
Date: Wed, 04 Nov 2015 11:35:41 +0100 [thread overview]
Message-ID: <4456769.s2fEOyVAiF@xps13> (raw)
In-Reply-To: <20150820085106.32188573@miho>
2015-08-20 08:51, Simon Kagstrom:
> /proc/version_signature is the version for the host machine, but in
> e.g., chroots, this does not necessarily match that DPDK is built
> for. DPDK will then build for the wrong kernel version - that of the
> server, and not that installed in the (build) chroot.
>
> The patch uses utsrelease.h from the kernel sources instead and fakes
> the upload version.
>
> Tested on a server with Ubuntu 12.04, building in a chroot for Ubuntu
> 14.04.
[...]
> --- a/lib/librte_eal/linuxapp/kni/Makefile
> +++ b/lib/librte_eal/linuxapp/kni/Makefile
> @@ -44,10 +44,10 @@ 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 test -f /proc/version_signature && lsb_release -si 2>/dev/null),Ubuntu)
> +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 | cut -d- -f1,2 | tr .- $(comma))
> +UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \
> + | cut -d '"' -f2 | cut -d- -f1,2 | tr .- $(comma)`,1)
> MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))"
> endif
Yes we must check RTE_KERNELDIR instead of the running kernel.
But it is still checking lsb_release for the running system.
It seems not consistent.
next prev parent reply other threads:[~2015-11-04 10:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-20 6:51 Simon Kagstrom
2015-10-13 12:50 ` Simon Kagstrom
2015-10-13 13:06 ` Tom Ghyselinck
2015-11-04 7:53 ` Simon Kågström
2015-11-04 8:30 ` Zhang, Helin
2015-11-19 9:08 ` Thomas Monjalon
2015-11-04 10:35 ` Thomas Monjalon [this message]
2015-11-04 11:29 ` Simon Kågström
2015-11-04 18:21 ` Stephen Hemminger
2015-11-05 8:20 ` Simon Kågström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4456769.s2fEOyVAiF@xps13 \
--to=thomas.monjalon@6wind.com \
--cc=dev@dpdk.org \
--cc=simon.kagstrom@netinsight.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).