SPECS (LINUX_2_6): kernel.spec - (cross)depmod issue corrected.

[pluto]

Author: pluto                        Date: Mon Aug  1 15:38:05 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- (cross)depmod issue corrected.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1151 -> 1.441.2.1152) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1151 SPECS/kernel.spec:1.441.2.1152
--- SPECS/kernel.spec:1.441.2.1151	Mon Aug  1 13:15:09 2005
+++ SPECS/kernel.spec	Mon Aug  1 17:37:59 2005
@@ -751,15 +751,16 @@
 
 %if "%{_target_base_arch}" != "%{_arch}"
     CrossOpts="ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-"
-    export DEPMOD=/bin/true
+    DepMod=/bin/true
     %if "%{_arch}" == "x86_64"
 	%if "%{_target_base_arch}" == "i386"
 	    CrossOpts="ARCH=%{_target_base_arch}"
-	    unset DEPMOD
+	    DepMod=/sbin/depmod
 	%endif
     %endif
 %else
     CrossOpts=""
+    DepMod=/sbin/depmod
 %endif
 
 %if %{with xen}
@@ -824,7 +825,6 @@
 %if %{with em8300}
 	cat %{SOURCE94} >> arch/%{_target_base_arch}/defconfig
 %endif
-##  ocfs2 config
 	cat %{SOURCE96} >> arch/%{_target_base_arch}/defconfig
 
 	ln -sf arch/%{_target_base_arch}/defconfig .config
@@ -930,7 +930,7 @@
 %endif
 	%{__make} $CrossOpts modules_install \
 		%{?with_verbose:V=1} \
-		DEPMOD=$DEPMOD \
+		DEPMOD=$DepMod \
      		INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
 		KERNELRELEASE=$KernelVer
 
@@ -939,9 +939,7 @@
 	/sbin/depmod --basedir $KERNEL_INSTALL_DIR -ae -F $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer -r $KernelVer || echo
 	[ ! -z "$CrossOpts" ] && \
 	touch $KERNEL_INSTALL_DIR/modules.dep
-
 	echo "KERNEL RELEASE $KernelVer DONE"
-
 }
 
 KERNEL_BUILD_DIR=`pwd`
@@ -1447,6 +1445,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1152  2005/08/01 15:37:59  pluto
+- (cross)depmod issue corrected.
+
 Revision 1.441.2.1151  2005/08/01 11:15:09  pluto
 - fix shell syntax and avoid cross-depmod faults.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1151&r2=1.441.2.1152&f=u