From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EE739A04DD for ; Tue, 10 Nov 2020 18:09:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5E1E84CA6; Tue, 10 Nov 2020 18:09:14 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id C156FF90; Tue, 10 Nov 2020 18:09:09 +0100 (CET) IronPort-SDR: JGbrqiK0YLA9uq8v8JAmKUUy4XXPKhiRVGPfasZiSKPb3C6yzfyYfb/PA6MMNJWZ6v2JenACSu DhueGiaSPCOQ== X-IronPort-AV: E=McAfee;i="6000,8403,9801"; a="166501268" X-IronPort-AV: E=Sophos;i="5.77,466,1596524400"; d="scan'208";a="166501268" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2020 09:09:07 -0800 IronPort-SDR: oIaHyQkJRmMlmOAwkfDUmzSoNTwbj67erbJ2LCR23Ec39VPjq/hi0+KZtQKHXX0WdlsOOqw4yx QNRZ5X2OsNeA== X-IronPort-AV: E=Sophos;i="5.77,466,1596524400"; d="scan'208";a="365598893" Received: from bricha3-mobl.ger.corp.intel.com ([10.213.241.186]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 10 Nov 2020 09:09:06 -0800 Date: Tue, 10 Nov 2020 17:09:03 +0000 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, stable@dpdk.org Message-ID: <20201110170903.GO1641@bricha3-MOBL.ger.corp.intel.com> References: <20201110170809.1309043-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201110170809.1309043-1-bruce.richardson@intel.com> Subject: Re: [dpdk-stable] [PATCH] install: fix flattening of examples directory 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 > --- > 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 >