[ptxdist] [PATCH] crda: extend rule to download versioned regulatory.bin

[ptxdist] [PATCH] crda: extend rule to download versioned regulatory.bin

[Michael Tretter]

The crda reads the regulatory database information from regulatory.bin,
which is updated upon regulatory changes and is versioned.

Extend the crda.make to download a specified version of the database to
document the used database version. This allows to drop the copy of the
regulatory.bin from the projectroot.

Still allow to override the database in a BSP projectroot if necessary.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 projectroot/usr/lib/crda/regulatory.bin | Bin 4968 -> 0 bytes
 rules/crda.make                         |  40 ++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 delete mode 100644 projectroot/usr/lib/crda/regulatory.bin

diff --git a/projectroot/usr/lib/crda/regulatory.bin b/projectroot/usr/lib/crda/regulatory.bin
deleted file mode 100644
index 4f466e8ae1670c8ce779d83404955446f044e5fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4968
zcmZ`+YiwLs5kC8{_wL@CV1$9R31~q!by0p;B$P;T8}Gy3b@q|X?)9?<Ofis#RU6tZ
zjlh6gtP;``1rd-*U5KiZ7!-<uP%Shd7r9bEhFT(`{$aI_>NJV!sv9ZLKoZI~bLQM^
zBDm7o`R<&VZ@!sxt|b>!$+%MLJxV#3VV_mX2SZP2L0h}3ZRCKq?>eGw<1^ZZN3^xB
zYTK|^-mhsJIInHU($@S&_G{GekhacQZ6h^p-`%cl)4Xaqx}aKLEhshBsrnxsP=nTG
z<=Zl@@~;(CVf_MQvOC=Z<I;--)gPTv{x7M(=Vm(tZ#9pr=s(64`|n#Izv{m`tp<Ox
zh2xpO+R6NeQ{|(~O`L>HUBX@r^q9J&&D15_cLy|}7U^vHu~MyPH){Uxx2v5`?_pee
zxSe$nr_n~Zb+$=;WNkaw-Tuam%C-Q5GdsIS<$kt6I53f%_4>+#^M*NqpXwTZ>bLc4
z(|U&aXyD#^X9M%wJ9#ENhr~f|Zls&yDR-b;Wjye^MKy>RwXf<6t}gpR|BkA_noj1~
z|7qq4z#2}nfj76!dNc2R5Z8+I(79kH)QdMynVWk}&x-s5ADr}Js5Z~g+yR+Y?|IAw
znBx&+X4p5eN9(6rxC8Zd2`k?y?o~4u?xTnC%6J2S!LHySEXCvT5tbPLG_d#;eGB4e
zT<=d}50CFWe&Dypfe&e{9;w6l@O($$H}S{o@SKjfNHbx?0A9z&@7DPVlYb8afw|u%
z*v(jYe1u0CYTPWC_Up04tCQMKoQykkEyndRqRopRmw3cbs__$K3=N(ix%`+~c=6F(
zNhkC&MqLk+PUELs!kw_jPgvsBDPZEFz6m47GMF?NO#XEeQ=bd|`WTM~G4+1yAT%r>
z-_<;frIv@m&saEpV~7`Rz9rxa7W6PSeUZOK`~9R(V*C@plItG<?!ZE>|3sbNsq@bR
zLl4IgHvCy&!;kODV0HQ?Eb;7@x{Rf+=SP}vAAXFUavff|j@2r#;UsK036oCDlVgO(
zH*h_MvEhfCb7B01DVLthSXo9Ik7?{DUaE`7KZ~DwOd9a`r|=`#*9I({j7`km>oICZ
zV#Z+!3#aFYi*W}5JQQPiT7W08nozeL*63db-iT#k5uU=LXBmt9c>Kh7fT8kTf)zjG
zviPg8!y5b3u!jV@u#&49!BtZ#@QhLo$ZG%&jbc%51NN?B@3ib46n{|sr{Et^suBBM
z>`958zRnRqAAuS8F}H>(#3PUE61S-f?#9)d_?HnsAwK-A3^XGzbYty?6L9UrIwWz>
z9N4H-a5Hi{zzP1)n6AhEEc`9-k86Ku0eg}YK>grx><wcN`6?(}qdJFqsFx_#F02Yd
z2C$b#&Lncc9a=&jX3DiF4;mWg;X0}7nOZ^F^YoF1E#O1VU==xwh;ITHE;ji?@Uxx*
z4E#apZiE)*gWe!&b6*Ff4(1e~Sn-qg&>Yq!eXTsMLx_Qo&Rhi~XCK}N@J@XQ2gNi-
zv6iuSq;6008%ZP8IF3DN<vhHjEq#}SJ8&7>lu!K<_a4A@@HXEVXL|JFHY2VBYXx!0
z;TlPpy8gUaqbVw!rq%|;FQFFBF4S44!NgM!h%x&4KFq;~+TJWo><s*4SXJ!d9H^JT
zI2Ps~m;{B1+lZL+h%p+#MSXbZZf4vDzXN|1YgKs7%uZv^1&5jIKD^H&4zu*m3^hoP
zqVEJ+_};*>&*T|RQS6f*n%^j3y`Gz6iOcx1h;6~TD*4#+@{>}_+##vu^*#E3>VTW>
zdkFn|y`T@s(>)koGrvyktwZk>sVDyb`R$TE(Ht6UZzsxdM+}TgMJ8fhG%KeZ>!w-R
zwOEhXtk@jcNF|n+_oBp?$XZJ=m-iQAy=0watY6}W_<b@S)BEu_=dHw()StZ)?-GBv
z=8LEJy)B-meP<#r_2W5RC!QyNBpBbp`SWqn5oaBCCC)nRT6~arV27AzIuWD%@JNE|
zL~4n&uAAu5brV_5o5*wAN@9ojHUE5~m)@-ti2<^9CBgiW#RT_fwI#U^Ya*G^yh+v@
zZc8!`tk%)qm0;faF6p~V_dC^9qCBguOZ0d1{4KXz`tB}j-c(#{l6b;nDa|vIl5<O?
znZKNpxux*m49y{B@?FkrOL0Hprqm#vzcZa?-A*#i{X69}$6Ici<E^DMpKD~XhtDm1
zyhrr+=sMFqaxOhZK9`jq?g#O5FSc_ZPI)_@TV&n#0>>3HU2LlvJ`cN=(f7;B@P7DE
zhWR4N4BsbbI5SB4?Mh~dblXc=eV@wN1ovrW<=$p9Jcs!#>#%EC(UFxtvVD4vIlh<9
za8Bpfa!Ea}9QS9}ax&K(&(&JW$@%7ZPIe`y&v!mopnBNfDfv7<<V)Qg&l~Yv*Xqp4
z_mSiK<dk#VSLAq}?}I&`=X+@_<@J0I<aZFSbu!O$i3Icdy9(~$@6xUn^!;ut$ah>2
z-Gvm-p<IxAQOM}?DKKwjv0(D~o`=T@qPNhm`zgr0cgA#HQRY%)J(0ztzPCq;JXd>j
zk@K8#iRWt9N^(z1qNBv;6Im?D97}TFN;0ofAJw&^CBB#TlFQ$VU2)}HT%J$3>PkN@
z-xp`tmHX}TeRayN)?aq@Jz42xJ(knUI_yfX{=0Rlm-};8di6Yq`{W+<@f;&_eR2+c
zTIY#AK1ZkAFZ1o^{=?P5E`1*dd46_nNZ+dsLvqeXzv`^H^4q6A_0r`FlXFiVtF8aS
z@c!SNSU&rS)TRe7zFujXdwb+#<<`@Iy9R#v^dq<aXZL;f*6*mVzkT%sKe+w#Z~Qg!
znHMi^J+*1;%h7GO-S*x`%iDI%oO|r|!|SU*TAF?0aP!4G6CZv2yQlM?{nsx?T2}A5
z|6=D0#jOkP+wu3+2QH+}oH_gIw>n<FYwfptCXcmme*USGsl9)k`SY*ddEIx1`^rl#
zb8Cmrz4O3``sOd*-#Y*6hi`fEOzrOP-TKzCTT;ajeRzZWl>;l!byp4_zJIKF)5m}Q
z$v4B*KV6yH{larQhmKy!d^vr=`NP2O+Y{&ReBz(AHHn9Q`nQEmuk5<VKDB9g%d_fQ
R_O)-s9{b{79)Et#e*xVi@s|Jq

diff --git a/rules/crda.make b/rules/crda.make
index 89e69da64..b5e4f32db 100644
--- a/rules/crda.make
+++ b/rules/crda.make
@@ -22,12 +22,38 @@ CRDA		:= crda-$(CRDA_VERSION)
 CRDA_SUFFIX	:= tar.xz
 CRDA_URL	:= $(call ptx/mirror, KERNEL, ../software/network/crda/$(CRDA).$(CRDA_SUFFIX))
 CRDA_SOURCE	:= $(SRCDIR)/$(CRDA).$(CRDA_SUFFIX)
+$(CRDA_SOURCE)	:= CRDA_SOURCE
 CRDA_DIR	:= $(BUILDDIR)/$(CRDA)
 CRDA_LICENSE	:= ISC AND copyleft-next-0.3.0
 CRDA_LICENSE_FILES := \
 	file://LICENSE;md5=ef8b69b43141352d821fd66b64ff0ee7 \
 	file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe
 
+CRDA_REGDB_VERSION	:= 2018.05.31
+CRDA_REGDB_MD5		:= 69bee8391dd0f2a1d23182e8a75f64c5
+CRDA_REGDB		:= wireless-regdb-$(CRDA_REGDB_VERSION)
+CRDA_REGDB_SUFFIX	:= tar.gz
+CRDA_REGDB_URL		:= \
+	https://www.kernel.org/pub/software/network/wireless-regdb/$(CRDA_REGDB).$(CRDA_REGDB_SUFFIX)
+CRDA_REGDB_SOURCE	:= $(SRCDIR)/$(CRDA_REGDB).$(CRDA_REGDB_SUFFIX)
+$(CRDA_REGDB_SOURCE)	:= CRDA_REGDB
+CRDA_REGDB_DIR		:= $(CRDA_DIR)
+CRDA_REGDB_STRIP_LEVEL	:= 0
+
+CRDA_SOURCES		+= $(CRDA_SOURCE) $(CRDA_REGDB_SOURCE)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/crda.extract:
+	@$(call targetinfo)
+	@$(call clean, $(CRDA_DIR))
+	@$(call extract, CRDA)
+	@$(call extract, CRDA_REGDB)
+	@$(call patchin, CRDA)
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
@@ -54,6 +80,18 @@ CRDA_MAKE_ENV	:= \
 
 CRDA_MAKE_OPT	:= all_noverify
 
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/crda.install:
+	@$(call targetinfo)
+	@$(call world/install, CRDA)
+	@install -v -d $(CRDA_PKGDIR)/usr/lib/crda
+	@install -v -m 644 -t $(CRDA_PKGDIR)/usr/lib/crda \
+		$(CRDA_REGDB_DIR)/$(CRDA_REGDB)/regulatory.bin
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -73,8 +111,6 @@ $(STATEDIR)/crda.targetinstall:
 		/usr/lib/udev/rules.d/85-regulatory.rules)
 	@$(call install_lib, crda, 0, 0, 0644, libreg)
 
-	# regulatory.bin was downloaded from:
-	# https://git.kernel.org/cgit/linux/kernel/git/sforshee/wireless-regdb.git/plain/regulatory.bin
 	@$(call install_alternative, crda, 0, 0, 0644, \
 		/usr/lib/crda/regulatory.bin)
 
-- 
2.18.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de