Skip to contentSkip to conversation

core/pkg-meson: simplify sed-expression to add to [binaries]

PATCH New Yann E. MORIN 2 participants 2 messages Oct 6, 2019 – Oct 8, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 core/pkg-meson: simplify sed-expression to add to [binaries]

There is no need to memorise the matched pattern; it's a left-over from a previous attempt.

However, ensure the pattern is correctly anchored to the beginning and end of the line, to avoid accidentally matching it anywhere else (e,g, in a comment).

Cc Eric Le Bihan <[email protected]>
Cc Peter Seiderer <[email protected]>
Cc Thomas De Schampheleire <[email protected]>
---
 package/pkg-meson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-meson.mk +1 -1
index f5c7b8ced3..184a22a44a 100644
@@ -80,7 +80,7 @@ define $(2)_CONFIGURE_CMDS
 	    -e "s%@TARGET_CXXFLAGS@%$$($(2)_MESON_SED_CXXFLAGS)%g" \
 	    -e "s%@HOST_DIR@%$$(HOST_DIR)%g" \
 	    $$(foreach x,$$($(2)_MESON_EXTRA_BINARIES), \
-	        -e "/\(\[binaries\]\)/s:$$$$:\n$$(x):" \
+	        -e "/^\[binaries\]$$$$/s:$$$$:\n$$(x):" \
 	    ) \
 	    package/meson/cross-compilation.conf.in \
 	    > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 core/pkg-meson: simplify sed-expression to add to [binaries]

Quoted 7 lines · On Sun, 6 Oct 2019 17:10:21 +0200 "Yann E. MORIN" <[email protected]>…

There is no need to memorise the matched pattern; it's a left-over from a previous attempt.

However, ensure the pattern is correctly anchored to the beginning and end of the line, to avoid accidentally matching it anywhere else (e,g, in a comment).

Quoted 7 lines
Cc Eric Le Bihan <[email protected]>
Cc Peter Seiderer <[email protected]>
Cc Thomas De Schampheleire <[email protected]>
---
 package/pkg-meson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com