summaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-08-08 15:42:42 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-08-08 15:43:54 (GMT)
commit1a35dee120dde6c90af342974b528c5db1b838f9 (patch)
tree7c2260a6c07e451ca4002cbf16fea1d4150eeff2 /common/recipes-kernel
parent7cfcf8d940dd6a6ef4a6e3c8d413b34c79f4e5b0 (diff)
downloadmeta-intel-1a35dee120dde6c90af342974b528c5db1b838f9.tar.gz
iwlwifi: Fix install_append for usrmerge
Since everything is installed into /usr when usrmerge is enabled, don't rm /usr! Also the is not needed for anything do don't create it in the first place. [YOCTO #11882] Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common/recipes-kernel')
-rw-r--r--common/recipes-kernel/iwlwifi/iwlwifi_git.bb5
1 files changed, 1 insertions, 4 deletions
diff --git a/common/recipes-kernel/iwlwifi/iwlwifi_git.bb b/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
index 53568e9..c0bf3d3 100644
--- a/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
+++ b/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
@@ -26,11 +26,8 @@ do_configure() {
26MODULES_INSTALL_TARGET="install" 26MODULES_INSTALL_TARGET="install"
27do_install_append() { 27do_install_append() {
28 ## install configs and service scripts 28 ## install configs and service scripts
29 install -d ${D}${sbindir} ${D}${sysconfdir}/modprobe.d 29 install -d ${D}${sysconfdir}/modprobe.d
30 install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d 30 install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d
31
32 ## this gets generated for no good reason. delete it.
33 rm -rf ${D}/usr
34} 31}
35 32
36SYSTEMD_AUTO_ENABLE_${PN} = "enable" 33SYSTEMD_AUTO_ENABLE_${PN} = "enable"