diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-06-20 00:22:29 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-06-19 19:59:15 -0700 |
commit | 170f30b3d8b6411e885d253c74a00bdb9e52d3d2 (patch) | |
tree | 6b760f82718c024efd7fa5ddc2f4f31dca532cc3 | |
parent | d8bbcf5689603194bb7aeb538ec4a696018cfcae (diff) | |
download | meta-openembedded-170f30b3d8b6411e885d253c74a00bdb9e52d3d2.tar.gz |
wireless-regdb: Remove, was moved to oe-core
kernel_wireless_regdb.bbclass stays here since it is only
required for kernels <= 4.14.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2019.06.03.bb | 42 | ||||
-rw-r--r-- | meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb | 1 |
2 files changed, 0 insertions, 43 deletions
diff --git a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2019.06.03.bb b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2019.06.03.bb deleted file mode 100644 index ded44b3d49..0000000000 --- a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2019.06.03.bb +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | SUMMARY = "Wireless Central Regulatory Domain Database" | ||
2 | HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" | ||
3 | SECTION = "net" | ||
4 | LICENSE = "ISC" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" | ||
6 | |||
7 | SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" | ||
8 | SRC_URI[md5sum] = "4b5ba3f089db7fdb7b9daae6a7c1f2cb" | ||
9 | SRC_URI[sha256sum] = "cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf" | ||
10 | |||
11 | inherit bin_package allarch | ||
12 | |||
13 | do_install() { | ||
14 | install -d -m0755 ${D}${nonarch_libdir}/crda | ||
15 | install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys | ||
16 | install -m 0644 regulatory.bin ${D}${nonarch_libdir}/crda/regulatory.bin | ||
17 | install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem | ||
18 | |||
19 | install -m 0644 -D regulatory.db ${D}${nonarch_base_libdir}/firmware/regulatory.db | ||
20 | install -m 0644 regulatory.db.p7s ${D}${nonarch_base_libdir}/firmware/regulatory.db.p7s | ||
21 | } | ||
22 | |||
23 | # Install static regulatory DB in /lib/firmware for kernel to load. | ||
24 | # This requires Linux kernel >= v4.15. | ||
25 | # For kernel <= v4.14, inherit the kernel_wireless_regdb.bbclass in kernel's recipe. | ||
26 | PACKAGES =+ "${PN}-static" | ||
27 | RCONFLICTS_${PN} = "${PN}-static" | ||
28 | |||
29 | FILES_${PN}-static = " \ | ||
30 | ${nonarch_base_libdir}/firmware/regulatory.db \ | ||
31 | ${nonarch_base_libdir}/firmware/regulatory.db.p7s \ | ||
32 | " | ||
33 | |||
34 | # Native users might want to use the source of regulatory DB. | ||
35 | # This is for example used by Linux kernel <= v4.14 and kernel_wireless_regdb.bbclass. | ||
36 | do_install_append_class-native() { | ||
37 | install -m 0644 -D db.txt ${D}${libdir}/crda/db.txt | ||
38 | } | ||
39 | |||
40 | RSUGGESTS_${PN} = "crda" | ||
41 | |||
42 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 3770601a4b..bbc5e12994 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb | |||
@@ -37,7 +37,6 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\ | |||
37 | mbedtls relayd snort dhcpcd rdate vlan vpnc \ | 37 | mbedtls relayd snort dhcpcd rdate vlan vpnc \ |
38 | inetutils wolfssl lftp miniupnpd networkmanager \ | 38 | inetutils wolfssl lftp miniupnpd networkmanager \ |
39 | networkmanager-openvpn rdist nanomsg python-networkmanager \ | 39 | networkmanager-openvpn rdist nanomsg python-networkmanager \ |
40 | wireless-regdb \ | ||
41 | ${@bb.utils.contains("DISTRO_FEATURES", "bluez5 x11", "blueman", "", d)} \ | 40 | ${@bb.utils.contains("DISTRO_FEATURES", "bluez5 x11", "blueman", "", d)} \ |
42 | ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ | 41 | ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ |
43 | ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ | 42 | ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ |