From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id F30A229D2 for ; Tue, 20 Nov 2018 20:15:23 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 605C43082211; Tue, 20 Nov 2018 19:15:23 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0D1B601A6; Tue, 20 Nov 2018 19:15:21 +0000 (UTC) From: Kevin Traynor To: Luca Boccassi Cc: Bruce Richardson , dpdk stable Date: Tue, 20 Nov 2018 19:12:31 +0000 Message-Id: <20181120191252.30277-41-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 20 Nov 2018 19:15:23 +0000 (UTC) Subject: [dpdk-stable] patch 'igb_uio: install module when building with meson' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 19:15:24 -0000 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 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 Acked-by: Bruce Richardson --- 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 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@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson