From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH] install: fix flattening of examples directory
Date: Tue, 10 Nov 2020 17:09:03 +0000 [thread overview]
Message-ID: <20201110170903.GO1641@bricha3-MOBL.ger.corp.intel.com> (raw)
In-Reply-To: <20201110170809.1309043-1-bruce.richardson@intel.com>
Using correct address for David. :-(
On Tue, Nov 10, 2020 at 05:08:09PM +0000, Bruce Richardson wrote:
> By installing the examples one-by-one in a loop in the examples
> meson.build file we effectively flatted out the structure of the examples
> folder and omitted some common and shared subfolders that were never
> directly built. Instead, we can remove the loop and just have the whole
> "examples" folder installed as-is in a single statement, preserving its
> directory structure, and thereby fixing the build of a number of the
> examples.
>
> Fixes: 2daf565f91b5 ("examples: install as part of ninja install")
> Cc: stable@dpdk.org
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> examples/meson.build | 7 -------
> meson.build | 3 +++
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/examples/meson.build b/examples/meson.build
> index f17995532..46ec80919 100644
> --- a/examples/meson.build
> +++ b/examples/meson.build
> @@ -47,13 +47,6 @@ all_examples = [
> 'vm_power_manager/guest_cli',
> 'vmdq', 'vmdq_dcb',
> ]
> -# install all example code on install - irrespective of whether the example in
> -# question is to be built as part of this build or not.
> -foreach ex:all_examples
> - install_subdir(ex,
> - install_dir: get_option('datadir') + '/dpdk/examples',
> - exclude_files: 'meson.build')
> -endforeach
>
> if get_option('examples') == ''
> subdir_done()
> diff --git a/meson.build b/meson.build
> index 61d9a4f5f..45d974cd2 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -59,6 +59,9 @@ subdir('doc')
> # build any examples explicitly requested - useful for developers - and
> # install any example code into the appropriate install path
> subdir('examples')
> +install_subdir('examples',
> + install_dir: get_option('datadir') + '/dpdk',
> + exclude_files: 'meson.build')
>
> # build kernel modules if enabled
> if get_option('enable_kmods')
> --
> 2.25.1
>
next prev parent reply other threads:[~2020-11-10 17:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-10 17:08 Bruce Richardson
2020-11-10 17:09 ` Bruce Richardson [this message]
2020-11-10 17:14 ` David Marchand
2020-11-10 17:33 ` David Marchand
2020-11-10 17:42 ` Bruce Richardson
2020-11-11 15:56 ` [dpdk-stable] [PATCH v2 1/2] examples: fix flattening directory layout on install Bruce Richardson
2020-11-11 17:48 ` [dpdk-stable] [PATCH v3 1/4] " Bruce Richardson
2020-11-11 17:48 ` [dpdk-stable] [PATCH v3 2/4] examples/l2fwd-keepalive: skip build when no librt Bruce Richardson
[not found] ` <20201112094142.1781861-1-bruce.richardson@intel.com>
2020-11-12 9:41 ` [dpdk-stable] [PATCH v4 1/4] examples: fix flattening directory layout on install Bruce Richardson
2020-11-12 9:41 ` [dpdk-stable] [PATCH v4 2/4] examples/l2fwd-keepalive: skip build when no librt Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201110170903.GO1641@bricha3-MOBL.ger.corp.intel.com \
--to=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).