diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-01 21:33:32 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-01 21:38:25 +0200 |
| commit | 09dc30ae2fa49a461cd339677e5f6c5e71cc6955 (patch) | |
| tree | 997b0344eda48bc65d940d15d902447da6bd4941 /rules/pre | |
| parent | d7cc755f2ddef75c6ab25171df07388e04d5a0cb (diff) | |
| download | ptxdist-09dc30ae2fa49a461cd339677e5f6c5e71cc6955.tar.gz ptxdist-09dc30ae2fa49a461cd339677e5f6c5e71cc6955.tar.xz | |
fix package hash calculation with --progress
With the latest changes, some things where added to the hash file twice
when --progress was used. As a result, the hashes where different with and
without --progress.
Introduce a helper variable that determintes if make is called for the
first time and use it everywhere.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/pre')
| -rw-r--r-- | rules/pre/000-cfghash.make | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rules/pre/000-cfghash.make b/rules/pre/000-cfghash.make index 2c5ad66dd..07672d7e4 100644 --- a/rules/pre/000-cfghash.make +++ b/rules/pre/000-cfghash.make @@ -10,6 +10,7 @@ # add an arbitrary string to the <PKG>_CFGHASH source # If the string changes, then the package will be rebuilt # +ifdef PTXDIST_SETUP_ONCE define ptx/cfghash $(file >>$(PTXDIST_TEMPDIR)/pkghash-$(strip $(1)),$(strip $(2))) endef @@ -17,5 +18,9 @@ endef define ptx/cfghash-file $(file >>$(PTXDIST_TEMPDIR)/pkghash.list,CONFIG: $(strip $(1)) $(strip $(2))) endef +else +ptx/cfghash := +ptx/cfghash-file := +endif # vim: syntax=make |