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 BF66BA0A0E for ; Mon, 10 May 2021 18:09:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B537B4003E; Mon, 10 May 2021 18:09:57 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2064.outbound.protection.outlook.com [40.107.243.64]) by mails.dpdk.org (Postfix) with ESMTP id 561A940147 for ; Mon, 10 May 2021 18:09:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dRPpef0Z5aYvGz2e6VeIGvVFsA2cYKdmPvT/60vxWeT5FkqeWRh1qaaavNcxSzx59I4d6wmAfAPXoe998rOs6AVNswxTWAcG8OkFpwlHQAzb/I0OT/JYwnSTqzcgxuk8CVbBFe5EaU4Airk6vV9QMruDrfsMuldko1n70TcmzMTnyB8BYxLKJ11XwNWq4+4sz2dyjA9Lsiz3PzmTaDf0d5awwxcLteSJ0uLQUY8dEdc8CKQ3THa8lLeFaxNKwkRMta2mwDlK9L9htdY3eEKr9OfTVD6jtpeYJr3e9/zhQjlb5/huajFwLdXVEEUheBoM4u8ds7ToRH+pBgUzGbTJMA== 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=XhqqI4hyxjFMz6I7iyMzOfuAe/olbjeYOjPDUfUfLF8=; b=L0Ipn2ePMtySuBNmumNzC0ZPi8xMypoSngQUjMS3OpiEr+uFl6Pyq4UZjLok4x5EoeA6e7tCIbidNNwRjyjQUAuZrPy0l0YG9V81VGzwCGShvunRkGHSP8URC1wfszcE56T2padfgKw3AVQ6dfCLxm6WeDtmIBopQQSZl3qrBLsZAfNYx4mFSbVooyelV7LW2m9QyPmjUOzSKrPMos2wtJwbML0swVcMyT5KwCmLxIZhktklL0N0szrJDNiYT77Iu05GHMim2B31lxBOdasXKThU2NJrp7lHUULUQ+uvZ0toZESyWGGvpRPBIYTl6JXtak1IFawJ978ZT+FTpXepZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=oktetlabs.ru 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=XhqqI4hyxjFMz6I7iyMzOfuAe/olbjeYOjPDUfUfLF8=; b=Eq5EvSCqZhmzPd6+g9vz5rxSUCYiaK91M0lhO71su4f/9DfLa7aZN54vGaK0I8y003yftQRI1lUFKNvbMfmRjuL6/d6PBSsd4dStKcXER0XPuJDbHDhwaWBfSDs7ycYbG2aBjXv1EnTar9fXbM7sFDn5hgqEXkWw7Q7d1XRWBftA5/ZEjUjCcglz7psUimIHDl4JkvMXE0ox7+t1+Hm/smiFv2Nps5JZ0PkpkmyYvmiohSV3Iv2JLi4mQTdW/lWmAY6Q/Rmf+elzDUbbFnfMniNUw7mNJYKEV7IY8Q6xyTkTM7qbz6qbRy8fBfvyYd3KZdxYRWTnrVwaLAwH7euahA== Received: from BN8PR04CA0059.namprd04.prod.outlook.com (2603:10b6:408:d4::33) by BY5PR12MB3745.namprd12.prod.outlook.com (2603:10b6:a03:1ae::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:09:54 +0000 Received: from BN8NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:408:d4:cafe::a7) by BN8PR04CA0059.outlook.office365.com (2603:10b6:408:d4::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:09:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed) header.d=none;oktetlabs.ru; 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 BN8NAM11FT028.mail.protection.outlook.com (10.13.176.225) 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:09:53 +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:09:50 +0000 From: Xueming Li To: Thomas Monjalon CC: Luca Boccassi , Bruce Richardson , Andrew Rybchenko , David Marchand , dpdk stable Date: Tue, 11 May 2021 00:00:16 +0800 Message-ID: <20210510160258.30982-67-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: a36dbb69-791c-4c75-1b2b-08d913ce0c31 X-MS-TrafficTypeDiagnostic: BY5PR12MB3745: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr 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: vhYyN7PK4suPnSuAnAKz9a0vx+i2ToPgN0t1gLoR4CThqjDnNKZYATLFvWbdGQ/+8XoJ8A5VD4tlK5jglJfZQlqrXAPBiAcGX2zpx5wrsP7laXB/N+woCDEhVWSTPPENGlWM3RDDVg5RcBZZOREGvUwIGyNpISJVfk0JxizjkkcQZL9vChU8ns4qY9fwieNPvY1wQpY38YRdkxFNZZoIzkx5YSSaI5Hi0fD1rveSJOO+Q8O+e5zW3d7M6IO2dQfpHppZpcU+FVM8JBSYCmGD+jKARy1f2bb/BxbT8lNYWMOdnkEYErACnhx/sHDM/GGxaSU7kVYVvAFzw1EABJvcdvfLqef7CU1kFJjKHGJH14JuBB/7755hEV8fZEjywU592IZ1unhpatnMCePIiOqytHHENmXCwoIFi6GuLfF+BEz2y0Fsd42PMYO1G/tn6P+TBnnuyKXQv5xKca2hbcNPTEUXqtzQZTIxn4A2uUkXxnFmmqk4HlWLLmBgaNUX48kT0WFZ6kQIvcJVnI+oX8bZ7kHDzOowVQMBilEDoFO4VLAGcDRWTsCzBo7XBlYEFKGfmycpimbhNVRSAi2aeTgYXOABiNsokeIsk4mFWZZKNEg5QSUMC3dW4Gx3vlYOclnmQXLgmiJGVlmI5VQmDIxlkiDD0OEs60MfAF7RiUMRAYBMJua8tlCjXmAWVQbRAuc24byl2IH5OTbTHy/YaPgRngxXs/rfzm9moi89ilIosFoSLAYcHOSM9WXcMk9WcXcP8hgVrTnR+/T8c1NsZQ6V65MYAH6smJuqq7EID1MzupM= 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)(46966006)(36840700001)(55016002)(83380400001)(36756003)(8676002)(36906005)(70206006)(5660300002)(2906002)(54906003)(8936002)(356005)(82310400003)(86362001)(70586007)(53546011)(498600001)(2616005)(426003)(36860700001)(6286002)(4326008)(7636003)(26005)(6666004)(16526019)(966005)(336012)(186003)(7696005)(6916009)(1076003)(47076005)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:09:53.6622 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a36dbb69-791c-4c75-1b2b-08d913ce0c31 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: BN8NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3745 Subject: [dpdk-stable] patch 'buildtools: fix build with busybox' 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/1555f48f85eebdd5ad37bc2c8b776396cd70c8a2 Thanks. Xueming Li --- >From 1555f48f85eebdd5ad37bc2c8b776396cd70c8a2 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 24 Feb 2021 23:47:56 +0100 Subject: [PATCH] buildtools: fix build with busybox Cc: Luca Boccassi [ upstream commit e1ab26df4862143b81719957977988271505198a ] If using busybox for mktemp and awk (as in Alpine), some bugs prevent the script from running: 1/ It seems busybox mktemp requires the pattern to have at least 6 X and no other suffix. The same has been fixed for other scripts in the past: commit 3771edc35438 ("buildtools: fix build for some mktemp") 2/ It seems busybox awk does not accept the regex ^.*{ except if the opening curly brace is escaped. Fixes: 4c82473412e8 ("build: add internal tag check") Fixes: 68b1f1cda5b4 ("build: check AVX512 rather than binutils version") Fixes: 3290ac14eb94 ("buildtools: detect discrepancies for experimental symbols") Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson Acked-by: Andrew Rybchenko Acked-by: David Marchand --- buildtools/binutils-avx512-check.sh | 2 +- buildtools/check-symbols.sh | 2 +- buildtools/map-list-symbol.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildtools/binutils-avx512-check.sh b/buildtools/binutils-avx512-check.sh index a7e068140f..2a833b64b7 100755 --- a/buildtools/binutils-avx512-check.sh +++ b/buildtools/binutils-avx512-check.sh @@ -3,7 +3,7 @@ # Copyright(c) 2020 Intel Corporation AS=${AS:-as} -OBJFILE=$(mktemp -t dpdk.binutils-check.XXXXXX.o) +OBJFILE=$(mktemp -t dpdk.binutils-check.XXXXXX) trap 'rm -f "$OBJFILE"' EXIT # from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028 GATHER_PARAMS='0x8(,%ymm1,1),%ymm0{%k2}' diff --git a/buildtools/check-symbols.sh b/buildtools/check-symbols.sh index e407553a34..83b3a0182f 100755 --- a/buildtools/check-symbols.sh +++ b/buildtools/check-symbols.sh @@ -18,7 +18,7 @@ then exit 0 fi -DUMPFILE=$(mktemp -t dpdk.${0##*/}.XXX.objdump) +DUMPFILE=$(mktemp -t dpdk.${0##*/}.objdump.XXXXXX) trap 'rm -f "$DUMPFILE"' EXIT objdump -t $OBJFILE >$DUMPFILE diff --git a/buildtools/map-list-symbol.sh b/buildtools/map-list-symbol.sh index 5509b4a7fa..3bf9bd66f8 100755 --- a/buildtools/map-list-symbol.sh +++ b/buildtools/map-list-symbol.sh @@ -44,7 +44,7 @@ for file in $@; do ret = 1; } } - /^.*{/ { + /^.*\{/ { if ("'$section'" == "all" || $1 == "'$section'") { current_section = $1; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:28.398459600 +0800 +++ 0068-buildtools-fix-build-with-busybox.patch 2021-05-10 23:59:26.420000000 +0800 @@ -1 +1 @@ -From e1ab26df4862143b81719957977988271505198a Mon Sep 17 00:00:00 2001 +From 1555f48f85eebdd5ad37bc2c8b776396cd70c8a2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit e1ab26df4862143b81719957977988271505198a ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org