From patchwork Thu Aug 5 21:01:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4611 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Ggh0l2vvmz3xGN for ; Thu, 5 Aug 2021 21:03:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Ggh0k5yvcz6cy; Thu, 5 Aug 2021 21:03:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ggh0j1zFkz2xd7; Thu, 5 Aug 2021 21:03:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Ggh0g3bmYz2xKH for ; Thu, 5 Aug 2021 21:03:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ggh0g0Pvyz6XQ; Thu, 5 Aug 2021 21:03:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1628197411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AQz74xxh7n0JetIhSa9MOQGa9vj3aFPgpQDjPXucVeY=; b=osoLJcRhN1lmUjxglby53NGjO7A+9MyyXKCcN0Y+4XBn2dghRUh9FduXylGyXCWzsbgPyI Z7+P2mjWSiZJRmBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1628197411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AQz74xxh7n0JetIhSa9MOQGa9vj3aFPgpQDjPXucVeY=; b=WanWK58UrVaOQz8BJhvqFIySjMe8aLcro4vb8yrVbkoG2OjDX5v3Ca8ooyFAaR9Cx1jv9f bOUyxhTLOT3GAgvQJEzhhNSAK1cvL0LEbYagO7sB9yb4t87Eaq2RfMVZebTq4T7fOzzGvF KqKC4tUpVbkOUnyE5HST2IlK39WhRGdlHY57iB9gJTrLNfFgFQlfnBWBkqH5oaJ9lVvIhZ QH8uz6siQeF8eBrH5loP4W/prBzPfygwrBQwj93nOvvCmZHBW5NyrrLHt6Dt05KWVaBAxS K+nyt9/ucO5MlpLz3hscYo+ZJ2GHiEzikSCzb/d7R5MAtB/tfil3yt+QXaoHrw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v4 7/8] wireless-regdb: Use db.txt file for wlanap.cgi Date: Thu, 5 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> References: <20210805210152.3467498-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 Reviewed-by: Bernhard Bitsch --- 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)