summaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/iwlwifi
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-07-25 20:59:05 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-07-31 16:00:58 (GMT)
commit867a8df51ed5abed44332e2edea72ad900b1dc4d (patch)
treeaf186352e07975ccfb9188fd21435d68aeecfb2a /common/recipes-kernel/iwlwifi
parent1811a41d6f891784b2a5b65d60626add51f3d13e (diff)
downloadmeta-intel-867a8df51ed5abed44332e2edea72ad900b1dc4d.tar.gz
iwlwifi: Clean-up and use module_install
Use the MODULES_INSTALL_TARGET to correctly set the make target for install, also use AUTOLOAD for ensuring the modules get loaded correctly. Let the module class to the correct packaging and install. Install all the linux-firmware-iwlwifi blobs Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common/recipes-kernel/iwlwifi')
-rw-r--r--common/recipes-kernel/iwlwifi/iwlwifi_git.bb50
1 files changed, 9 insertions, 41 deletions
diff --git a/common/recipes-kernel/iwlwifi/iwlwifi_git.bb b/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
index 2999af0..a88eabe 100644
--- a/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
+++ b/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
@@ -9,18 +9,6 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
9 9
10inherit module 10inherit module
11 11
12PROVIDES = "kernel-module-cfg80211-${KERNEL_VERSION} \
13 kernel-module-mac80211-${KERNEL_VERSION} \
14 kernel-module-iwlmvm-${KERNEL_VERSION} \
15 kernel-module-iwlwifi-${KERNEL_VERSION} \
16 kernel-module-compat-${KERNEL_VERSION}"
17
18RPROVIDES_${PN} = "kernel-module-cfg80211-${KERNEL_VERSION} \
19 kernel-module-mac80211-${KERNEL_VERSION} \
20 kernel-module-iwlmvm-${KERNEL_VERSION} \
21 kernel-module-iwlwifi-${KERNEL_VERSION} \
22 kernel-module-compat-${KERNEL_VERSION}"
23
24PV = "30" 12PV = "30"
25SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/LinuxCore${PV}" 13SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/LinuxCore${PV}"
26SRC_URI += "file://iwlwifi.conf" 14SRC_URI += "file://iwlwifi.conf"
@@ -29,41 +17,14 @@ SRCREV = "${AUTOREV}"
29 17
30S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
31 19
32SYSTEMD_AUTO_ENABLE_${PN} = "enable"
33
34CONFFILES_${PN} += "${sysconfdir}/modprobe.d/iwlwifi.conf"
35
36PACKAGES = "${PN}"
37
38RDEPENDS_${PN}="linux-firmware-iwlwifi-8000c"
39
40DEPENDS="virtual/kernel"
41KERNVER="${KERNEL_VERSION}"
42
43## modules actual
44FILES_${PN} = "/lib/modules/${KERNVER}/updates/cfg80211.ko \
45 /lib/modules/${KERNVER}/updates/compat.ko \
46 /lib/modules/${KERNVER}/updates/iwlwifi.ko \
47 /lib/modules/${KERNVER}/updates/iwlmvm.ko \
48 /lib/modules/${KERNVER}/updates/mac80211.ko \
49 ${sysconfdir}/modprobe.d/iwlwifi.conf"
50
51EXTRA_OEMAKE = "INSTALL_MOD_PATH=${D} KLIB_BUILD=${KBUILD_OUTPUT}" 20EXTRA_OEMAKE = "INSTALL_MOD_PATH=${D} KLIB_BUILD=${KBUILD_OUTPUT}"
52 21
53do_configure() { 22do_configure() {
54 CC=gcc CFLAGS= LDFLAGS= make defconfig-iwlwifi-public KLIB_BUILD=${KBUILD_OUTPUT} 23 CC=gcc CFLAGS= LDFLAGS= make defconfig-iwlwifi-public KLIB_BUILD=${KBUILD_OUTPUT}
55} 24}
56 25
57do_install() { 26MODULES_INSTALL_TARGET="install"
58 ## install kernel objects from driver tree into target fs 27do_install_append() {
59 install -m 0755 -d ${D}${base_libdir}/modules/${KERNVER}/updates/
60
61 install -m 0644 $(find ${S} -name "iwlwifi.ko") ${D}${base_libdir}/modules/${KERNVER}/updates
62 install -m 0644 $(find ${S} -name "iwlmvm.ko") ${D}${base_libdir}/modules/${KERNVER}/updates
63 install -m 0644 $(find ${S} -name "cfg80211.ko") ${D}${base_libdir}/modules/${KERNVER}/updates
64 install -m 0644 $(find ${S} -name "mac80211.ko") ${D}${base_libdir}/modules/${KERNVER}/updates
65 install -m 0644 $(find ${S} -name "compat.ko") ${D}${base_libdir}/modules/${KERNVER}/updates
66
67 ## install configs and service scripts 28 ## install configs and service scripts
68 install -d ${D}${sbindir} ${D}${sysconfdir}/modprobe.d 29 install -d ${D}${sbindir} ${D}${sysconfdir}/modprobe.d
69 install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d 30 install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d
@@ -71,3 +32,10 @@ do_install() {
71 ## this gets generated for no good reason. delete it. 32 ## this gets generated for no good reason. delete it.
72 rm -rf ${D}/usr 33 rm -rf ${D}/usr
73} 34}
35
36SYSTEMD_AUTO_ENABLE_${PN} = "enable"
37
38RDEPENDS_${PN} = "linux-firmware-iwlwifi"
39
40KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi"
41KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi"