[dpdk-stable] patch 'kernel/linux: fix modules install path' 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 08/28/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/15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9

Thanks.

Kevin Traynor

---
>From 15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 Mon Sep 17 00:00:00 2001
From: Igor Ryzhov <iryzhov at nfware.com>
Date: Tue, 11 Jun 2019 11:49:34 +0300
Subject: [PATCH] kernel/linux: fix modules install path

[ upstream commit 317832f97c165cd4f327567935dfbd6af92b4159 ]

Currently kernel modules are installed into /usr/src instead of
/lib/modules when meson build system is used. This patch fixes that.

Signed-off-by: Igor Ryzhov <iryzhov at nfware.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 kernel/linux/igb_uio/meson.build | 4 ++--
 kernel/linux/kni/meson.build     | 4 ++--
 kernel/linux/meson.build         | 4 ++--
 meson_options.txt                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
index f5a9d5ccf..fac404f07 100644
--- a/kernel/linux/igb_uio/meson.build
+++ b/kernel/linux/igb_uio/meson.build
@@ -9,5 +9,5 @@ custom_target('igb_uio',
 	input: ['igb_uio.c', 'Kbuild'],
 	output: 'igb_uio.ko',
-	command: ['make', '-C', kernel_dir,
+	command: ['make', '-C', kernel_dir + '/build',
 		'M=' + meson.current_build_dir(),
 		'src=' + meson.current_source_dir(),
@@ -17,4 +17,4 @@ custom_target('igb_uio',
 	depends: mkfile,
 	install: true,
-	install_dir: kernel_dir + '/../extra/dpdk',
+	install_dir: kernel_dir + '/extra/dpdk',
 	build_by_default: get_option('enable_kmods'))
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index a09af5aa5..e6822f49c 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -17,5 +17,5 @@ custom_target('rte_kni',
 	input: kni_sources + kni_igb_sources + kni_ixgbe_sources,
 	output: 'rte_kni.ko',
-	command: ['make', '-j4', '-C', kernel_dir,
+	command: ['make', '-j4', '-C', kernel_dir + '/build',
 		'M=' + meson.current_build_dir(),
 		'src=' + meson.current_source_dir(),
@@ -31,4 +31,4 @@ custom_target('rte_kni',
 	console: true,
 	install: true,
-	install_dir: kernel_dir + '/../extra/dpdk',
+	install_dir: kernel_dir + '/extra/dpdk',
 	build_by_default: get_option('enable_kmods'))
diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index 5b7ec06e1..c5bcc1f38 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -21,9 +21,9 @@ else
 		# use default path for native builds
 		kernel_version = run_command('uname', '-r').stdout().strip()
-		kernel_dir = '/lib/modules/' + kernel_version + '/build'
+		kernel_dir = '/lib/modules/' + kernel_version
 	endif
 
 	# test running make in kernel directory, using "make kernelversion"
-	make_returncode = run_command('make', '-sC', kernel_dir,
+	make_returncode = run_command('make', '-sC', kernel_dir + '/build',
 			'kernelversion').returncode()
 	if make_returncode != 0
diff --git a/meson_options.txt b/meson_options.txt
index 10b541615..91b0449a1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,5 +14,5 @@ option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
-	description: 'path to the kernel for building kernel modules, they will be installed in $DEST_DIR/$kernel_dir/../extra/dpdk')
+	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
 option('lib_musdk_dir', type: 'string', value: '',
 	description: 'path to the MUSDK library installation directory')
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.876697935 +0100
+++ 0006-kernel-linux-fix-modules-install-path.patch	2019-08-22 19:38:20.397027833 +0100
@@ -1 +1 @@
-From 317832f97c165cd4f327567935dfbd6af92b4159 Mon Sep 17 00:00:00 2001
+From 15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 317832f97c165cd4f327567935dfbd6af92b4159 ]
+
@@ -9,2 +10,0 @@
-Cc: stable at dpdk.org
-
@@ -38 +38 @@
-index a9f48b0e6..955eec949 100644
+index a09af5aa5..e6822f49c 100644
@@ -41,2 +41,2 @@
-@@ -14,5 +14,5 @@ custom_target('rte_kni',
- 	input: kni_sources,
+@@ -17,5 +17,5 @@ custom_target('rte_kni',
+ 	input: kni_sources + kni_igb_sources + kni_ixgbe_sources,
@@ -48 +48 @@
-@@ -26,4 +26,4 @@ custom_target('rte_kni',
+@@ -31,4 +31,4 @@ custom_target('rte_kni',
@@ -55 +55 @@
-index a37c95752..1796cc686 100644
+index 5b7ec06e1..c5bcc1f38 100644
@@ -58,6 +58,6 @@
-@@ -14,9 +14,9 @@ if kernel_dir == ''
- 	# use default path for native builds
- 	kernel_version = run_command('uname', '-r').stdout().strip()
--	kernel_dir = '/lib/modules/' + kernel_version + '/build'
-+	kernel_dir = '/lib/modules/' + kernel_version
- endif
+@@ -21,9 +21,9 @@ else
+ 		# use default path for native builds
+ 		kernel_version = run_command('uname', '-r').stdout().strip()
+-		kernel_dir = '/lib/modules/' + kernel_version + '/build'
++		kernel_dir = '/lib/modules/' + kernel_version
+ 	endif
@@ -65,5 +65,5 @@
- # test running make in kernel directory, using "make kernelversion"
--make_returncode = run_command('make', '-sC', kernel_dir,
-+make_returncode = run_command('make', '-sC', kernel_dir + '/build',
- 		'kernelversion').returncode()
- if make_returncode != 0
+ 	# test running make in kernel directory, using "make kernelversion"
+-	make_returncode = run_command('make', '-sC', kernel_dir,
++	make_returncode = run_command('make', '-sC', kernel_dir + '/build',
+ 			'kernelversion').returncode()
+ 	if make_returncode != 0
@@ -71 +71 @@
-index 16d9f92c6..5302b9c68 100644
+index 10b541615..91b0449a1 100644
@@ -74 +74 @@
-@@ -16,5 +16,5 @@ option('include_subdir_arch', type: 'string', value: '',
+@@ -14,5 +14,5 @@ option('include_subdir_arch', type: 'string', value: '',