From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 29 Jan 2008 10:24:38 +0000 (+0000)
Subject: workaround a broken install target in iwlwifi
X-Git-Tag: linux-2.6-22-2~47
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bfccdd2ab6e396c79613206562e60612b3f18c47;p=linux-2.6.git

workaround a broken install target in iwlwifi
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 59300e52c..71a81bba5 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -362,6 +362,15 @@ popd
 
 # Untar iwlwifi in the same place - needs to be compiled later
 tar -xzf %{expand:%{PATCH601}}
+# the install target is broken: first it does not pass the right -b flag to depmod
+# second we do not need to invoke depmod at this stage anyway
+# let's add our own patch/stuff in this Makefile for manual install later on
+pushd iwlwifi-%{iwlwifi_version}
+cat >> Makefile <<EOF
+module-list:
+	@echo \$(addprefix \$(DIR),\$(addsuffix .ko,\$(list-m)))
+EOF
+popd
 
 rm -fr linux-%{kversion}
 ln -sf $KERNEL_PREVIOUS linux-%{kversion}
@@ -445,9 +454,18 @@ BuildKernel() {
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
+
     # install iwlwifi
-    make -C %{_builddir}/kernel-%{kversion}/iwlwifi-%{iwlwifi_version} ARCH=$Arch \
-         KMISC=$RPM_BUILD_ROOT/lib/modules/$KernelVer/kernel/drivers/net/wireless install
+#    make -C %{_builddir}/kernel-%{kversion}/iwlwifi-%{iwlwifi_version} ARCH=$Arch \
+#         KSRC=%{_builddir}/kernel-%{kversion}/linux-%{_target_cpu}-%{kversion}$Flavour \
+#        KMISC=$RPM_BUILD_ROOT/lib/modules/$KernelVer/kernel/drivers/net/wireless install
+    pushd %{_builddir}/kernel-%{kversion}/iwlwifi-%{iwlwifi_version}
+    iwlwifi_dest=$RPM_BUILD_ROOT/lib/modules/$KernelVer/kernel/drivers/net/wireless
+    # get the list and location of modules to install - no need to pass KSRC nor anything, let's keep it simple
+    iwlwifi_modules=$(make --no-print-directory module-list)
+    install -d $iwlwifi_dest
+    install -m 644 -c $iwlwifi_modules $iwlwifi_dest
+    popd
 
     # And save the headers/makefiles etc for building modules against
     #