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 E349DA0526; Mon, 20 Jan 2020 18:40:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 26AC81C1B1; Mon, 20 Jan 2020 18:40:42 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id E95011C1AA for ; Mon, 20 Jan 2020 18:40:40 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jan 2020 09:40:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,342,1574150400"; d="scan'208";a="425250406" Received: from silpixa00399126.ir.intel.com ([10.237.222.218]) by fmsmga005.fm.intel.com with ESMTP; 20 Jan 2020 09:40:38 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 20 Jan 2020 17:37:25 +0000 Message-Id: <20200120173725.57529-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] build: allow using wildcards to disable drivers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Rather than having to explicitly list each and every driver to disable in a build, we can use a small python script and the python glob library to expand out the wildcards. This means that we can configure meson using e.g. meson -Ddisable_drivers=crypto/*,event/* build to do a build omitting all the crypto and event drivers. Explicitly specified drivers e.g. net/i40e, work as before, and can be mixed with wildcarded drivers as required. Signed-off-by: Bruce Richardson --- buildtools/list-dir-globs.sh | 15 +++++++++++++++ buildtools/meson.build | 2 +- drivers/meson.build | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100755 buildtools/list-dir-globs.sh diff --git a/buildtools/list-dir-globs.sh b/buildtools/list-dir-globs.sh new file mode 100755 index 000000000..ed5aac41c --- /dev/null +++ b/buildtools/list-dir-globs.sh @@ -0,0 +1,15 @@ +#! /usr/bin/env python +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2020 Intel Corporation + +from __future__ import print_function +from os import chdir, environ +from sys import argv +from glob import iglob # glob iterator +from os.path import isdir, join + +chdir(join(environ['MESON_SOURCE_ROOT'], environ['MESON_SUBDIR'])) +dirs = [] +for path in argv[1].split(','): + dirs.extend([entry for entry in iglob(path) if isdir(entry)]) +print(",".join(dirs)) diff --git a/buildtools/meson.build b/buildtools/meson.build index cd1d05403..830c391f9 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -4,7 +4,7 @@ subdir('pmdinfogen') pmdinfo = find_program('gen-pmdinfo-cfile.sh') - +list_dir_globs = find_program('list-dir-globs.sh') check_experimental_syms = find_program('check-experimental-syms.sh') # set up map-to-def script using python, either built-in or external diff --git a/drivers/meson.build b/drivers/meson.build index 29708cc2b..292d0f39a 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -17,7 +17,8 @@ dpdk_driver_classes = ['common', 'event', # depends on common, bus, mempool and net. 'baseband'] # depends on common and bus. -disabled_drivers = get_option('disable_drivers').split(',') +disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'), + ).stdout().strip().split(',') default_cflags = machine_args if cc.has_argument('-Wno-format-truncation') -- 2.20.1