Message ID | 20210319145730.3555384-3-thomas@monjalon.net (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Thomas Monjalon |
Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C1DC1A0562; Fri, 19 Mar 2021 15:57:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19D91140EEB; Fri, 19 Mar 2021 15:57:47 +0100 (CET) Received: from wnew3-smtp.messagingengine.com (wnew3-smtp.messagingengine.com [64.147.123.17]) by mails.dpdk.org (Postfix) with ESMTP id B37D8140ED3; Fri, 19 Mar 2021 15:57:44 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.west.internal (Postfix) with ESMTP id CFBA01328; Fri, 19 Mar 2021 10:57:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 19 Mar 2021 10:57:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=TrTC4O5POxyjr dYegNHDsMuQIymsCGMDrQ0VfV75s8Y=; b=zcnn/yDt+RcWk8JkPK6ZcLdQuzTM8 ablpmCHC2ApgJ+PfTAygFsm8FkVMZQ7r1Rq3QnCTqo/zO9rZISlCQ63pH6Nj9gRl tk88QojGJILM+T0nymAWa601qmvT4APOat7+jTj+r0u0lh3uyOYh8quhhOHZEfSt GBi/kaeqvO3xSW2sAY3SOMv4v3mSmaJFpmoBdVw+YDZ9CUDl4vNCiauRgBvODmTQ g4qReXpRAmq4xVGJXv6BVLBjURIPKXQfTX1jl3mTLhWw87rOksM5E5WW9pZ9hsOf IPyp65Eukaq7RheakenLLIvm37hKKQ1X7PzoFPIUWKY0Ek3Lk1QckhyXw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=TrTC4O5POxyjrdYegNHDsMuQIymsCGMDrQ0VfV75s8Y=; b=DpurK6q/ 48oXi+bxueGcQH9c2bsQDZzbJIS42cjYsxScw4ZbhL4iyIsuP9M4i6X3yKLGMwmx +Z3FDX2xnh9Ky6ZtMAXFIRKB2E/rzXTHHnNIZTeTmFfVwuslQgGsakNu/D7NBLbs 80P+M0aaPudB3xyRjyAzDAg8Fyp0rVGHI1cv3hQELElHjeX1y/h7Y5SIEMxUgvwJ hAaFNznU0SRD5iKQW8qH+zX+lsMIfdirwxmHjw7dmQLOEhrfWacWEjGn6JPxqkq5 x2a43O686NfxFprhH/HBH4phyFC4BWWyM8pfAdyV7n8YtrFG1qE6YbMMCEpdBLMg JLBC/zi9Sybtlw== X-ME-Sender: <xms:5btUYPeTVomMws7CSTC9k42k_SfRYgIpnNOej4OhS3KnjcYTRGKkUg> <xme:5btUYFMGdyRMV2aBkXoSu301CE4IyO6Mm8x2hQkMD4FOopcDS8Ttk4OsvGKiyiu6i rhvk6qHAMnVYsehTA> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudefkedgjeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepudduheevgfffvedtteefteekhefhheffkeffgfdvtdefjefgteei fffhffdtuddtnecuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeejjedrudefgedrvd dtfedrudekgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght X-ME-Proxy: <xmx:5btUYIibQDzFBiOPy2O8CqQnDCkPeGYbRxEZJ8WVsfmGFTE9XW8E6w> <xmx:5btUYA_VgUmGa-wWCy43fq6JGKm4xzNzajo2RS7KLo4OXBZjS1wrZQ> <xmx:5btUYLv1ypllzFUkiVeimnKd_BLHQVUTP0lX4D6ZuGvD9fmdVzLhVg> <xmx:5rtUYBB27X7LkP7CJ2JNMEZTeZE6ENMDR8ULZKwj-cMWk0-bkfL6Z-_Y-78> Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id BD6CB24005A; Fri, 19 Mar 2021 10:57:40 -0400 (EDT) From: Thomas Monjalon <thomas@monjalon.net> To: dev@dpdk.org Cc: ncopa@alpinelinux.org, stable@dpdk.org, Bruce Richardson <bruce.richardson@intel.com>, Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>, David Marchand <david.marchand@redhat.com>, Konstantin Ananyev <konstantin.ananyev@intel.com>, Ray Kinsella <mdr@ashroe.eu>, Neil Horman <nhorman@tuxdriver.com>, Haiyue Wang <haiyue.wang@intel.com>, Adrien Mazarguil <adrien.mazarguil@6wind.com> Date: Fri, 19 Mar 2021 15:57:15 +0100 Message-Id: <20210319145730.3555384-3-thomas@monjalon.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210319145730.3555384-1-thomas@monjalon.net> References: <20190313170657.16688-1-ncopa@alpinelinux.org> <20210319145730.3555384-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v7 02/17] buildtools: fix build with busybox X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> |
Series |
Alpine/musl build support
|
|
Checks
Context | Check | Description |
---|---|---|
ci/checkpatch | success | coding style OK |
Commit Message
Thomas Monjalon
March 19, 2021, 2:57 p.m. UTC
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 <thomas@monjalon.net> Acked-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> Acked-by: David Marchand <david.marchand@redhat.com> --- buildtools/binutils-avx512-check.sh | 2 +- buildtools/check-symbols.sh | 2 +- buildtools/map-list-symbol.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Comments
On 19/03/2021 14:57, Thomas Monjalon wrote: > 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 <thomas@monjalon.net> > Acked-by: Bruce Richardson <bruce.richardson@intel.com> > Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> > Acked-by: David Marchand <david.marchand@redhat.com> > --- > 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..6723e38450 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##*/}.XXXXXX) Does it make sense to change it to DUMPFILE=$(mktemp -t dpdk.${0##*/}.objdump.XXXXXX) So we can preserve what the file is in the filename? > 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; > } >
22/03/2021 09:52, Kinsella, Ray: > On 19/03/2021 14:57, Thomas Monjalon wrote: > > --- a/buildtools/check-symbols.sh > > +++ b/buildtools/check-symbols.sh > > -DUMPFILE=$(mktemp -t dpdk.${0##*/}.XXX.objdump) > > +DUMPFILE=$(mktemp -t dpdk.${0##*/}.XXXXXX) > > Does it make sense to change it to > > DUMPFILE=$(mktemp -t dpdk.${0##*/}.objdump.XXXXXX) > > So we can preserve what the file is in the filename? Yes could be. There is already the name of the script in the temp filename, but I am OK to add more details. If there is no other comment, I will change when applying.
On 22/03/2021 08:55, Thomas Monjalon wrote: > 22/03/2021 09:52, Kinsella, Ray: >> On 19/03/2021 14:57, Thomas Monjalon wrote: >>> --- a/buildtools/check-symbols.sh >>> +++ b/buildtools/check-symbols.sh >>> -DUMPFILE=$(mktemp -t dpdk.${0##*/}.XXX.objdump) >>> +DUMPFILE=$(mktemp -t dpdk.${0##*/}.XXXXXX) >> >> Does it make sense to change it to >> >> DUMPFILE=$(mktemp -t dpdk.${0##*/}.objdump.XXXXXX) >> >> So we can preserve what the file is in the filename? > > Yes could be. > There is already the name of the script in the temp filename, > but I am OK to add more details. > > If there is no other comment, I will change when applying. > Nothing from me ...
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..6723e38450 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##*/}.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; }