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 05B26A0A0E for ; Mon, 10 May 2021 18:07:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F01354003E; Mon, 10 May 2021 18:07:26 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2072.outbound.protection.outlook.com [40.107.243.72]) by mails.dpdk.org (Postfix) with ESMTP id 055524003E for ; Mon, 10 May 2021 18:07:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=REDMkKBe4RTpsIW4Fq1TLXMSJ5qYJPcRrHX7Tm6mECTjjvisJ5d1TKxZHDnBqjA0mJrzdAzDoMPFqlnsxPxAlyOEQHKS5lAukO+67f2XyEy96olvVSFPVyuD5ewbWboVhlmO794XICBjIAqNUQjkfwbeniiTzfZVGLcDuM7XZFHQrhj26OwYz4rKfuViYsrmpII/irbuJ5qcxcLICTWLj1qRR6fnEWL9apEA4QCfyc3QGTNPIBG/sQ/52VMIlfqX+WY1/AfrplXIW2ZNTMqjwUYQ35Z5ofPeUrSOr4b2PhK2GYf7TxFZzjeIzzoJlJbNuqVgB5MUTY1MN7qwnOetfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T4qRcVeXVqGYfrWt6cQ58nc9Sgezb2mbzIBJ7dyTL5c=; b=n15G2hM4iWVmDeCRxWdCPZV0npBIIg+7efN/Lrm4gr54yW5myLEeAO/tY7TMWaCm+eaqdDTnZGIb0u4MCKvjpOrEHWgxp/mboF+Z42O4mtrsnneChgtpscg1i9ErawBljP3GiB4ZN9ndRSg7ygY9X902SuuM74Cnt0RQWD8Vsch3IR1xJCGtJ5LXC6MEOpUCNADwg20n9mwQFOZcMFdqV/kItTM2irozNb7WmlRzcnYujAxgbC5P2oV4eYgbElz4pFzxnaujw6ROHhyQdPkJzPh18UT19Ee6KgekV43neqvOlsnUyD+hFPmjyR0/rqW/UODKtezaOMmtDxVI0KxqzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T4qRcVeXVqGYfrWt6cQ58nc9Sgezb2mbzIBJ7dyTL5c=; b=sYaShGMeQ/G4wJi3Rrtci282ECZfLpf/gS6NThDjlCxKrx0DG+4cPG3XbtxNA6x1AHa1k7ootFETHpZUDkkAA1e8IJKCz0PROzKgwkUyvUzm2u8Hn++qWJDePMogX0zDD9NkYcbZFE8jeCycXSSuljjtHKBwoKpURwhdn3ZX/RMPOIuAJORDFBCz++vHDDDC4f5kxY+bY/NrC3oBDJcXYlNu6Vmq9SGUYpWSPGQaGQp42T7J+3ivfyq4wb6shic/W+1XQTFa0xptmNkvMVvyjC8/l5FeGynEVyE5B5LA1haqignBghmeZW7erbleBG7PM+snHHj2p6UQ/Hhe7dtDpg== Received: from BN9PR03CA0273.namprd03.prod.outlook.com (2603:10b6:408:f5::8) by DM6PR12MB4926.namprd12.prod.outlook.com (2603:10b6:5:1bb::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.29; Mon, 10 May 2021 16:07:24 +0000 Received: from BN8NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f5:cafe::a0) by BN9PR03CA0273.outlook.office365.com (2603:10b6:408:f5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:07:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT013.mail.protection.outlook.com (10.13.176.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:07:23 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:07:21 +0000 From: Xueming Li To: Bruce Richardson CC: Luca Boccassi , dpdk stable Date: Mon, 10 May 2021 23:59:52 +0800 Message-ID: <20210510160258.30982-43-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1283d5db-ca77-464a-d191-08d913cdb2b8 X-MS-TrafficTypeDiagnostic: DM6PR12MB4926: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zs6vsX23bDs1vBNnVkYzx/mLMqEiiGehRWjZoRnwKt4k0pXe//jxVGP71LKExmPKM/owg+bL4zMlRFMBsOYxmj+XkEZi7Pvt9Wg4pShrW5HInoAHD1/IAERK6Yrbe1mOCCVddGhU0JZXbh+ZipYtV8w75vKRF2xfntbBsSe/X7I8dOZiu7aYq4regi2SqmHqV/+5GTs+nv6oLEFLqpWT7jsUMHPFW+SOuU8lkcNugaFOjggPVcmzCyUEoG8WRUQgoS2etbGTr6ahVg/Lfr6xuNPlvxd5dU9+4CJsWmw4vnFcS6hlS1AsglQFYlj2EpBS9pRVU/Wbw6YvMxKIpYb5BkmcTUH/ucJAQ5kQNpCE7021NMi8Aox/uQKvZVwFglJW5tTFjjN9SZ+Gj/zc7mbABYAULPtCLgG8y1pwPD08ppH3HzyK/Hkt+gSizWMKTAz1QRYDlwHJyRgOQZ68in37+UZU8faPIOUbw8PAXHg5jrMA02fabqUv0gVW7MXfCDcs3Vh8LOAFRCzTN/eVAfuGL+AnpAGcvR60y6OKghc26XUHaFsAOUTaR/UPYbI2noqN0hq+OuN1qCU8pWrRX0niL6/kqkrE67qP4KIZJeOjfNYjUwAqbAWp8PMO2QJ80G+rKvQfiAQM8/tnocCkIzmM8g7o4q6TkKYR5gIFvGQmv/VdlKKb/I7Sc+26QRwkVMp/lbFB/3PmZ6yLiaquvX3lgVz8asjZvNXZbCVjWn8NsrZdf7Z/S24W5EHc3mzs1T4Frl32jlWP+Tl1seP9p6Qyvw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(376002)(396003)(346002)(136003)(46966006)(36840700001)(82740400003)(966005)(6286002)(5660300002)(336012)(16526019)(426003)(316002)(356005)(186003)(7696005)(478600001)(8936002)(2616005)(53546011)(4326008)(8676002)(86362001)(26005)(83380400001)(1076003)(47076005)(36860700001)(54906003)(70586007)(2906002)(7636003)(6666004)(6916009)(55016002)(82310400003)(70206006)(36756003)(36906005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:07:23.5676 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1283d5db-ca77-464a-d191-08d913cdb2b8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4926 Subject: [dpdk-stable] patch 'build: exclude meson files from examples installation' has been queued to stable release 20.11.2 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" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/f59f4e98e4981473bfb8a1922a9753b25141d4d5 Thanks. Xueming Li --- >From f59f4e98e4981473bfb8a1922a9753b25141d4d5 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 12 Mar 2021 14:56:05 +0000 Subject: [PATCH] build: exclude meson files from examples installation Cc: Luca Boccassi [ upstream commit 5d20515e0c260377fcd23fab785070c4391cc59d ] 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") Signed-off-by: Bruce Richardson --- 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 b9ab24223f..3fe08d4ca5 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 45d974cd2c..8e051f7f4e 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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.806503100 +0800 +++ 0044-build-exclude-meson-files-from-examples-installation.patch 2021-05-10 23:59:26.390000000 +0800 @@ -1 +1 @@ -From 5d20515e0c260377fcd23fab785070c4391cc59d Mon Sep 17 00:00:00 2001 +From f59f4e98e4981473bfb8a1922a9753b25141d4d5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 5d20515e0c260377fcd23fab785070c4391cc59d ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -43 +45 @@ -index fcc4d4c900..7778e18200 100644 +index 45d974cd2c..8e051f7f4e 100644