diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2017-12-26 19:36:00 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-05 15:55:52 +0100 |
| commit | 2f7fb8d41c1deaaeeba7f8559f09dfd8f5747e46 (patch) | |
| tree | 66096ea966da8b86965411f39e6184e2c32a6ab6 | |
| parent | 105201e0013d4bdaed17778f6b114eea77648b59 (diff) | |
| download | barebox-2f7fb8d41c1deaaeeba7f8559f09dfd8f5747e46.tar.gz barebox-2f7fb8d41c1deaaeeba7f8559f09dfd8f5747e46.tar.xz | |
build: fix that passwd.h is always built
From 48fe20e2bf2249b2f89d96c9787e0b489c015054 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Tue, 26 Dec 2017 18:02:17 +0100
Subject: [PATCH 2/4] build: fix that passwd.h is always built
Use the kbuild provided support for generated
files to avoid that passwd.h is always generated
thus triggering further re-builds
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | common/Makefile | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/common/Makefile b/common/Makefile index 8cd0ab3001..5351ef0f77 100644 --- a/common/Makefile +++ b/common/Makefile @@ -63,27 +63,29 @@ obj-$(CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB) += imx-bbu-nand-fcb.o obj-$(CONFIG_CONSOLE_RATP) += ratp.o obj-$(CONFIG_BOOT) += boot.o -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 "static const char default_passwd[] = \"" > $@; \ - cat $< | tr -d '\n' >> $@; \ - echo "\";" >> $@ -include/generated/passwd.h: $(PASSWD_FILE) - $(call if_changed,pwd_h) +ifeq ($(CONFIG_PASSWORD_DEFAULT),"") +define filechk_passwd + echo "static const char default_passwd[] = \"\";" +endef else -cmd_pwd_h = echo "static const char default_passwd[] = \"\";" > $@ - -include/generated/passwd.h: FORCE - $(call if_changed,pwd_h) +define filechk_passwd +( \ +echo -n "static const char default_passwd[] = \""; \ +cat $(shell find $(srctree) -name $(CONFIG_PASSWORD_DEFAULT) -type f) | tr -d '\n';\ +echo "\";" \ +) +endef endif +include/generated/passwd.h: $(srctree)/$(src)/Makefile FORCE + $(call filechk,passwd) + targets += include/generated/passwd.h $(obj)/password.o: include/generated/passwd.h -endif +endif # CONFIG_PASSWORD # dependencies on generated files need to be listed explicitly $(obj)/version.o: include/generated/compile.h |