From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10C4F194A42; Tue, 10 Sep 2024 10:29:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725964191; cv=none; b=YrJrhy0K5rQEv9iZ+pyDUNoEQ3tzuoUFoXHozR4GMAu0XM+H+FORUH7u/aeKBCXQunGrLbiYspNWz7Vr5HAOOaJa01mnH4GNP59RQsqS30nW91wLldcw3Y6TkNEwrpIqbSu4hy2TwwQJVD0QrzXTQPky9E9e+EaHsU/hjNeTTH4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725964191; c=relaxed/simple; bh=pkNvrvXpPdqyW38la7R1NjCbKLnV6MHZCPPm7HlA9nE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dmNzpD3vNUa/ynAHI86J7LeZpUWzW6G7wdB+5WyGR5Cd1/Z3PevaXTR4VK2OSpzGinHXseozyHBufPpHqG3YqPlpTchwVD6qK3FRTXcxaa3S9twZ35MtfXw9EzRMEe3MddjTlECofIg6CvISteYZLFIN0amQ6F1SyAPGsQyAGAU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lu2Kysbf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lu2Kysbf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A38DC4CEC3; Tue, 10 Sep 2024 10:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725964190; bh=pkNvrvXpPdqyW38la7R1NjCbKLnV6MHZCPPm7HlA9nE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lu2Kysbf9hXeeKdUzuqilfyijxtAu6wsUnJfkeeU6Grr7sqfU9/ojbFf2Hhl2benf yMOY/Yt8hCpxfBiK7WaP+dLAJy8MfmqYks/gnsCTGOcFrknMn4Y8fwXQORpoXDdEJ+ ZNFdV0H770jLIsMzN4TOk/RBiNxHnwTkHdDH8lMQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Matthew Maurer , Alice Ryhl , Martin Rodriguez Reboredo , Miguel Ojeda , Sasha Levin Subject: [PATCH 6.6 099/269] rust: Use awk instead of recent xargs Date: Tue, 10 Sep 2024 11:31:26 +0200 Message-ID: <20240910092611.746516993@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092608.225137854@linuxfoundation.org> References: <20240910092608.225137854@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthew Maurer [ 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 Reviewed-by: Alice Ryhl Tested-by: Alice Ryhl Reviewed-by: Martin Rodriguez Reboredo Link: https://lore.kernel.org/r/20230928205045.2375899-1-mmaurer@google.com Signed-off-by: Miguel Ojeda Stable-dep-of: b8673d56935c ("rust: kbuild: fix export of bss symbols") Signed-off-by: Sasha Levin --- rust/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rust/Makefile b/rust/Makefile index e5619f25b55c..7e33ebe8a9f4 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -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) -- 2.43.0