From 120e9ca1becfe09505da0e90ff8c8863d004f2d2 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 18 Jun 2019 22:59:45 +0300 Subject: wireless-regdb: Add recipe Since wpa-supplicant is provided, the database of permitted frequencies should also be provided. wireless-regdb-static should be used with kernel >= 4.15. wireless-regdb can be used with older kernels and is mostly irrelevant here, but keeping it in meta-networking would create needless recipe duplication. This package was previously in meta-networking. (From OE-Core rev: 00c5a665b48c830a0008139b7ae1a51e79b72bb5) Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + .../packagegroups/packagegroup-base.bb | 1 + .../wireless-regdb/wireless-regdb_2019.06.03.bb | 44 ++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb (limited to 'meta') diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 6fa19f137b..f41d7e17ba 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -729,6 +729,7 @@ RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-wget = "Yi Zhao " RECIPE_MAINTAINER_pn-which = "Anuj Mittal " RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal " +RECIPE_MAINTAINER_pn-wireless-regdb = "Adrian Bunk " RECIPE_MAINTAINER_pn-wpa-supplicant = "Changhyeok Bae " RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster " RECIPE_MAINTAINER_pn-x264 = "Anuj Mittal " diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index cae704aa24..d05403635c 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -271,6 +271,7 @@ RRECOMMENDS_packagegroup-base-ipsec = "\ SUMMARY_packagegroup-base-wifi = "WiFi support" RDEPENDS_packagegroup-base-wifi = "\ iw \ + wireless-regdb-static \ wpa-supplicant" RRECOMMENDS_packagegroup-base-wifi = "\ diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb new file mode 100644 index 0000000000..9076d94601 --- /dev/null +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb @@ -0,0 +1,44 @@ +SUMMARY = "Wireless Central Regulatory Domain Database" +HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" +SECTION = "net" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" + +SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" +SRC_URI[md5sum] = "4b5ba3f089db7fdb7b9daae6a7c1f2cb" +SRC_URI[sha256sum] = "cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf" + +inherit bin_package allarch + +do_install() { + install -d -m0755 ${D}${nonarch_libdir}/crda + install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys + install -m 0644 regulatory.bin ${D}${nonarch_libdir}/crda/regulatory.bin + install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem + + install -m 0644 -D regulatory.db ${D}${nonarch_base_libdir}/firmware/regulatory.db + install -m 0644 regulatory.db.p7s ${D}${nonarch_base_libdir}/firmware/regulatory.db.p7s +} + +# Install static regulatory DB in /lib/firmware for kernel to load. +# This requires Linux kernel >= v4.15. +# For kernel <= v4.14, inherit the kernel_wireless_regdb.bbclass +# (in meta-networking) in kernel's recipe. +PACKAGES = "${PN}-static ${PN}" +RCONFLICTS_${PN} = "${PN}-static" + +FILES_${PN}-static = " \ + ${nonarch_base_libdir}/firmware/regulatory.db \ + ${nonarch_base_libdir}/firmware/regulatory.db.p7s \ +" + +# Native users might want to use the source of regulatory DB. +# This is for example used by Linux kernel <= v4.14 and +# kernel_wireless_regdb.bbclass in meta-networking. +do_install_append_class-native() { + install -m 0644 -D db.txt ${D}${libdir}/crda/db.txt +} + +RSUGGESTS_${PN} = "crda" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf