[meta-intel] [PATCH] iwlwifi: Fix install_append for usrmerge
Saul Wold
sgw at linux.intel.com
Tue Aug 8 08:44:09 PDT 2017
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 at linux.intel.com>
---
common/recipes-kernel/iwlwifi/iwlwifi_git.bb | 5 +----
1 file changed, 1 insertion(+), 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() {
MODULES_INSTALL_TARGET="install"
do_install_append() {
## install configs and service scripts
- install -d ${D}${sbindir} ${D}${sysconfdir}/modprobe.d
+ install -d ${D}${sysconfdir}/modprobe.d
install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d
-
- ## this gets generated for no good reason. delete it.
- rm -rf ${D}/usr
}
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
--
2.7.5
More information about the meta-intel
mailing list