From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v4 7/8] wireless-regdb: Use db.txt file for wlanap.cgi
Date: Thu, 05 Aug 2021 23:01:51 +0200
Message-ID: <20210805210152.3467498-7-adolf.belka@ipfire.org>
In-Reply-To: <20210805210152.3467498-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7336127789095940136=="
List-Id: <development.lists.ipfire.org>

--===============7336127789095940136==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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(a)ipfire.org>
---
 config/rootfiles/common/wireless-regdb | 1 +
 lfs/wireless-regdb                     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/rootfiles/common/wireless-regdb b/config/rootfiles/common=
/wireless-regdb
index 7e830ae1f..12376c6e7 100644
--- 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 6cffd34ba..8b89795ae 100644
--- 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)
--=20
2.32.0


--===============7336127789095940136==--