From 2ea482d03a1849fbf23ed56262b5b7bb02b0b45e Mon Sep 17 00:00:00 2001 From: André Draszik Date: Thu, 11 Aug 2016 22:03:09 +0100 Subject: crda: split wireless-regdb out into own recipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows for independent updates of the regulatory database. Signed-off-by: André Draszik Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../recipes-connectivity/crda/crda_3.18.bb | 25 ++++++---------------- .../wireless-regdb/wireless-regdb_2014.11.18.bb | 18 ++++++++++++++++ 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2014.11.18.bb (limited to 'meta-networking/recipes-connectivity') diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index 7e13d7ba72..4a9393058b 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -1,23 +1,18 @@ SUMMARY = "Wireless Central Regulatory Domain Agent" HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" SECTION = "net" -LICENSE = "copyleft-next-0.3.0 & ISC" -LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe \ - file://${WORKDIR}/wireless-regdb-2014.11.18/LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" +LICENSE = "copyleft-next-0.3.0" +LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" DEPENDS = "python-m2crypto-native python-native libgcrypt libnl" -SRC_URI = "https://www.kernel.org/pub/software/network/crda/${BP}.tar.xz;name=crda \ - https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2014.11.18.tar.xz;name=bin \ +SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://do-not-run-ldconfig-if-destdir-is-set.patch \ file://fix-linking-of-libraries-used-by-reglib.patch \ file://fix-gcc-6-unused-variables.patch \ " -SRC_URI[crda.md5sum] = "0431fef3067bf503dfb464069f06163a" -SRC_URI[crda.sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" - -SRC_URI[bin.md5sum] = "d750c402c5510add7380edcb1d9b75b2" -SRC_URI[bin.sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd" +SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" +SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" inherit python-dir pythonnative # Recursive make problem @@ -29,14 +24,6 @@ do_compile() { do_install() { oe_runmake SBINDIR=${sbindir}/ install - - install -d ${D}${libdir}/crda/ - - install -m 0644 ${WORKDIR}/wireless-regdb-2014.11.18/regulatory.bin ${D}${libdir}/crda/regulatory.bin } - -RDEPENDS_${PN} = "udev" -FILES_${PN} += "${libdir}crda/regulatory.bin \ - ${base_libdir}/udev/rules.d/85-regulatory.rules \ -" +RDEPENDS_${PN} = "udev wireless-regdb" diff --git a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2014.11.18.bb b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2014.11.18.bb new file mode 100644 index 0000000000..b3d82ba1c2 --- /dev/null +++ b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2014.11.18.bb @@ -0,0 +1,18 @@ +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] = "d750c402c5510add7380edcb1d9b75b2" +SRC_URI[sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd" + +inherit bin_package + +do_install() { + install -d -m0755 ${D}${libdir}/crda + install -m 0644 regulatory.bin ${D}${libdir}/crda/regulatory.bin +} + +RSUGGESTS_${PN} = "crda" -- cgit 1.2.3-korg