Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d830cf2 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Greg Kroah-Hartman
Browse files

wireless: Skip directory when generating certificates 



[ Upstream commit 32b5a2c9950b9284000059d752f7afa164deb15e ]

Commit 715a1233 ("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: 715a1233 ("wireless: don't write C files on failures")
Signed-off-by: default avatarMaxim Mikityanskiy <maxtram95@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 558d2bda

net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,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' | \