]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rust: Use awk instead of recent xargs
authorMatthew Maurer <mmaurer@google.com>
Thu, 28 Sep 2023 20:49:25 +0000 (20:49 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Sep 2024 09:11:32 +0000 (11:11 +0200)
[ Upstream commit 45f97e6385cad6d0e48a27ddcd08793bb4d35851 ]

`awk` is already required by the kernel build, and the `xargs` feature
used in current Rust detection is not present in all `xargs` (notably,
toybox based xargs, used in the Android kernel build).

Signed-off-by: Matthew Maurer <mmaurer@google.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Tested-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
Link: https://lore.kernel.org/r/20230928205045.2375899-1-mmaurer@google.com
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Stable-dep-of: b8673d56935c ("rust: kbuild: fix export of bss symbols")
Signed-off-by: Sasha Levin <sashal@kernel.org>
rust/Makefile

index e5619f25b55cacb3003f3f174dc003be05db0797..7e33ebe8a9f48e36f6a5ee241d29584fbe64e05f 100644 (file)
@@ -363,9 +363,7 @@ $(obj)/bindings/bindings_helpers_generated.rs: $(src)/helpers.c FORCE
 quiet_cmd_exports = EXPORTS $@
       cmd_exports = \
        $(NM) -p --defined-only $< \
-               | grep -E ' (T|R|D) ' | cut -d ' ' -f 3 \
-               | xargs -Isymbol \
-               echo 'EXPORT_SYMBOL_RUST_GPL(symbol);' > $@
+               | awk '/ (T|R|D) / {printf "EXPORT_SYMBOL_RUST_GPL(%s);\n",$$3}' > $@
 
 $(obj)/exports_core_generated.h: $(obj)/core.o FORCE
        $(call if_changed,exports)