crda: fix two bugs

1) wrong wildcard expansion in makefile
2) multiple pubkeys don't work

This fixes both of these issues.

Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/Makefile b/Makefile
index ff3bf31..ab1de94 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,9 @@ Q=@
 NQ=@echo
 endif
 
-keys-%.c: utils/key2pub.py $(PUBKEY_DIR)/$(wildcard *.pem)
+keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
        $(NQ) '  GEN ' $@
-       $(Q)./utils/key2pub.py --$* $(PUBKEY_DIR)/*.pem > $@
+       $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) > $@
 
 %.o: %.c regdb.h
        $(NQ) '  CC  ' $@

diff --git a/utils/key2pub.py b/utils/key2pub.py
index bc1d33d..40c60eb 100755 (executable)
--- a/utils/key2pub.py
+++ b/utils/key2pub.py
@@ -108,5 +108,6 @@ for f in files:
 
     modes[mode][0]('e_%d' % idx, key.e[4:])
     modes[mode][0]('n_%d' % idx, key.n[4:])
+    idx += 1
 
-modes[mode][1](idx)
+modes[mode][1](idx - 1)