diff options
| author | Christian Melki <christian.melki@t2data.com> | 2022-01-19 10:51:09 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-01-21 10:14:37 +0100 |
| commit | 782bae9607a8d16be1cd3eb722fdc65d99e50ec4 (patch) | |
| tree | cd8d59662f3cbe729ea1167803bae9eb32ff71d2 /rules/crda.make | |
| parent | eb898f648fd9c9e1f0ea6051b8543151500ddf41 (diff) | |
| download | ptxdist-782bae9607a8d16be1cd3eb722fdc65d99e50ec4.tar.gz ptxdist-782bae9607a8d16be1cd3eb722fdc65d99e50ec4.tar.xz | |
crda+regdb: Bump. crda 3.18 -> 4.14, regdb 2019.06.03 -> 2021.08.28
* Move crda patches from 3.18 to 4.14, applies cleanly.
* Update crda URL, the old URL does not contain 4.14.
* crda depends on host system python capability.
* Introduce a new ONLY_REGULATOR_DB option.
Kernels > 4.15 do not really need CRDA anymore.
Make it an option instead of a kernel version check so that
developers can decide for themselves when to switch and why.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
Message-Id: <20220119095109.3661113-1-christian.melki@t2data.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/crda.make')
| -rw-r--r-- | rules/crda.make | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/rules/crda.make b/rules/crda.make index 9cbb7af93..c3048c760 100644 --- a/rules/crda.make +++ b/rules/crda.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_CRDA) += crda # # Paths and names # -CRDA_VERSION := 3.18 -CRDA_MD5 := 0431fef3067bf503dfb464069f06163a +CRDA_VERSION := 4.14 +CRDA_MD5 := cac7ba8de3e2e6aa46918e0c76df7d67 CRDA := crda-$(CRDA_VERSION) -CRDA_SUFFIX := tar.xz -CRDA_URL := $(call ptx/mirror, KERNEL, ../software/network/crda/$(CRDA).$(CRDA_SUFFIX)) +CRDA_SUFFIX := tar.gz +CRDA_URL := https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/$(CRDA).$(CRDA_SUFFIX) CRDA_SOURCE := $(SRCDIR)/$(CRDA).$(CRDA_SUFFIX) CRDA_DIR := $(BUILDDIR)/$(CRDA) CRDA_LICENSE := ISC AND copyleft-next-0.3.0 @@ -26,8 +26,8 @@ CRDA_LICENSE_FILES := \ file://LICENSE;md5=ef8b69b43141352d821fd66b64ff0ee7 \ file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe -CRDA_REGDB_VERSION := 2019.06.03 -CRDA_REGDB_MD5 := e16f223ec2ecb4937b1a8ef9ce8dda99 +CRDA_REGDB_VERSION := 2021.08.28 +CRDA_REGDB_MD5 := 54db6062be38311b07bf9fd039c95e5d CRDA_REGDB := wireless-regdb-$(CRDA_REGDB_VERSION) CRDA_REGDB_SUFFIX := tar.gz CRDA_REGDB_URL := \ @@ -97,6 +97,7 @@ $(STATEDIR)/crda.targetinstall: @$(call install_fixup, crda,AUTHOR,"Jan Luebbe <jlu@pengutronix.de>") @$(call install_fixup, crda,DESCRIPTION,missing) +ifndef PTXCONF_CRDA_ONLY_REGULATORY_DB @$(call install_copy, crda, 0, 0, 0755, -, /usr/sbin/crda) @$(call install_copy, crda, 0, 0, 0755, -, /usr/sbin/regdbdump) @$(call install_copy, crda, 0, 0, 0644, -, \ @@ -107,6 +108,8 @@ $(STATEDIR)/crda.targetinstall: /usr/lib/crda/pubkeys) @$(call install_alternative, crda, 0, 0, 0644, \ /usr/lib/crda/regulatory.bin) +endif + @$(call install_alternative, crda, 0, 0, 0644, \ /lib/firmware/regulatory.db) @$(call install_alternative, crda, 0, 0, 0644, \ |