[Buildroot] [PATCH v2 1/3] wireless-regdb: bump version to 2018.09.07

[Buildroot] [PATCH v2 1/3] wireless-regdb: bump version to 2018.09.07

[Peter Seiderer]

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - add SoB line (suggested by Baruch Siach)
---
 package/wireless-regdb/wireless-regdb.hash | 2 +-
 package/wireless-regdb/wireless-regdb.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash
index 65ae735cb5..aa035d0ef5 100644
--- a/package/wireless-regdb/wireless-regdb.hash
+++ b/package/wireless-regdb/wireless-regdb.hash
@@ -1,4 +1,4 @@
 # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc
-sha256 e1dfbc3b97771373077f430c3c05082fae883145b37db5b2cfd12c56676fbe7b  wireless-regdb-2018.05.31.tar.xz
+sha256 a36b8147f1a3e98e1fd44321a4b8d7ad2f03cac98cdf527ccb1693342f08d65a  wireless-regdb-2018.09.07.tar.xz
 # Locally computed
 sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1  LICENSE
diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk
index 829374edcf..fcbba055ac 100644
--- a/package/wireless-regdb/wireless-regdb.mk
+++ b/package/wireless-regdb/wireless-regdb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIRELESS_REGDB_VERSION = 2018.05.31
+WIRELESS_REGDB_VERSION = 2018.09.07
 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz
 WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb
 WIRELESS_REGDB_LICENSE = ISC
-- 
2.19.0

[Buildroot] [PATCH v2 2/3] wireless-regdb: install crda files only if used

[Peter Seiderer]

Since linux-4.15 the kernel supports loading the files
regulatory.db/regulatory.db.p7s directly from the /lib/firmware
directory, for earlier versions the crda helper application
is needed.

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - fix check-package warning (help text line length)
---
 package/wireless-regdb/Config.in         | 7 ++++++-
 package/wireless-regdb/wireless-regdb.mk | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/wireless-regdb/Config.in b/package/wireless-regdb/Config.in
index 0c9896deb9..17350a41d8 100644
--- a/package/wireless-regdb/Config.in
+++ b/package/wireless-regdb/Config.in
@@ -3,7 +3,12 @@ config BR2_PACKAGE_WIRELESS_REGDB
 	help
 	  Wireless regulatory database.
 
-	  Wireless regulatory database for CRDA. The database lists the
+	  Wireless regulatory database. The database lists the
 	  allowed radio frequencies for each local jurisdiction.
 
+	  Since linux-4.15 the kernel supports loading the files
+	  regulatory.db/regulatory.db.p7s directly from the
+	  /lib/firmware directory, for earlier versions the crda helper
+	  application is needed.
+
 	  https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb
diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk
index fcbba055ac..9c899f973b 100644
--- a/package/wireless-regdb/wireless-regdb.mk
+++ b/package/wireless-regdb/wireless-regdb.mk
@@ -10,11 +10,17 @@ WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb
 WIRELESS_REGDB_LICENSE = ISC
 WIRELESS_REGDB_LICENSE_FILES = LICENSE
 
-define WIRELESS_REGDB_INSTALL_TARGET_CMDS
+ifeq ($(BR2_PACKAGE_CRDA),y)
+define  WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS
 	$(INSTALL) -m 644 -D -T $(@D)/regulatory.bin \
 		$(TARGET_DIR)/usr/lib/crda/regulatory.bin
 	$(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \
 		$(TARGET_DIR)/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem
+endef
+endif
+
+define WIRELESS_REGDB_INSTALL_TARGET_CMDS
+	$(WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS)
 	$(INSTALL) -m 644 -D -T $(@D)/regulatory.db \
 		$(TARGET_DIR)/lib/firmware/regulatory.db
 	$(INSTALL) -m 644 -D -T $(@D)/regulatory.db.p7s \
-- 
2.19.0

[Buildroot] [PATCH v2 3/3] wireless-regdb: use BR2_KERNEL_MIRROR for download site

[Peter Seiderer]

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - new patch (suggested by Baruch Siach)
---
 package/wireless-regdb/wireless-regdb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk
index 9c899f973b..c509c7c7f8 100644
--- a/package/wireless-regdb/wireless-regdb.mk
+++ b/package/wireless-regdb/wireless-regdb.mk
@@ -6,7 +6,7 @@
 
 WIRELESS_REGDB_VERSION = 2018.09.07
 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz
-WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb
+WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb
 WIRELESS_REGDB_LICENSE = ISC
 WIRELESS_REGDB_LICENSE_FILES = LICENSE
 
-- 
2.19.0

[Buildroot] [PATCH v2 1/3] wireless-regdb: bump version to 2018.09.07

[Thomas Petazzoni]

Hello,

On Thu,  4 Oct 2018 22:48:22 +0200, Peter Seiderer wrote:
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v1 -> v2:
>   - add SoB line (suggested by Baruch Siach)
> ---
>  package/wireless-regdb/wireless-regdb.hash | 2 +-
>  package/wireless-regdb/wireless-regdb.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

All three patches applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com