From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 28F2CA054F for ; Fri, 12 Mar 2021 15:56:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15CCB1608AD; Fri, 12 Mar 2021 15:56:15 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id DE633406FF; Fri, 12 Mar 2021 15:56:12 +0100 (CET) IronPort-SDR: LnkTzZabvpCg931233p7i4FRSUoKS9g2GJDQBDhvzvvDfyr1Bz/0TyZX1s360IPyjejasbOb42 NOSebRwaWC8A== X-IronPort-AV: E=McAfee;i="6000,8403,9921"; a="252855963" X-IronPort-AV: E=Sophos;i="5.81,243,1610438400"; d="scan'208";a="252855963" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2021 06:56:11 -0800 IronPort-SDR: 27ru9wqCH9n3SS3NYri+J8zMCFECzmPDL+PIxZ9myuKcDeBp1xKOqcLvYIHVj95x3Y/7Rw5E3M wM4DTHTFLcTA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,243,1610438400"; d="scan'208";a="431964861" Received: from silpixa00399126.ir.intel.com ([10.237.223.188]) by fmsmga004.fm.intel.com with ESMTP; 12 Mar 2021 06:56:10 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , stable@dpdk.org Date: Fri, 12 Mar 2021 14:56:05 +0000 Message-Id: <20210312145605.448017-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH] build: skip copying meson files for examples installation X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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" The meson.build files in each example directory is simply to support building the example as part of the main SDK build, and these should not be installed with the example's source code and makefile. The exclude of "meson.build" only filters out the top-level examples/meson.build file, not the file in each subdirectory. To fix this, we can build up the list of files to exclude based off the list of all examples. With this change "find examples/ -name meson.build" returns no hits when run on an installed instance. Fixes: e5b95003f1df ("examples: fix flattening directory layout on install") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- Including stable on CC for this patch because even though it's removing files, those files are useless alone, since they must be part of a larger DPDK build. Therefore I think the patch should be safe to consider for backporting, especially since prior to the commit in question the meson.build files were being properly filtered out. --- examples/meson.build | 6 ++++++ meson.build | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/meson.build b/examples/meson.build index b9ab24223..3fe08d4ca 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -48,6 +48,12 @@ all_examples = [ 'vmdq', 'vmdq_dcb', ] +# on install, skip copying all meson.build files +ex_file_excludes = ['meson.build'] +foreach ex:all_examples + ex_file_excludes += [ex + '/meson.build'] +endforeach + if get_option('examples') == '' subdir_done() endif diff --git a/meson.build b/meson.build index fcc4d4c90..7778e1820 100644 --- a/meson.build +++ b/meson.build @@ -61,7 +61,7 @@ subdir('doc') subdir('examples') install_subdir('examples', install_dir: get_option('datadir') + '/dpdk', - exclude_files: 'meson.build') + exclude_files: ex_file_excludes) # build kernel modules if enabled if get_option('enable_kmods') -- 2.27.0