diff options
author | Mikko Ylinen <mikko.ylinen@linux.intel.com> | 2017-08-10 22:35:30 +0300 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-08-10 13:16:20 -0700 |
commit | 53004c75177b2b4b9eb4b8fb32f7ee9e4a9308f4 (patch) | |
tree | 49c3904fb6678827d59ac13b699f109c5a5ff3d1 /common/recipes-kernel | |
parent | 634986e2dad6fac19463f15de4dcd166d98ac305 (diff) | |
download | meta-intel-53004c75177b2b4b9eb4b8fb32f7ee9e4a9308f4.tar.gz |
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>
Diffstat (limited to 'common/recipes-kernel')
-rw-r--r-- | common/recipes-kernel/iwlwifi/iwlwifi/0001-Makefile.real-skip-host-install-scripts.patch | 36 | ||||
-rw-r--r-- | common/recipes-kernel/iwlwifi/iwlwifi_git.bb | 5 |
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 @@ | |||
1 | From f69ff2fd27903ee052309179271f708d720a2f94 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Ylinen <mikko.ylinen@linux.intel.com> | ||
3 | Date: Thu, 10 Aug 2017 21:12:51 +0300 | ||
4 | Subject: [PATCH] Makefile.real: skip host install scripts | ||
5 | |||
6 | The scripts run in install target are relevant (and working) | ||
7 | only if the driver installation is run on the build host. | ||
8 | |||
9 | Skip the scripts when cross-compiling. | ||
10 | |||
11 | Upstream-Status: Inappropriate [Cross-Compile] | ||
12 | |||
13 | Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> | ||
14 | --- | ||
15 | Makefile.real | 5 ----- | ||
16 | 1 file changed, 5 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile.real b/Makefile.real | ||
19 | index ba09f99..f5075de 100644 | ||
20 | --- a/Makefile.real | ||
21 | +++ b/Makefile.real | ||
22 | @@ -104,11 +104,6 @@ install: modules | ||
23 | @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \ | ||
24 | INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \ | ||
25 | modules_install | ||
26 | - @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR) | ||
27 | - @./scripts/compress_modules.sh $(KLIB)/$(KMODDIR) | ||
28 | - @./scripts/check_depmod.sh | ||
29 | - @/sbin/depmod -a | ||
30 | - @./scripts/update-initramfs.sh $(KLIB) | ||
31 | @echo | ||
32 | @echo Your backported driver modules should be installed now. | ||
33 | @echo Reboot. | ||
34 | -- | ||
35 | 2.1.4 | ||
36 | |||
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 @@ | |||
1 | SUMMARY = "Intel Wireless LinuxCore 24 kernel driver" | 1 | SUMMARY = "Intel Wireless LinuxCore kernel driver" |
2 | DESCRIPTION = "Intel Wireless LinuxCore 24 kernel driver" | 2 | DESCRIPTION = "Intel Wireless LinuxCore kernel driver" |
3 | SECTION = "kernel" | 3 | SECTION = "kernel" |
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | 5 | ||
@@ -11,6 +11,7 @@ inherit module | |||
11 | 11 | ||
12 | PV = "30" | 12 | PV = "30" |
13 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/LinuxCore${PV}" | 13 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/LinuxCore${PV}" |
14 | SRC_URI += "file://0001-Makefile.real-skip-host-install-scripts.patch" | ||
14 | SRC_URI += "file://iwlwifi.conf" | 15 | SRC_URI += "file://iwlwifi.conf" |
15 | 16 | ||
16 | SRCREV = "${AUTOREV}" | 17 | SRCREV = "${AUTOREV}" |