diff options
| author |   Maxim Mikityanskiy <maxtram95@gmail.com> | 2019-05-07 20:28:15 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2019-05-14 10:27:57 +0200 |
| commit | 32b5a2c9950b9284000059d752f7afa164deb15e (patch) | |
| tree | 921126f16c8b83206e64e9b94feee923d6174335 /net/wireless | |
| parent | Merge tag 'gcc-plugins-v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/kees/linux (diff) | |
| download | linux-dev-32b5a2c9950b9284000059d752f7afa164deb15e.tar.xz linux-dev-32b5a2c9950b9284000059d752f7afa164deb15e.zip | |
wireless: Skip directory when generating certificates
Commit 715a12334764 ("wireless: don't write C files on failures") drops
the `test -f $$f` check. The list of targets contains the
CONFIG_CFG80211_EXTRA_REGDB_KEYDIR directory itself, and this check used
to filter it out. After the check was removed, the extra keydir option
no longer works, failing with the following message:
od: 'standard input': read error: Is a directory
This commit restores the check to make extra keydir work again.
Fixes: 715a12334764 ("wireless: don't write C files on failures")
Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/Makefile b/net/wireless/Makefile index 72a224ce8e0a..2eee93985ab0 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -39,6 +39,7 @@ $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \ @(set -e; \ allf=""; \ for f in $^ ; do \ + test -f $$f || continue;\ # similar to hexdump -v -e '1/1 "0x%.2x," "\n"' \ thisf=$$(od -An -v -tx1 < $$f | \ sed -e 's/ /\n/g' | \ |