Skip to content

Commit

Permalink
wireless: Skip directory when generating certificates
Browse files Browse the repository at this point in the history
Commit 715a123 ("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: 715a123 ("wireless: don't write C files on failures")
Signed-off-by: Maxim Mikityanskiy <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
  • Loading branch information
gentoo-root authored and jmberg-intel committed May 14, 2019
1 parent 63863ee commit 32b5a2c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions net/wireless/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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' | \
Expand Down

0 comments on commit 32b5a2c

Please sign in to comment.