]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
wireless: Skip directory when generating certificates
authorMaxim Mikityanskiy <maxtram95@gmail.com>
Tue, 7 May 2019 17:28:15 +0000 (20:28 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 14 May 2019 08:27:57 +0000 (10:27 +0200)
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>
net/wireless/Makefile

index 72a224ce8e0a834d04d99c276de80a6956be9797..2eee93985ab0df8f9bbdcd2d4e146c34ac3899f5 100644 (file)
@@ -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' | \