[PATCH] common: fix possible build problem without password support
Sascha Hauer
s.hauer at pengutronix.de
Tue Oct 15 02:37:04 EDT 2013
On Mon, Oct 14, 2013 at 05:39:25PM +0200, Jan Luebbe wrote:
> In the case where CONFIG_PASSWORD is off, CONFIG_PASSWORD_DEFAULT is
> undefined. As undefined is not "", this causes make to call find -type f.
> If there is a filename containing a :, make will complain about having
> "multiple target patterns"
>
> Signed-off-by: Jan Luebbe <jlu at pengutronix.de>
Applied, thanks
Sascha
> ---
> common/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/common/Makefile b/common/Makefile
> index 75d924e..6f6e360 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -116,6 +116,7 @@ $(obj)/barebox_default_env.h: $(obj)/barebox_default_env$(barebox_default_env_co
> $(call if_changed,env_h)
>
> quiet_cmd_pwd_h = PWDH $@
> +ifdef CONFIG_PASSWORD
> ifneq ($(CONFIG_PASSWORD_DEFAULT),"")
> PASSWD_FILE := $(shell cd $(srctree); find $(CONFIG_PASSWORD_DEFAULT) -type f)
> cmd_pwd_h = echo -n "const char default_passwd[] = \"" > $@; \
> @@ -134,6 +135,7 @@ endif
> targets += include/generated/passwd.h
>
> $(obj)/password.o: include/generated/passwd.h
> +endif
>
> # dependencies on generated files need to be listed explicitly
> $(obj)/version.o: include/generated/compile.h
> --
> 1.8.4.rc3
>
>
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list