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 DB291A0548 for ; Sun, 28 Nov 2021 16:01:40 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D29774068E; Sun, 28 Nov 2021 16:01:40 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2075.outbound.protection.outlook.com [40.107.244.75]) by mails.dpdk.org (Postfix) with ESMTP id 9FFC04068A for ; Sun, 28 Nov 2021 16:01:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xjlh3eZc10L18c3ubcA0l511EbKTHt2ko8k+otQDcO3JAQu9V630cWJgZqLf0f3kvil0CmYNPcYhP0iqdL5Jor4mR7RC9aTncKqG284wHE9R+J4cdlLT5Bj/AVQVCRoCMLYO1B+abuRkmZ28M0rFmOse73R/To1jg/kfy+Jekks0bg4XBlAWH+GArRWHCRVjsI1/tt6E2EYbfSnx4XEsMnuzbM42wUz6EmE8/eeu8TswVwflFD84k1rFk9dQ2J8eFgyXu2Tdng+9/dDensdRE6qTahG/5Ww5alZsuiljxjx6CsOMHAYqbh4Q2I/5gik7lMC842ApVrSMJOjADnGkgg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=etDnYqA3EkPjv8yRAGPAUCgszOXZEwXBpxS/0IUJsgM=; b=LiEtFo8UPEpDN8vNqRHK/+6BsRaDlz7cTC3YmgNTO7KuGWG77q/dNkuK6jDXZs3J4YrDfhebMyC62UevSbbhGySlFC935Kkf1iyuDAKqR0lvddHp7s91WrwJFAwOn5orRSVh6RAHFITvaoopUd7iCf2FQL42KNWEGJ6wJBjWztCSfaM0OotCbduHZ2z9YSFfuzUULrwL8jAemOj5ODaZUiuaZg+ZluuRAB8ndsUP/6h4pG6JQ1CDMOv338xapJSh+DAJCt0k2R8fPwtduT1PuFO4I2OtiI94vGethhYK6we9fBNN8/zyhUssupTqLNROLLw0Ql5DMMYTQoKPKmdpQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=etDnYqA3EkPjv8yRAGPAUCgszOXZEwXBpxS/0IUJsgM=; b=dL45GjBPvy7nlBINFqHa6kMKqVDSVSDjyrdrf8u39diV6DHinYbHySJzAgFNYrMpSmy8BLKUjH9IGL5kVc0nXlSAG0DdNMMJaih1clFrv8M+H2YcF0Jc8GPTGoorgyQ4Z0pzS1WFmJuDtXBs80/Mn9w34o9EGFdh+a7tcwD4AljVil0sPs873SNzDt5aDkNUcm5f00q4zlXjuo16EwBonW7/ulp2TUEcQU9vH0SD09/f0FjZO42oLbkPOy3vYwkudNfTGN8d2j/keJGZjRxjWEWQSUkYCroJP1IcnlG4YSh2apiRvz+Blbja/Hj3COMCSfmmo/7uKBpUjGuWrwHXNQ== Received: from BN0PR02CA0044.namprd02.prod.outlook.com (2603:10b6:408:e5::19) by BL1PR12MB5173.namprd12.prod.outlook.com (2603:10b6:208:308::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Sun, 28 Nov 2021 15:01:36 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::2c) by BN0PR02CA0044.outlook.office365.com (2603:10b6:408:e5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:01:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:01:36 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 15:01:34 +0000 From: Xueming Li To: Timothy Redaelli CC: Luca Boccassi , David Marchand , dpdk stable Subject: patch 'doc: strip build artefacts for examples file list' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:54:05 +0800 Message-ID: <20211128145423.3974892-62-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22c7ca78-6fbf-4d02-46c7-08d9b27ff996 X-MS-TrafficTypeDiagnostic: BL1PR12MB5173: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /KCCImTM2rnugJll5Ql4yp2PyL9BS11NrgsbD6jxKIfyXC1oaVYK2P4+q0SgmBfkNDyZPiKvW/nGVNFwdBeLWOCvAHWUxXMffAZ/afrGW+moGaJGbmToM8Uvhex5hNAoiuTta9sj2HOBqcejZZZi0OV2JNtjGYbhjWbY0va3M5n9Hp3TSwYiSC7p009bwPdnlYny6zyGUEKK6bGTOCmwUx9EZMKlFmeZAHADZ+LePEb/4Jn5IGVYR2ElcP8tCWQt/4UOvbbAJG9V9kyag7LT9JrSfWskd3IJF7K1QIQPW8hoZZX2wt9GaaBLxO12ET6TiEwBonOJM4yJBIezMjJRhzIbg6GxrJdbw+GA8odpOLbcNjVyny2vzctoNa5LcXrnQdQMEl+2SfyMENWFPuVHvkJ4WdB4mRMHg56AD2NqpeTQ0CpJvlKHR7w7dTlNjsKYTm1CUolqMcpR/Zj3D0hLXP2lQBLdB4Dj7Lhvh1DW1vT4UhbkMOX8ElGP3WiKYA2nRN0hK22VX+iuRlCbRE0N14QdPN+UmZOEAb6J7MMGW2G0xMljAcFPI9Itq4BRonwp9OqJfsAuzd1y15utHgSyq6d50S73lx/de1n8FmU35lKqLbAzvMbyoHYozpYyETigLZow172NZ6JYI2BUBrdb/XxPRubVZlDVrGhV7m5IFp0HImpbLtG8FWBNipCN6HgE6JT53cLMDBr0wBNZKeUCiUkVWIx/tHQs61ad9iV+MpWcGGlWZoEOkGauibSFwwvJ29wUdXjP+Oe1/naMelVPz8Knr329Em8MPWZO9Tleni24ZEb4PDF/FfbM2M3F2wW5jszrVwAv0lQcfm/eyZ1QgQ== 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)(36840700001)(46966006)(4326008)(1076003)(70586007)(70206006)(6916009)(6666004)(356005)(26005)(426003)(7636003)(16526019)(8676002)(186003)(966005)(6286002)(7696005)(53546011)(36756003)(8936002)(54906003)(336012)(508600001)(2906002)(4001150100001)(316002)(5660300002)(2616005)(36860700001)(47076005)(86362001)(82310400004)(55016003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:01:36.5952 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22c7ca78-6fbf-4d02-46c7-08d9b27ff996 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5173 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 Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/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/edfcdd91ea9bc8236a2ef0a36c80b0c2c7fe4129 Thanks. Xueming Li --- >From edfcdd91ea9bc8236a2ef0a36c80b0c2c7fe4129 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 23 Nov 2021 15:48:42 +0100 Subject: [PATCH] doc: strip build artefacts for examples file list Cc: Xueming Li [ upstream commit 92eb2c3465439dad4d7aa4f073df517de1817ed9 ] examples.dox is built inside builddir/doc/api and so doxygen generates some dir_HASH.html that includes the builddir name and this may prevent DPDK documentation to be correctly generated in some distributions, for example CentOS Stream 9 and RHEL9, since the builddir includes the architecture. This commit adds builddir/doc/api (the path where examples.dox is generated) to STRIP_FROM_PATH, so the generated documentation doesn't change if builddir changes. Fixes: a6090630f4e5 ("doc: automate examples file list for API") Signed-off-by: Timothy Redaelli Acked-by: Luca Boccassi Tested-by: David Marchand --- doc/api/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/meson.build b/doc/api/meson.build index dfdefdc924..22d1bc204d 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -36,7 +36,7 @@ cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api')) cdata.set('HTML_OUTPUT', 'html') cdata.set('TOPDIR', meson.source_root()) -cdata.set('STRIP_FROM_PATH', meson.source_root()) +cdata.set('STRIP_FROM_PATH', ' '.join([meson.source_root(), join_paths(meson.build_root(), 'doc', 'api')])) cdata.set('WARN_AS_ERROR', 'NO') if get_option('werror') cdata.set('WARN_AS_ERROR', 'YES') -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.391439141 +0800 +++ 0061-doc-strip-build-artefacts-for-examples-file-list.patch 2021-11-28 22:41:03.400206198 +0800 @@ -1 +1 @@ -From 92eb2c3465439dad4d7aa4f073df517de1817ed9 Mon Sep 17 00:00:00 2001 +From edfcdd91ea9bc8236a2ef0a36c80b0c2c7fe4129 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 92eb2c3465439dad4d7aa4f073df517de1817ed9 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index d34c383694..7e2b429ac8 100644 +index dfdefdc924..22d1bc204d 100644 @@ -38 +40 @@ - cdata.set('WARN_AS_ERROR', 'YES') + cdata.set('WARN_AS_ERROR', 'YES')