From 1a35dee120dde6c90af342974b528c5db1b838f9 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 8 Aug 2017 08:42:42 -0700 Subject: 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 --- common/recipes-kernel/iwlwifi/iwlwifi_git.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'common') diff --git a/common/recipes-kernel/iwlwifi/iwlwifi_git.bb b/common/recipes-kernel/iwlwifi/iwlwifi_git.bb index 53568e95..c0bf3d36 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" -- cgit v1.2.3-54-g00ecf