[dpdk-stable] patch 'mk: fix custom kernel directory name' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/04/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/83412a759ab7d9d78293a0d8ec224bb85e91c14c

Thanks.

Kevin Traynor

---
>From 83412a759ab7d9d78293a0d8ec224bb85e91c14c Mon Sep 17 00:00:00 2001
From: Herakliusz Lipiec <herakliusz.lipiec at intel.com>
Date: Fri, 19 Jul 2019 18:05:43 +0100
Subject: [PATCH] mk: fix custom kernel directory name

[ upstream commit a3549d2716d66afaf345f1ae8ffd4eb838383189 ]

When building dpdk with different 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")

Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec at intel.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
---
 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 2d34b4e5a..e86253618 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -25,5 +25,5 @@ kerneldir   ?= $(prefix)/kmod
 else
 ifeq ($(RTE_EXEC_ENV),linuxapp)
-kerneldir   ?= /lib/modules/$(shell uname -r)/extra/dpdk
+kerneldir   ?= $(RTE_KERNELDIR:/build=/extra/dpdk)
 else
 kerneldir   ?= /boot/modules
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:32.019967063 +0100
+++ 0005-mk-fix-custom-kernel-directory-name.patch	2019-08-28 14:32:31.584958631 +0100
@@ -1 +1 @@
-From a3549d2716d66afaf345f1ae8ffd4eb838383189 Mon Sep 17 00:00:00 2001
+From 83412a759ab7d9d78293a0d8ec224bb85e91c14c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a3549d2716d66afaf345f1ae8ffd4eb838383189 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 5c4215cd7..32bed5d95 100644
+index 2d34b4e5a..e86253618 100644
@@ -25,3 +26,3 @@
-@@ -28,5 +28,5 @@ RTE_EXEC_ENV=linux
- endif
- ifeq ($(RTE_EXEC_ENV),linux)
+@@ -25,5 +25,5 @@ kerneldir   ?= $(prefix)/kmod
+ else
+ ifeq ($(RTE_EXEC_ENV),linuxapp)