rust-for-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] rust: Use grep -Ev rather than relying on GNU grep
@ 2023-09-28 20:14 Matthew Maurer
  2023-09-28 21:00 ` Trevor Gross
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Matthew Maurer @ 2023-09-28 20:14 UTC (permalink / raw)
  To: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho
  Cc: Matthew Maurer, Boqun Feng, Gary Guo, Björn Roy Baron,
	Benno Lossin, Andreas Hindborg, Alice Ryhl, rust-for-linux,
	linux-kernel

While GNU grep supports '\|' when in basic regular expression mode, not
all grep implementations do (notably toybox grep, used to build the
Android kernel, does not). Switching to grep -Ev enables extended
regular expresions which includes support for the '|' operator.

Signed-off-by: Matthew Maurer <mmaurer@google.com>
---
 rust/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/Makefile b/rust/Makefile
index 87958e864be0..e6fb7cafc0bc 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -336,13 +336,13 @@ quiet_cmd_bindgen = BINDGEN $@
 		$(bindgen_target_cflags) $(bindgen_target_extra)
 
 $(obj)/bindings/bindings_generated.rs: private bindgen_target_flags = \
-    $(shell grep -v '^#\|^$$' $(srctree)/$(src)/bindgen_parameters)
+    $(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters)
 $(obj)/bindings/bindings_generated.rs: $(src)/bindings/bindings_helper.h \
     $(src)/bindgen_parameters FORCE
 	$(call if_changed_dep,bindgen)
 
 $(obj)/uapi/uapi_generated.rs: private bindgen_target_flags = \
-    $(shell grep -v '^#\|^$$' $(srctree)/$(src)/bindgen_parameters)
+    $(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters)
 $(obj)/uapi/uapi_generated.rs: $(src)/uapi/uapi_helper.h \
     $(src)/bindgen_parameters FORCE
 	$(call if_changed_dep,bindgen)
-- 
2.42.0.582.g8ccd20d70d-goog


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] rust: Use grep -Ev rather than relying on GNU grep
  2023-09-28 20:14 [PATCH] rust: Use grep -Ev rather than relying on GNU grep Matthew Maurer
@ 2023-09-28 21:00 ` Trevor Gross
  2023-09-28 21:04 ` Martin Rodriguez Reboredo
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Trevor Gross @ 2023-09-28 21:00 UTC (permalink / raw)
  To: Matthew Maurer
  Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
	Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
	Alice Ryhl, rust-for-linux, linux-kernel

On Thu, Sep 28, 2023 at 4:14 PM Matthew Maurer <mmaurer@google.com> wrote:
>
> While GNU grep supports '\|' when in basic regular expression mode, not
> all grep implementations do (notably toybox grep, used to build the
> Android kernel, does not). Switching to grep -Ev enables extended
> regular expresions which includes support for the '|' operator.
>
> Signed-off-by: Matthew Maurer <mmaurer@google.com>
> ---

Reviewed-by: Trevor Gross <tmgross@umich.edu>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] rust: Use grep -Ev rather than relying on GNU grep
  2023-09-28 20:14 [PATCH] rust: Use grep -Ev rather than relying on GNU grep Matthew Maurer
  2023-09-28 21:00 ` Trevor Gross
@ 2023-09-28 21:04 ` Martin Rodriguez Reboredo
  2023-10-02  7:51 ` Alice Ryhl
  2023-10-15 20:05 ` Miguel Ojeda
  3 siblings, 0 replies; 6+ messages in thread
From: Martin Rodriguez Reboredo @ 2023-09-28 21:04 UTC (permalink / raw)
  To: Matthew Maurer, Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho
  Cc: Boqun Feng, Gary Guo, Björn Roy Baron, Benno Lossin,
	Andreas Hindborg, Alice Ryhl, rust-for-linux, linux-kernel

On 9/28/23 17:14, Matthew Maurer wrote:
> While GNU grep supports '\|' when in basic regular expression mode, not
> all grep implementations do (notably toybox grep, used to build the
> Android kernel, does not). Switching to grep -Ev enables extended
> regular expresions which includes support for the '|' operator.
> 
> Signed-off-by: Matthew Maurer <mmaurer@google.com>
> ---
> [...]
Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] rust: Use grep -Ev rather than relying on GNU grep
  2023-09-28 20:14 [PATCH] rust: Use grep -Ev rather than relying on GNU grep Matthew Maurer
  2023-09-28 21:00 ` Trevor Gross
  2023-09-28 21:04 ` Martin Rodriguez Reboredo
@ 2023-10-02  7:51 ` Alice Ryhl
  2023-10-02  8:18   ` Alice Ryhl
  2023-10-15 20:05 ` Miguel Ojeda
  3 siblings, 1 reply; 6+ messages in thread
From: Alice Ryhl @ 2023-10-02  7:51 UTC (permalink / raw)
  To: Matthew Maurer
  Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
	Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
	rust-for-linux, linux-kernel

On Thu, Sep 28, 2023 at 10:14 PM Matthew Maurer <mmaurer@google.com> wrote:
>
> While GNU grep supports '\|' when in basic regular expression mode, not
> all grep implementations do (notably toybox grep, used to build the
> Android kernel, does not). Switching to grep -Ev enables extended
> regular expresions which includes support for the '|' operator.
>
> Signed-off-by: Matthew Maurer <mmaurer@google.com>

LGTM. I tested this in my Android build.

Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Tested-by: Alice Ryhl <aliceryhl@google.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] rust: Use grep -Ev rather than relying on GNU grep
  2023-10-02  7:51 ` Alice Ryhl
@ 2023-10-02  8:18   ` Alice Ryhl
  0 siblings, 0 replies; 6+ messages in thread
From: Alice Ryhl @ 2023-10-02  8:18 UTC (permalink / raw)
  To: Matthew Maurer
  Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
	Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
	rust-for-linux, linux-kernel

On Mon, Oct 2, 2023 at 9:51 AM Alice Ryhl <aliceryhl@google.com> wrote:
>
> On Thu, Sep 28, 2023 at 10:14 PM Matthew Maurer <mmaurer@google.com> wrote:
> >
> > While GNU grep supports '\|' when in basic regular expression mode, not
> > all grep implementations do (notably toybox grep, used to build the
> > Android kernel, does not). Switching to grep -Ev enables extended
> > regular expresions which includes support for the '|' operator.
> >
> > Signed-off-by: Matthew Maurer <mmaurer@google.com>
>
> LGTM. I tested this in my Android build.

Also tested in a non-Android build. Works both places.

> Reviewed-by: Alice Ryhl <aliceryhl@google.com>
> Tested-by: Alice Ryhl <aliceryhl@google.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] rust: Use grep -Ev rather than relying on GNU grep
  2023-09-28 20:14 [PATCH] rust: Use grep -Ev rather than relying on GNU grep Matthew Maurer
                   ` (2 preceding siblings ...)
  2023-10-02  7:51 ` Alice Ryhl
@ 2023-10-15 20:05 ` Miguel Ojeda
  3 siblings, 0 replies; 6+ messages in thread
From: Miguel Ojeda @ 2023-10-15 20:05 UTC (permalink / raw)
  To: Matthew Maurer
  Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
	Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
	Alice Ryhl, rust-for-linux, linux-kernel

On Thu, Sep 28, 2023 at 10:14 PM Matthew Maurer <mmaurer@google.com> wrote:
>
> While GNU grep supports '\|' when in basic regular expression mode, not
> all grep implementations do (notably toybox grep, used to build the
> Android kernel, does not). Switching to grep -Ev enables extended
> regular expresions which includes support for the '|' operator.
>
> Signed-off-by: Matthew Maurer <mmaurer@google.com>

Applied to `rust-next` (with typo fixed) -- thanks everyone!

Cheers,
Miguel

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-10-15 20:05 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-28 20:14 [PATCH] rust: Use grep -Ev rather than relying on GNU grep Matthew Maurer
2023-09-28 21:00 ` Trevor Gross
2023-09-28 21:04 ` Martin Rodriguez Reboredo
2023-10-02  7:51 ` Alice Ryhl
2023-10-02  8:18   ` Alice Ryhl
2023-10-15 20:05 ` Miguel Ojeda

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).