wireless-regdb: Use db.txt file for wlanap.cgi

- db.txt is the text file version of the wireless settings by country database
- Using db.txt means that regdbdump from crda is not required by wlanap.cgi
- This patch copies the db.txt file from the source tarball to /lib/firmware/ where
   it can be read by wlanap.cgi
- This version of the patch renames the db.txt file to regulatorydb.txt
- Updated rootfile to include regulatorydb.txt

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/wireless-regdb b/config/rootfiles/common/wireless-regdb
index 7e830ae1fa5f7d828d052349a30bf73e9db2ae93..12376c6e7afc359ae05a6c5647edab32a42a30a3 100644 (file)
--- a/config/rootfiles/common/wireless-regdb
+++ b/config/rootfiles/common/wireless-regdb
@@ -1,3 +1,4 @@
+lib/firmware/regulatorydb.txt
 lib/firmware/regulatory.db
 lib/firmware/regulatory.db.p7s
 #usr/lib/crda

diff --git a/lfs/wireless-regdb b/lfs/wireless-regdb
index 6cffd34ba28f2d114bff38dfc781577e581317ed..8b89795aed4c88c5b216a7bac1cd52ea696f3477 100644 (file)
--- a/lfs/wireless-regdb
+++ b/lfs/wireless-regdb
@@ -72,5 +72,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make install
+       cp -vf $(DIR_APP)/db.txt /lib/firmware/regulatorydb.txt
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)