* [PATCH] kbuild: Improve portability of some sed invocations
@ 2018-01-28 22:56 Michael Forney
2018-01-30 8:03 ` Michael Forney
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Michael Forney @ 2018-01-28 22:56 UTC (permalink / raw)
To: linux-kbuild
From: Michael Forney <forney@google.com>
* 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 a literal <tab> instead of \t in bracket expressions. In bracket
expressions, POSIX says that <backslash> loses its special meaning, so
a conforming implementation cannot expand \t to <tab>[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
---
scripts/Kbuild.include | 2 +-
scripts/Makefile.build | 2 +-
scripts/adjust_autoksyms.sh | 4 +++-
scripts/gen_initramfs_list.sh | 2 +-
| 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 cb8997ed0149..524000a4ccda 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -300,7 +300,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"
--git a/scripts/headers_install.sh b/scripts/headers_install.sh
index a18bca720995..7328394cf9e8 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/([ (])(__user|__force|__iomem)[ ]/\1/g' \
+ -e 's/__attribute_const__([ ]|$)/\1/g' \
-e 's@^#include <linux/compiler(|_types).h>@@' \
-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/(^|[ (])(inline|asm|volatile)([ (]|$)/\1__\2__\3/g' \
+ -e 's@#(ifndef|define|endif[ ]*/[*])[ ]*_UAPI@#\1 @' \
"$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
> "$OUTDIR/$FILE"
--
2.15.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] kbuild: Improve portability of some sed invocations
2018-01-28 22:56 [PATCH] kbuild: Improve portability of some sed invocations Michael Forney
@ 2018-01-30 8:03 ` Michael Forney
2018-02-06 8:24 ` Masahiro Yamada
2018-02-07 6:41 ` [PATCH v2] " Michael Forney
2 siblings, 0 replies; 6+ messages in thread
From: Michael Forney @ 2018-01-30 8:03 UTC (permalink / raw)
To: linux-kbuild
On 2018-01-28, Michael Forney <mforney@mforney.org> wrote:
> From: Michael Forney <forney@google.com>
>
> * 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 a literal <tab> instead of \t in bracket expressions. In bracket
> expressions, POSIX says that <backslash> loses its special meaning, so
> a conforming implementation cannot expand \t to <tab>[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
Forgot to add
Signed-off-by: Michael Forney <forney@google.com>
> ---
> 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 cb8997ed0149..524000a4ccda 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -300,7 +300,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..7328394cf9e8 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/([ (])(__user|__force|__iomem)[ ]/\1/g' \
> + -e 's/__attribute_const__([ ]|$)/\1/g' \
> -e 's@^#include <linux/compiler(|_types).h>@@' \
> -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/(^|[ (])(inline|asm|volatile)([ (]|$)/\1__\2__\3/g' \
> + -e 's@#(ifndef|define|endif[ ]*/[*])[ ]*_UAPI@#\1 @' \
> "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
> scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
> > "$OUTDIR/$FILE"
> --
> 2.15.1
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] kbuild: Improve portability of some sed invocations
2018-01-28 22:56 [PATCH] kbuild: Improve portability of some sed invocations Michael Forney
2018-01-30 8:03 ` Michael Forney
@ 2018-02-06 8:24 ` Masahiro Yamada
2018-02-06 8:57 ` Michael Forney
2018-02-07 6:41 ` [PATCH v2] " Michael Forney
2 siblings, 1 reply; 6+ messages in thread
From: Masahiro Yamada @ 2018-02-06 8:24 UTC (permalink / raw)
To: Michael Forney; +Cc: Linux Kbuild mailing list
2018-01-29 7:56 GMT+09:00 Michael Forney <mforney@mforney.org>:
> From: Michael Forney <forney@google.com>
>
> * 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 a literal <tab> instead of \t in bracket expressions. In bracket
> expressions, POSIX says that <backslash> loses its special meaning, so
> a conforming implementation cannot expand \t to <tab>[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
> ---
> 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 cb8997ed0149..524000a4ccda 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -300,7 +300,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..7328394cf9e8 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/([ (])(__user|__force|__iomem)[ ]/\1/g' \
> + -e 's/__attribute_const__([ ]|$)/\1/g' \
I am afraid this is unreadable.
Does [[:SPACE:]] work?
> -e 's@^#include <linux/compiler(|_types).h>@@' \
> -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/(^|[ (])(inline|asm|volatile)([ (]|$)/\1__\2__\3/g' \
> + -e 's@#(ifndef|define|endif[ ]*/[*])[ ]*_UAPI@#\1 @' \
> "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
> scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
> > "$OUTDIR/$FILE"
> --
> 2.15.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] kbuild: Improve portability of some sed invocations
2018-02-06 8:24 ` Masahiro Yamada
@ 2018-02-06 8:57 ` Michael Forney
0 siblings, 0 replies; 6+ messages in thread
From: Michael Forney @ 2018-02-06 8:57 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: Linux Kbuild mailing list
On 2018-02-06, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> 2018-01-29 7:56 GMT+09:00 Michael Forney <mforney@mforney.org>:
>> diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
>> index a18bca720995..7328394cf9e8 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/([ (])(__user|__force|__iomem)[ ]/\1/g' \
>> + -e 's/__attribute_const__([ ]|$)/\1/g' \
>
> I am afraid this is unreadable.
>
> Does [[:SPACE:]] work?
Yep, I can resend with [[:space:]] instead of the literal <tab>.
Thanks for taking a look.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] kbuild: Improve portability of some sed invocations
2018-01-28 22:56 [PATCH] kbuild: Improve portability of some sed invocations Michael Forney
2018-01-30 8:03 ` Michael Forney
2018-02-06 8:24 ` Masahiro Yamada
@ 2018-02-07 6:41 ` Michael Forney
2018-02-18 23:41 ` Masahiro Yamada
2 siblings, 1 reply; 6+ messages in thread
From: Michael Forney @ 2018-02-07 6:41 UTC (permalink / raw)
To: linux-kbuild
From: Michael Forney <forney@google.com>
* 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 <backslash> loses
its special meaning, so a conforming implementation cannot expand \t
to <tab>[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 <forney@google.com>
---
Changes in v2:
Use [:space:] character class instead of literal <tab> character.
scripts/Kbuild.include | 2 +-
scripts/Makefile.build | 2 +-
scripts/adjust_autoksyms.sh | 4 +++-
scripts/gen_initramfs_list.sh | 2 +-
| 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"
--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 <linux/compiler(|_types).h>@@' \
-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"
--
2.16.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] kbuild: Improve portability of some sed invocations
2018-02-07 6:41 ` [PATCH v2] " Michael Forney
@ 2018-02-18 23:41 ` Masahiro Yamada
0 siblings, 0 replies; 6+ messages in thread
From: Masahiro Yamada @ 2018-02-18 23:41 UTC (permalink / raw)
To: Michael Forney; +Cc: Linux Kbuild mailing list
2018-02-07 15:41 GMT+09:00 Michael Forney <mforney@mforney.org>:
> From: Michael Forney <forney@google.com>
>
> * 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 <backslash> loses
> its special meaning, so a conforming implementation cannot expand \t
> to <tab>[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 <forney@google.com>
> ---
> Changes in v2:
> Use [:space:] character class instead of literal <tab> character.
Applied to linux-kbuild/kbuild.
Thanks!
> 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 <linux/compiler(|_types).h>@@' \
> -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"
> --
> 2.16.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-02-18 23:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-28 22:56 [PATCH] kbuild: Improve portability of some sed invocations Michael Forney
2018-01-30 8:03 ` Michael Forney
2018-02-06 8:24 ` Masahiro Yamada
2018-02-06 8:57 ` Michael Forney
2018-02-07 6:41 ` [PATCH v2] " Michael Forney
2018-02-18 23:41 ` Masahiro Yamada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.