diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-02-05 13:47:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-05 13:47:41 -0500 |
| commit | f3ba942f073358d1bca82a389da9f7da6e8fe81f (patch) | |
| tree | 6d94f2d703f38d241f587b2916e6d8cea2de2de1 | |
| parent | afaa12d9f49814eadca50554f528477078cb58f0 (diff) | |
| download | wireless-regdb-f3ba942f073358d1bca82a389da9f7da6e8fe81f.tar.gz | |
wireless-regdb: update sha1sum.txt in Makefile and fix REGDB_CHANGED
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | sha1sum.txt | 2 |
2 files changed, 7 insertions, 6 deletions
@@ -34,16 +34,14 @@ REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem -REGDB_CHANGED = $(shell $(SHA1SUM) -c --status sha1sum.txt; \ - if [ $$? -eq 0 ]; then \ - echo ; \ - else \ +REGDB_CHANGED = $(shell $(SHA1SUM) -c --status sha1sum.txt >/dev/null 2>&1; \ + if [ $$? -ne 0 ]; then \ echo maintainer-clean $(REGDB_PUBKEY); \ fi) .PHONY: all clean mrproper install maintainer-clean install-distro-key -all: $(REGDB_CHANGED) regulatory.bin +all: $(REGDB_CHANGED) regulatory.bin sha1sum.txt clean: @rm -f *.pyc *.gz @@ -59,6 +57,9 @@ regulatory.bin: db.txt $(REGDB_PRIVKEY) $(REGDB_PUBKEY) @echo Generating $@ digitally signed by $(REGDB_AUTHOR)... ./db2bin.py regulatory.bin db.txt $(REGDB_PRIVKEY) +sha1sum.txt: db.txt + sha1sum $< > $@ + $(REGDB_PUBKEY): $(REGDB_PRIVKEY) @echo "Generating public key for $(REGDB_AUTHOR)..." openssl rsa -in $(REGDB_PRIVKEY) -out $(REGDB_PUBKEY) -pubout -outform PEM diff --git a/sha1sum.txt b/sha1sum.txt index 2985f4b..a92578d 100644 --- a/sha1sum.txt +++ b/sha1sum.txt @@ -1 +1 @@ -f4b4e10f3435a580300d44d08f21392bcda4e28a db.txt +c71a078b0216ea1f762271d5f655dd5ac14d3868 db.txt |