[dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[Herakliusz Lipiec]

When building dpdk with differnt kernel headers by specifying
RTE_KERNELDIR igb_uio is compiled to directory with a name of the
version of kernel thats running on the system instead of the one that
dpdk is actually compiled against. Fixed by replacing hardcoded value
with value from RTE_KERNELDIR.

Cc: stable@intel.com
Cc: bruce.richardson@intel.com
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
---
 mk/rte.sdkinstall.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 5c4215cd7..a602dd6cc 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -27,7 +27,7 @@ ifeq ($(RTE_EXEC_ENV),linuxapp)
 RTE_EXEC_ENV=linux
 endif
 ifeq ($(RTE_EXEC_ENV),linux)
-kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
+kerneldir ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))
 else
 kerneldir   ?= /boot/modules
 endif
-- 
2.17.2

Re: [dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[Thomas Monjalon]

18/07/2019 15:29, Herakliusz Lipiec:
> When building dpdk with differnt kernel headers by specifying
> RTE_KERNELDIR igb_uio is compiled to directory with a name of the
> version of kernel thats running on the system instead of the one that
> dpdk is actually compiled against. Fixed by replacing hardcoded value
> with value from RTE_KERNELDIR.
> 
> Cc: stable@intel.com
> Cc: bruce.richardson@intel.com
> Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> ---
> --- a/mk/rte.sdkinstall.mk
> +++ b/mk/rte.sdkinstall.mk
>  ifeq ($(RTE_EXEC_ENV),linux)
> -kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
> +kerneldir ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))
>  else
>  kerneldir   ?= /boot/modules
>  endif

You are changing the alignment :)

This change is only for the "make" system.
How does it work for meson?

[dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[Herakliusz Lipiec]

When building dpdk with differnt kernel headers by specifying
RTE_KERNELDIR igb_uio is compiled to directory with a name of the
version of kernel thats running on the system instead of the one that
dpdk is actually compiled against. Fixed by replacing hardcoded value
with value from RTE_KERNELDIR.

Cc: stable@dpdk.org
Cc: bruce.richardson@intel.com
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>

---
resending v1 with corrected cc address for stable and corrected
alignment.
---
 mk/rte.sdkinstall.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 5c4215cd7..a602dd6cc 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -27,7 +27,7 @@ ifeq ($(RTE_EXEC_ENV),linuxapp)
 RTE_EXEC_ENV=linux
 endif
 ifeq ($(RTE_EXEC_ENV),linux)
-kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
+kerneldir ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))
 else
 kerneldir   ?= /boot/modules
 endif
-- 
2.17.2

Re: [dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[Lipiec, Herakliusz]

> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> Sent: Thursday, July 18, 2019 2:44 PM
> 18/07/2019 15:29, Herakliusz Lipiec:
> > When building dpdk with differnt kernel headers by specifying
> > RTE_KERNELDIR igb_uio is compiled to directory with a name of the
> > version of kernel thats running on the system instead of the one that
> > dpdk is actually compiled against. Fixed by replacing hardcoded value
> > with value from RTE_KERNELDIR.
> >
> > Cc: stable@intel.com
> > Cc: bruce.richardson@intel.com
> > Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> > ---
> > --- a/mk/rte.sdkinstall.mk
> > +++ b/mk/rte.sdkinstall.mk
> >  ifeq ($(RTE_EXEC_ENV),linux)
> > -kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
> > +kerneldir ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))
> >  else
> >  kerneldir   ?= /boot/modules
> >  endif
> 
> You are changing the alignment :)
> 
> This change is only for the "make" system.
> How does it work for meson?
> 
> 

The issue doesn't seem to be happening when using meson build system,
kernel modules are compiled into correct directory. 

Re: [dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[Thomas Monjalon]

18/07/2019 16:03, Herakliusz Lipiec:
> When building dpdk with differnt kernel headers by specifying
> RTE_KERNELDIR igb_uio is compiled to directory with a name of the
> version of kernel thats running on the system instead of the one that
> dpdk is actually compiled against. Fixed by replacing hardcoded value
> with value from RTE_KERNELDIR.

missing original commit reference:
Fixes: 3967af352aeb ("mk: install kernel modules")

> Cc: stable@dpdk.org
> Cc: bruce.richardson@intel.com
> Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> 
> ---
> resending v1 with corrected cc address for stable and corrected
> alignment.

It should be marked v2,
and the alignment is still not correct.

> -kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
> +kerneldir ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))

I would suggest another syntax, easier to read:

kerneldir   ?= $(RTE_KERNELDIR:/build=/extra/dpdk)

Re: [dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[Lipiec, Herakliusz]

> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> Sent: Thursday, July 18, 2019 11:25 PM
> 18/07/2019 16:03, Herakliusz Lipiec:
> > When building dpdk with differnt kernel headers by specifying
> > RTE_KERNELDIR igb_uio is compiled to directory with a name of the
> > version of kernel thats running on the system instead of the one that
> > dpdk is actually compiled against. Fixed by replacing hardcoded value
> > with value from RTE_KERNELDIR.
> 
> missing original commit reference:
> Fixes: 3967af352aeb ("mk: install kernel modules")
> 
> > Cc: stable@dpdk.org
> > Cc: bruce.richardson@intel.com
> > Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
> >
> > ---
> > resending v1 with corrected cc address for stable and corrected
> > alignment.
> 
> It should be marked v2,
> and the alignment is still not correct.
Sorry I forgot to add the change to commit, sending as v2.
> 
> > -kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
> > +kerneldir ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))
> 
> I would suggest another syntax, easier to read:
> 
> kerneldir   ?= $(RTE_KERNELDIR:/build=/extra/dpdk)
> 
I have tried that before and it didn't seem to solve the issue.

[dpdk-dev] [PATCH v2] mk: fix output directory name when compiling with custom kernel header dir

[Herakliusz Lipiec]

When building dpdk with differnt kernel headers by specifying
RTE_KERNELDIR igb_uio is compiled to directory with a name of the
version of kernel thats running on the system instead of the one that
dpdk is actually compiled against. Fixed by replacing hardcoded value
with value from RTE_KERNELDIR.

Fixes: 3967af352aeb ("mk: install kernel modules")
Cc: stable@dpdk.org
Cc: bruce.richardson@intel.com
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>

---
resending v2 with corrected corrected alignment.
---
 mk/rte.sdkinstall.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 5c4215cd7..018e64908 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -27,7 +27,7 @@ ifeq ($(RTE_EXEC_ENV),linuxapp)
 RTE_EXEC_ENV=linux
 endif
 ifeq ($(RTE_EXEC_ENV),linux)
-kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
+kerneldir   ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))
 else
 kerneldir   ?= /boot/modules
 endif
-- 
2.17.2

Re: [dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[Thomas Monjalon]

19/07/2019 13:09, Lipiec, Herakliusz:
> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> > 18/07/2019 16:03, Herakliusz Lipiec:
> > > -kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
> > > +kerneldir ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))
> > 
> > I would suggest another syntax, easier to read:
> > 
> > kerneldir   ?= $(RTE_KERNELDIR:/build=/extra/dpdk)
> > 
> I have tried that before and it didn't seem to solve the issue.

Why? What is the output of $(info $(kerneldir)) ?

Re: [dpdk-dev] [PATCH] mk: fix output directory name when compiling with custom kernel header dir

[Lipiec, Herakliusz]

> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> Sent: Friday, July 19, 2019 12:37 PM
> To: Lipiec, Herakliusz <herakliusz.lipiec@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org; Richardson, Bruce
> <bruce.richardson@intel.com>
> Subject: Re: [dpdk-dev] [PATCH] mk: fix output directory name when
> compiling with custom kernel header dir
> 
> 19/07/2019 13:09, Lipiec, Herakliusz:
> > From: Thomas Monjalon [mailto:thomas@monjalon.net]
> > > 18/07/2019 16:03, Herakliusz Lipiec:
> > > > -kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
> > > > +kerneldir ?= $(subst /build,/extra/dpdk,$(RTE_KERNELDIR))
> > >
> > > I would suggest another syntax, easier to read:
> > >
> > > kerneldir   ?= $(RTE_KERNELDIR:/build=/extra/dpdk)
> > >
> > I have tried that before and it didn't seem to solve the issue.
> 
> Why? What is the output of $(info $(kerneldir)) ?
> 
I have tested your line again, and it worked, I compared against the one I was using at the beginning
And I found that I was missing slash. I will resend a v3.

[dpdk-dev] [PATCH v3] mk: fix output directory name when compiling with custom kernel header dir

[Herakliusz Lipiec]

When building dpdk with differnt kernel headers by specifying
RTE_KERNELDIR igb_uio is compiled to directory with a name of the
version of kernel thats running on the system instead of the one that
dpdk is actually compiled against. Fixed by replacing hardcoded value
with value from RTE_KERNELDIR.

Fixes: 3967af352aeb ("mk: install kernel modules")
Cc: stable@dpdk.org
Cc: bruce.richardson@intel.com
Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>

---
v2: with corrected corrected alignment.
v3: change to more readable version.
---
 mk/rte.sdkinstall.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 5c4215cd7..32bed5d95 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -27,7 +27,7 @@ ifeq ($(RTE_EXEC_ENV),linuxapp)
 RTE_EXEC_ENV=linux
 endif
 ifeq ($(RTE_EXEC_ENV),linux)
-kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
+kerneldir   ?= $(RTE_KERNELDIR:/build=/extra/dpdk)
 else
 kerneldir   ?= /boot/modules
 endif
-- 
2.17.2

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] mk: fix output directory name when compiling with custom kernel header dir

[Thomas Monjalon]

19/07/2019 19:05, Herakliusz Lipiec:
> When building dpdk with differnt kernel headers by specifying
> RTE_KERNELDIR igb_uio is compiled to directory with a name of the
> version of kernel thats running on the system instead of the one that
> dpdk is actually compiled against. Fixed by replacing hardcoded value
> with value from RTE_KERNELDIR.
> 
> Fixes: 3967af352aeb ("mk: install kernel modules")
> Cc: stable@dpdk.org
> Cc: bruce.richardson@intel.com
> Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>

Acked-by: Thomas Monjalon <thomas@monjalon.net>

Shortened the title to: "mk: fix custom kernel directory name"
Applied, thanks