aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Ylinen <mikko.ylinen@linux.intel.com>2017-08-10 22:35:30 +0300
committerSaul Wold <sgw@linux.intel.com>2017-08-10 13:16:20 -0700
commit53004c75177b2b4b9eb4b8fb32f7ee9e4a9308f4 (patch)
tree49c3904fb6678827d59ac13b699f109c5a5ff3d1
parent634986e2dad6fac19463f15de4dcd166d98ac305 (diff)
downloadmeta-intel-53004c75177b2b4b9eb4b8fb32f7ee9e4a9308f4.tar.gz
meta-intel-53004c75177b2b4b9eb4b8fb32f7ee9e4a9308f4.tar.bz2
meta-intel-53004c75177b2b4b9eb4b8fb32f7ee9e4a9308f4.zip
iwlwifi: skip host install scripts
The scripts run in install target are relevant (and working) only if the driver installation is run on the build host. To fix build errors on some setups we add a patch that skips the scripts completely when cross-compiling. Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> [sgw - Added missing Upstream-Status] Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--common/recipes-kernel/iwlwifi/iwlwifi/0001-Makefile.real-skip-host-install-scripts.patch36
-rw-r--r--common/recipes-kernel/iwlwifi/iwlwifi_git.bb5
2 files changed, 39 insertions, 2 deletions
diff --git a/common/recipes-kernel/iwlwifi/iwlwifi/0001-Makefile.real-skip-host-install-scripts.patch b/common/recipes-kernel/iwlwifi/iwlwifi/0001-Makefile.real-skip-host-install-scripts.patch
new file mode 100644
index 00000000..1d4137ba
--- /dev/null
+++ b/common/recipes-kernel/iwlwifi/iwlwifi/0001-Makefile.real-skip-host-install-scripts.patch
@@ -0,0 +1,36 @@
+From f69ff2fd27903ee052309179271f708d720a2f94 Mon Sep 17 00:00:00 2001
+From: Mikko Ylinen <mikko.ylinen@linux.intel.com>
+Date: Thu, 10 Aug 2017 21:12:51 +0300
+Subject: [PATCH] Makefile.real: skip host install scripts
+
+The scripts run in install target are relevant (and working)
+only if the driver installation is run on the build host.
+
+Skip the scripts when cross-compiling.
+
+Upstream-Status: Inappropriate [Cross-Compile]
+
+Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com>
+---
+ Makefile.real | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/Makefile.real b/Makefile.real
+index ba09f99..f5075de 100644
+--- a/Makefile.real
++++ b/Makefile.real
+@@ -104,11 +104,6 @@ install: modules
+ @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \
+ INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \
+ modules_install
+- @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
+- @./scripts/compress_modules.sh $(KLIB)/$(KMODDIR)
+- @./scripts/check_depmod.sh
+- @/sbin/depmod -a
+- @./scripts/update-initramfs.sh $(KLIB)
+ @echo
+ @echo Your backported driver modules should be installed now.
+ @echo Reboot.
+--
+2.1.4
+
diff --git a/common/recipes-kernel/iwlwifi/iwlwifi_git.bb b/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
index 1d39405a..31642901 100644
--- a/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
+++ b/common/recipes-kernel/iwlwifi/iwlwifi_git.bb
@@ -1,5 +1,5 @@
-SUMMARY = "Intel Wireless LinuxCore 24 kernel driver"
-DESCRIPTION = "Intel Wireless LinuxCore 24 kernel driver"
+SUMMARY = "Intel Wireless LinuxCore kernel driver"
+DESCRIPTION = "Intel Wireless LinuxCore kernel driver"
SECTION = "kernel"
LICENSE = "GPLv2"
@@ -11,6 +11,7 @@ inherit module
PV = "30"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/LinuxCore${PV}"
+SRC_URI += "file://0001-Makefile.real-skip-host-install-scripts.patch"
SRC_URI += "file://iwlwifi.conf"
SRCREV = "${AUTOREV}"