From e1ab26df4862143b81719957977988271505198a 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 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") Cc: stable@dpdk.org 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.20.1