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 427A0A09D3 for ; Thu, 12 Nov 2020 10:42:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 911BE72EE; Thu, 12 Nov 2020 10:42:17 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 68EF46CAB; Thu, 12 Nov 2020 10:42:13 +0100 (CET) IronPort-SDR: ixMmjn0U/XorgZ5pqTstT+wcO/ADh1mzCU0izvVdzBCLjD4NfaFxvMp7zectfkEBtmgX2Wyn6W RzeaLD66s2iw== X-IronPort-AV: E=McAfee;i="6000,8403,9802"; a="231903628" X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="231903628" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2020 01:42:11 -0800 IronPort-SDR: j/7D3l9ikTbrGzPGmcUsYCltY/hFKWvWqZCxA+ujdAAd+mgqrJ0q6zgLTNNHXGuq0LoKTYNY/Y 2YpVqmiOKd7g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="339347892" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by orsmga002.jf.intel.com with ESMTP; 12 Nov 2020 01:42:10 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org Date: Thu, 12 Nov 2020 09:41:39 +0000 Message-Id: <20201112094142.1781861-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112094142.1781861-1-bruce.richardson@intel.com> References: <20201110170809.1309043-1-bruce.richardson@intel.com> <20201112094142.1781861-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v4 1/4] examples: fix flattening directory layout on install 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" By installing the examples one-by-one in a loop in the examples meson.build file we effectively flattened 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