Return-Path: Received: from mail.stusta.mhn.de (mail.stusta.mhn.de [141.84.69.5]) by mail.openembedded.org (Postfix) with ESMTP id BA2B47E828 for ; Tue, 18 Jun 2019 19:59:43 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail.stusta.mhn.de (Postfix) with ESMTPSA id 45SzSc265Yz4h for ; Tue, 18 Jun 2019 21:59:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stusta.de; s=default; t=1560887984; bh=cBoa6t9KKZvcjXlE4h0rOjUO6jIKP3Pa983ffGTsg1I=; h=From:To:Subject:Date:From; b=g/UuZ+xoYmyUfx4Pg6tTg2wD2fGI5qHUSq8pk4CBf5pU7hKnE6qIc570jNGWwbwo/ INesLyrha1gDjhww8KD/KXo5nVRKgg0GzbbkmvOxvOTWCQKOedfsRD5HdcWK4j6VmF eSxSi0GX8QnTuTJ+eI6f1WqYEx1PwotF259kFAyQyJUrkb76qP2W/p0H+gNUFOCRU1 vEWrGsCrAYJPLX7dsoksWj25JiiAVukEgoQst9LsFZSqL6Ugs9Pt3zhA5LGREPekE8 clQsE481h3Ub5OTFIG1VjrV3tk6s5BeVX+u8gBIpbOgq5DcvodS992YsAxi6ec7yUA gdeWdqBMZSszOnzLMD+XwbS+KkFxG8mAdZMWuS9BmKh0d1w7YtiZx+seWM9rINg6XQ q1xrX67q3DG1yWaZ993MMlcsxYZbFfnN8XGPRWk5kMe1YFRPyf5CoXqQsOQJv9era1 K22aFgSLntY0dW1XsKEx7d4FiqQPBPrGxv6kcs+/89TUgmM8J7a/DyThXlNf5DDgGY SmkByQ42GjBo4FwCHt+tvSEUshNRNHM56aeLFB6JpiRYb+43owSdnXT2OFCSw8b8xa /UTdnQR/JSiprs642jJbFiTSVTqzyCZmtkZMWpL/bSgOvZdS2T29WOPEfZHtSC4nQS pbD9lGBi5X9EaowxQ1fsZ6rw= From: Adrian Bunk To: openembedded-core@lists.openembedded.org Date: Tue, 18 Jun 2019 22:59:45 +0300 Message-Id: <20190618195945.15170-1-bunk@stusta.de> X-Mailer: git-send-email 2.17.1 Subject: [PATCH v2] wireless-regdb: Add recipe X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2019 19:59:44 -0000 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. Signed-off-by: Adrian Bunk --- v2: remove empty packages that were generated by default --- meta/conf/distro/include/maintainers.inc | 1 + .../packagegroups/packagegroup-base.bb | 1 + .../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 diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 0bc7060718..c33bd8e068 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -728,6 +728,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" -- 2.17.1