From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20210311075202.1876-1-denis.osterland@diehl.com>
MIME-Version: 1.0
Message-Id: <E1lN9kz-00HXFR-R3@dude03.red.stw.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Fri, 19 Mar 2021 08:41:17 +0100
Subject: Re: [ptxdist] [APPLIED] crda: install regulatory.db too
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Denis Osterland-Heim <denis.osterland@diehl.com>

Thanks, applied as 0067253c890f3eb7d8fb01a0d2975f11ea8b1f76.

Michael

[sent from post-receive hook]

On Fri, 19 Mar 2021 08:41:17 +0100, Denis Osterland-Heim <denis.osterland@diehl.com> wrote:
> Kernel >= 4.15 want to load this file.
> 
> Signed-off-by: Denis Osterland-Heim <denis.osterland@diehl.com>
> Message-Id: <20210311075202.1876-1-denis.osterland@diehl.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/crda.make b/rules/crda.make
> index 724aa7ba9ca9..9cbb7af93d2b 100644
> --- a/rules/crda.make
> +++ b/rules/crda.make
> @@ -74,6 +74,10 @@ $(STATEDIR)/crda.install:
>  	@$(call world/install, CRDA)
>  	@install -vD -m 644 $(CRDA_REGDB_DIR)/$(CRDA_REGDB)/regulatory.bin \
>  		$(CRDA_PKGDIR)/usr/lib/crda/regulatory.bin
> +	@install -vD -m 0644 $(CRDA_REGDB_DIR)/$(CRDA_REGDB)/regulatory.db \
> +		 $(CRDA_PKGDIR)/lib/firmware/regulatory.db
> +	@install -vD -m 0644 $(CRDA_REGDB_DIR)/$(CRDA_REGDB)/regulatory.db.p7s \
> +		 $(CRDA_PKGDIR)/lib/firmware/regulatory.db.p7s
>  	@install -vD -m 644 $(CRDA_REGDB_DIR)/pubkeys/linville.key.pub.pem \
>  		$(CRDA_PKGDIR)/usr/lib/crda/pubkeys/linville.key.pub.pem
>  	@install -vD -m 644 $(CRDA_REGDB_DIR)/pubkeys/sforshee.key.pub.pem \
> @@ -103,6 +107,10 @@ $(STATEDIR)/crda.targetinstall:
>  		/usr/lib/crda/pubkeys)
>  	@$(call install_alternative, crda, 0, 0, 0644, \
>  		/usr/lib/crda/regulatory.bin)
> +	@$(call install_alternative, crda, 0, 0, 0644, \
> +		/lib/firmware/regulatory.db)
> +	@$(call install_alternative, crda, 0, 0, 0644, \
> +		/lib/firmware/regulatory.db.p7s)
>  
>  	@$(call install_finish, crda)
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de