From patchwork Wed Feb 7 06:41:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Forney X-Patchwork-Id: 10204653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 105EA60327 for ; Wed, 7 Feb 2018 06:43:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD18228DD5 for ; Wed, 7 Feb 2018 06:43:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C19FD28E03; Wed, 7 Feb 2018 06:43:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F09528DD5 for ; Wed, 7 Feb 2018 06:43:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753456AbeBGGnI (ORCPT ); Wed, 7 Feb 2018 01:43:08 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:43919 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753449AbeBGGnI (ORCPT ); Wed, 7 Feb 2018 01:43:08 -0500 Received: by mail-pf0-f194.google.com with SMTP id b62so1752243pfk.10 for ; Tue, 06 Feb 2018 22:43:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mforney-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=M4lUpNEC94jQpDq9vFFUk+pzT9SzCnR9LmuWfvTi48M=; b=UBNtY0PWqvI26YvHLPw3Jv1H6nEkqEVbE74dqI6hrbLq6emCsGcCeZrTw/qiwcmNQo FNb3Di6MSX5R84ofqcPjPsf60RivYOREDBDIct+oHi9w4td7/3a+sMkmcdnRdsIo7Odl pq4Da6nqjP4BzgLV/DyYKs275EZ2VmUzWGxUUZwRmidgRgpm5ziPKANe0aSThtZVaWqB 5j+fwpuP+XZeGilzKckzQ0RfJZDemVzcVM5ePY/QdJOkSw5scWLPJ4qGVBY8RiR/zGSX 9GpQdLm55Ysd3F9ws58IbrciZwWde9343ZaND7NH1vNRram8JpdbAlrHsuQ4GRvcpt+m 8K6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=M4lUpNEC94jQpDq9vFFUk+pzT9SzCnR9LmuWfvTi48M=; b=aGDOdd6RmvBeeZ9lkxC+P7jRUX9UXsVBNa/RfUCxvOl2L2XtTw8rsuBTwFqsgEPFpE cubk3jTwnpSSTeNvnjhZOIXtLbFtKUFA6vXxaOFQUsAhmcnkLMgrkQOUS0gHKn0Th2HR 5tBNY2UAMnl1bh+AEMrzprbmnftUbCTceK5isZ4cwjcP9XyEOH9C1pfnQFIqYJqrGZFq HySbObmj16MpV8D8e8A0YwSo5CA+i+ZMkTv25+PMf9aX+haIaQ+RgSXUErSFhHRNpZGT 1GmmmBA8HUjJGlGsZgj34jhpYZrtqJERsvmoWxDbpdDFifZjA7BltCkoFO+GHIfVPE8f IQbw== X-Gm-Message-State: APf1xPCnMc3oc9J3zA7U3Lb8J4GH6RRk1xwIVb23TTPBNSzpylS9oRhy 2oq82IBgzEJ91nihUaUVS5MM9EmvAiY= X-Google-Smtp-Source: AH8x2262a74u3dcgSeAWAUv91XrAmu9jbX1jiRLR9IqKcSifGjtX4+GnBLglBIVFcg1/6Qcm+RuOiw== X-Received: by 10.99.62.205 with SMTP id l196mr3904370pga.288.1517985786979; Tue, 06 Feb 2018 22:43:06 -0800 (PST) Received: from localhost ([2601:647:5100:1da4::1bab]) by smtp.gmail.com with ESMTPSA id k14sm2084228pfb.15.2018.02.06.22.43.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Feb 2018 22:43:05 -0800 (PST) From: Michael Forney To: linux-kbuild@vger.kernel.org Subject: [PATCH v2] kbuild: Improve portability of some sed invocations Date: Tue, 6 Feb 2018 22:41:17 -0800 Message-Id: <20180207064117.28338-1-mforney@mforney.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180128225651.1134-1-mforney@mforney.org> References: <20180128225651.1134-1-mforney@mforney.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Michael Forney * Use BREs where EREs aren't necessary. * Pass -E instead of -r to use EREs. This will be standardized in the next POSIX revision[0]. GNU sed supports this since 4.2 (May 2009), and busybox since 1.22.0 (Jan 2014). * Use the [:space:] character class instead of ` \t` in bracket expressions. In bracket expressions, POSIX says that loses its special meaning, so a conforming implementation cannot expand \t to [1]. * In BREs, use interval expressions (\{n,m\}) instead of non-standard features like \+ and \?. * Use a loop instead of -s flag. There are still plenty of other cases of non-standard sed invocations (use of ERE features in BREs, in-place editing), but this fixes some core ones. [0] http://austingroupbugs.net/view.php?id=528 [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03_05 Signed-off-by: Michael Forney --- Changes in v2: Use [:space:] character class instead of literal character. scripts/Kbuild.include | 2 +- scripts/Makefile.build | 2 +- scripts/adjust_autoksyms.sh | 4 +++- scripts/gen_initramfs_list.sh | 2 +- scripts/headers_install.sh | 10 +++++----- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 065324a8046f..34cbd81024b0 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -368,7 +368,7 @@ ksym_dep_filter = \ $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ boot*|build*|cpp_its_S|*cpp_lds_S|dtc|host*|vdso*) : ;; \ *) echo "Don't know how to preprocess $(1)" >&2; false ;; \ - esac | tr ";" "\n" | sed -rn 's/^.*=== __KSYM_(.*) ===.*$$/KSYM_\1/p' + esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/KSYM_\1/p' cmd_and_fixdep = \ $(echo-cmd) $(cmd_$(1)); \ diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 47cddf32aeba..116d520ec755 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -306,7 +306,7 @@ endef # List module undefined symbols (or empty line if not enabled) ifdef CONFIG_TRIM_UNUSED_KSYMS -cmd_undef_syms = $(NM) $@ | sed -n 's/^ \+U //p' | xargs echo +cmd_undef_syms = $(NM) $@ | sed -n 's/^ *U //p' | xargs echo else cmd_undef_syms = echo endif diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 513da1a4a2da..a162258ab606 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -60,7 +60,9 @@ cat > "$new_ksyms_file" << EOT EOT [ "$(ls -A "$MODVERDIR")" ] && -sed -ns -e '3{s/ /\n/g;/^$/!p;}' "$MODVERDIR"/*.mod | sort -u | +for mod in "$MODVERDIR"/*.mod; do + sed -n -e '3{s/ /\n/g;/^$/!p;}' "$mod" +done | sort -u | while read sym; do if [ -n "$CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX" ]; then sym="${sym#_}" diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index 86a3c0e5cfbc..10e528b3a08f 100755 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh @@ -194,7 +194,7 @@ input_file() { source="$1" if [ -f "$1" ]; then ${dep_list}header "$1" - is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\?/cpio/')" + is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\{0,1\}/cpio/')" if [ $2 -eq 0 -a ${is_cpio} = "cpio" ]; then cpio_file=$1 echo "$1" | grep -q '^.*\.cpio\..*' && is_cpio_compressed="compressed" diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh index a18bca720995..593f8879c641 100755 --- a/scripts/headers_install.sh +++ b/scripts/headers_install.sh @@ -31,13 +31,13 @@ trap 'rm -f "$OUTDIR/$FILE" "$OUTDIR/$FILE.sed"' EXIT for i in "$@" do FILE="$(basename "$i")" - sed -r \ - -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \ - -e 's/__attribute_const__([ \t]|$)/\1/g' \ + sed -E \ + -e 's/([[:space:](])(__user|__force|__iomem)[[:space:]]/\1/g' \ + -e 's/__attribute_const__([[:space:]]|$)/\1/g' \ -e 's@^#include @@' \ -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ - -e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \ - -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \ + -e 's/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g' \ + -e 's@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @' \ "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \ > "$OUTDIR/$FILE"