From patchwork Thu Aug 5 10:21:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4599 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 4GgPnk67Rtz3xGN for ; Thu, 5 Aug 2021 10:23:06 +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 4GgPnk2zWcz6f2; Thu, 5 Aug 2021 10:23:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GgPnk20mtz2y1k; Thu, 5 Aug 2021 10:23:06 +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 4GgPnj0T2Yz2xjs for ; Thu, 5 Aug 2021 10:23:05 +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 4GgPnh2JDRz6f2; Thu, 5 Aug 2021 10:23:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1628158984; 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=ggUbxmaKFOHmkchWnWCTNOg/G9UQz0fh1wdxreK0nN8=; b=pmEMxs6zHZuHUvAbxnEnWLRpQqnDASIYvRiGkGqkrueeM7MkoupKje6SEr6lQTK+1/rWik 77SbD+9so191iHBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1628158984; 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=ggUbxmaKFOHmkchWnWCTNOg/G9UQz0fh1wdxreK0nN8=; b=VQ0UhbERcz39JDWVKm1y4NSHy2vLbcu/9FKoUpvoxOf0EnOKhWq3bbCAKlGfdg4l6B+R25 EvPzRw2TrnGbuczgQkVmKHL8o1BupV8T9/Y1C3FRaFo8H6KHfoEzUTUQDYjcHD22U1iSe5 BGbIoscfauzcSjNodDy/T2Vnvg+eRt+zv4xf3nW1tIg9gaujERXxBCupG6zMBLzYNxuy37 2ErxlXSZGBJ2TabaCPWSeh6Y0CwGilAxA/UAD43rTKtrZc7POd1EQhaxSf3RWiLorw+9xY KBsoaQ8CjoReLhOMQqEd8oHOvEHZSAnNG19XXQ+BVn/T2JWn/fXns1zo1YeqxA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v3 7/8] wireless-regdb: Use db.txt file for wlanap.cgi Date: Thu, 5 Aug 2021 12:21:21 +0200 Message-Id: <20210805102122.3484023-7-adolf.belka@ipfire.org> In-Reply-To: <20210805102122.3484023-1-adolf.belka@ipfire.org> References: <20210805102122.3484023-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 db.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)