diff options
author | Thierry Reding <treding@nvidia.com> | 2017-12-14 08:33:38 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2017-12-19 03:13:26 -0500 |
commit | 5d32407396b0433f9b738fcfcb9599bcba7379ae (patch) | |
tree | c753bed76a3d90583f286ac96d64addca919fb4a | |
parent | b65c7b8aeac818eb8f80ce825073c12ad081b177 (diff) |
cfg80211: always rewrite generated files from scratch
Currently the certs C code generation appends to the generated files,
which is most likely a leftover from commit 715a12334764 ("wireless:
don't write C files on failures"). This causes duplicate code in the
generated files if the certificates have their timestamps modified
between builds and thereby trigger the generation rules.
Fixes: 715a12334764 ("wireless: don't write C files on failures")
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | net/wireless/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/Makefile b/net/wireless/Makefile index d7d6cb00c47b..b662be3422e1 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile | |||
@@ -43,7 +43,7 @@ $(obj)/shipped-certs.c: $(wildcard $(srctree)/$(src)/certs/*.x509) | |||
43 | echo "$$allf"; \ | 43 | echo "$$allf"; \ |
44 | echo '};'; \ | 44 | echo '};'; \ |
45 | echo 'unsigned int shipped_regdb_certs_len = sizeof(shipped_regdb_certs);'; \ | 45 | echo 'unsigned int shipped_regdb_certs_len = sizeof(shipped_regdb_certs);'; \ |
46 | ) >> $@) | 46 | ) > $@) |
47 | 47 | ||
48 | $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \ | 48 | $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \ |
49 | $(wildcard $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%)/*.x509) | 49 | $(wildcard $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%)/*.x509) |
@@ -66,4 +66,4 @@ $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \ | |||
66 | echo "$$allf"; \ | 66 | echo "$$allf"; \ |
67 | echo '};'; \ | 67 | echo '};'; \ |
68 | echo 'unsigned int extra_regdb_certs_len = sizeof(extra_regdb_certs);'; \ | 68 | echo 'unsigned int extra_regdb_certs_len = sizeof(extra_regdb_certs);'; \ |
69 | ) >> $@) | 69 | ) > $@) |