[dpdk-stable] patch 'igb_uio: install module when building with meson' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From bb8585fd78d2fa3294334f414ae51eb9df8d9381 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca at debian.org>
Date: Mon, 17 Sep 2018 10:01:27 +0100
Subject: [PATCH] igb_uio: install module when building with meson

[ upstream commit e0974f31c62403d54c5a13d1e53b4ad5dc31c5b0 ]

Install in $kerneldir/../extra/dpdk. Usually $kerneldir should something
like: /lib/modules/$kver/build, so this directory will match the default
one used by legacy makefiles.

Fixes: a52f4574f798 ("igb_uio: build with meson")

Signed-off-by: Luca Boccassi <bluca at debian.org>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 kernel/linux/igb_uio/meson.build | 2 ++
 meson_options.txt                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
index 71ed2e7a8..f5a9d5ccf 100644
--- a/kernel/linux/igb_uio/meson.build
+++ b/kernel/linux/igb_uio/meson.build
@@ -16,3 +16,5 @@ custom_target('igb_uio',
 		'modules'],
 	depends: mkfile,
+	install: true,
+	install_dir: kernel_dir + '/../extra/dpdk',
 	build_by_default: get_option('enable_kmods'))
diff --git a/meson_options.txt b/meson_options.txt
index c84327858..f20887212 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,5 +8,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')
+	description: 'path to the kernel for building kernel modules, they 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.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:08.442431546 +0000
+++ 0041-igb_uio-install-module-when-building-with-meson.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,14 +1,15 @@
-From e0974f31c62403d54c5a13d1e53b4ad5dc31c5b0 Mon Sep 17 00:00:00 2001
+From bb8585fd78d2fa3294334f414ae51eb9df8d9381 Mon Sep 17 00:00:00 2001
 From: Luca Boccassi <bluca at debian.org>
 Date: Mon, 17 Sep 2018 10:01:27 +0100
 Subject: [PATCH] igb_uio: install module when building with meson
 
+[ upstream commit e0974f31c62403d54c5a13d1e53b4ad5dc31c5b0 ]
+
 Install in $kerneldir/../extra/dpdk. Usually $kerneldir should something
 like: /lib/modules/$kver/build, so this directory will match the default
 one used by legacy makefiles.
 
 Fixes: a52f4574f798 ("igb_uio: build with meson")
-Cc: stable at dpdk.org
 
 Signed-off-by: Luca Boccassi <bluca at debian.org>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>