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 45376A0A02 for ; Mon, 17 May 2021 18:12:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E7C141101; Mon, 17 May 2021 18:12:14 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 74CB2410F7 for ; Mon, 17 May 2021 18:12:11 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifqi-0007ge-GT; Mon, 17 May 2021 16:12:08 +0000 From: Christian Ehrhardt To: Thomas Monjalon Cc: Bruce Richardson , Andrew Rybchenko , David Marchand , dpdk stable Date: Mon, 17 May 2021 18:07:48 +0200 Message-Id: <20210517161039.3132619-39-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'buildtools: fix build with busybox' has been queued to stable release 19.11.9 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 19.11.9 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/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/0bbd0f529af66ee1a7c45ac726836d3c63755f55 Thanks. Christian Ehrhardt --- >From 0bbd0f529af66ee1a7c45ac726836d3c63755f55 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 [ 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/check-experimental-syms.sh | 2 +- buildtools/map-list-symbol.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/check-experimental-syms.sh b/buildtools/check-experimental-syms.sh index f3603e5bac..fe07dd38fd 100755 --- a/buildtools/check-experimental-syms.sh +++ b/buildtools/check-experimental-syms.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.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:31.083610591 +0200 +++ 0039-buildtools-fix-build-with-busybox.patch 2021-05-17 17:40:29.171809476 +0200 @@ -1 +1 @@ -From e1ab26df4862143b81719957977988271505198a Mon Sep 17 00:00:00 2001 +From 0bbd0f529af66ee1a7c45ac726836d3c63755f55 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e1ab26df4862143b81719957977988271505198a ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -27,22 +28,8 @@ - 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 + buildtools/check-experimental-syms.sh | 2 +- + buildtools/map-list-symbol.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/buildtools/check-experimental-syms.sh b/buildtools/check-experimental-syms.sh +index f3603e5bac..fe07dd38fd 100755 +--- a/buildtools/check-experimental-syms.sh ++++ b/buildtools/check-experimental-syms.sh