[PATCH master 14/14] kbuild: remove useless use of /usr/bin/env
Sascha Hauer
sha at pengutronix.de
Tue Apr 11 04:57:03 PDT 2023
On Tue, Apr 11, 2023 at 09:14:36AM +0200, Ahmad Fatoum wrote:
> For some reason, NixOS failed to build device trees, because of the use
> of `/usr/bin/env echo -e` here. Given that calling /usr/bin/env is
> unneeded anyway for echo, let's just drop it and make the NixOS build
> problem go away as well.
/usr/bin/env was used on purpose here, likely because for example the
dash echo builtin does not support the -e option.
See
https://lore.barebox.org/barebox/20220120091433.GJ7102@pengutronix.de/
Michael suggested to use printf back then.
Sascha
>
> Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
> ---
> scripts/Makefile.lib | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 4deaa5dfa73c..8f6dcd7430a1 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -372,7 +372,7 @@ $(obj)/%.dtb.z: $(obj)/%.dtb FORCE
> dts-frags = $(subst $(quote),,$(CONFIG_EXTERNAL_DTS_FRAGMENTS))
> quiet_cmd_dtc = DTC $@
> # For compatibility between make 4.2 and 4.3
> -cmd_dtc = /usr/bin/env echo -e '$(pound)define $(subst -,_,$(*F))_dts 1\n'$(foreach f,$< $(2),'$(pound)include "$(f)"\n') | \
> +cmd_dtc = echo -e '$(pound)define $(subst -,_,$(*F))_dts 1\n'$(foreach f,$< $(2),'$(pound)include "$(f)"\n') | \
> $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
> $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \
> -i $(srctree)/arch/$(SRCARCH)/dts $(DTC_FLAGS) \
> --
> 2.39.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list