SPECS (LINUX_2_6): kernel.spec - more

[glen]

Author: glen                         Date: Fri Dec 15 19:17:56 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- more

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1686 -> 1.441.2.1687) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1686 SPECS/kernel.spec:1.441.2.1687
--- SPECS/kernel.spec:1.441.2.1686	Fri Dec 15 20:14:56 2006
+++ SPECS/kernel.spec	Fri Dec 15 20:17:50 2006
@@ -1253,19 +1253,19 @@
 	fi
 
 	ln -sf arch/%{_target_base_arch}/defconfig .config
-	install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{version}/include/linux
+	install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux
 	rm -f include/linux/autoconf.h
 	%{__make} %CrossOpts include/linux/autoconf.h
 	if [ "$smp" = "yes" ]; then
 		install include/linux/autoconf.h \
-			$KERNEL_INSTALL_DIR/usr/src/linux-%{version}/include/linux/autoconf-smp.h
+			$KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-smp.h
 		install .config \
-			$KERNEL_INSTALL_DIR/usr/src/linux-%{version}/config-smp
+			$KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-smp
 	else
 		install include/linux/autoconf.h \
-			$KERNEL_INSTALL_DIR/usr/src/linux-%{version}/include/linux/autoconf-up.h
+			$KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-up.h
 		install .config \
-			$KERNEL_INSTALL_DIR/usr/src/linux-%{version}/config-up
+			$KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-up
 	fi
 }
 
@@ -1356,13 +1356,13 @@
 		KERNELRELEASE=$KernelVer
 
 	# You'd probabelly want to make it somewhat different
-	install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{version}
+	install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}
 	if [ "$smp" = "yes" ]; then
 		install Module.symvers \
-			$KERNEL_INSTALL_DIR/usr/src/linux-%{version}/Module.symvers-smp
+			$KERNEL_INSTALL_DIR%{_kernelsrcdir}/Module.symvers-smp
 	else
 		install Module.symvers \
-			$KERNEL_INSTALL_DIR/usr/src/linux-%{version}/Module.symvers-up
+			$KERNEL_INSTALL_DIR%{_kernelsrcdir}/Module.symvers-up
 	fi
 
 	echo "CHECKING DEPENDENCIES FOR KERNEL MODULES"
@@ -1429,33 +1429,31 @@
 	fi
 done
 
-ln -sf linux-%{version} $RPM_BUILD_ROOT%{_prefix}/src/linux
-
-find . -maxdepth 1 ! -name "build-done" ! -name "." -exec cp -a$l "{}" "$RPM_BUILD_ROOT/usr/src/linux-%{version}/" ";"
+find . -maxdepth 1 ! -name "build-done" ! -name "." -exec cp -a$l "{}" "$RPM_BUILD_ROOT%{_kernelsrcdir}/" ";"
 
 cd $RPM_BUILD_ROOT%{_kernelsrcdir}
 
 %{__make} %CrossOpts mrproper \
 	RCS_FIND_IGNORE='-name build-done -prune -o'
 
-if [ -e $KERNEL_BUILD_DIR/build-done/kernel-UP/usr/src/linux-%{version}/include/linux/autoconf-up.h ]; then
-install $KERNEL_BUILD_DIR/build-done/kernel-UP/usr/src/linux-%{version}/include/linux/autoconf-up.h \
-	$RPM_BUILD_ROOT/usr/src/linux-%{version}/include/linux
-install	$KERNEL_BUILD_DIR/build-done/kernel-UP/usr/src/linux-%{version}/config-up \
-	$RPM_BUILD_ROOT/usr/src/linux-%{version}
+if [ -e $KERNEL_BUILD_DIR/build-done/kernel-UP%{_kernelsrcdir}/include/linux/autoconf-up.h ]; then
+install $KERNEL_BUILD_DIR/build-done/kernel-UP%{_kernelsrcdir}/include/linux/autoconf-up.h \
+	$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
+install	$KERNEL_BUILD_DIR/build-done/kernel-UP%{_kernelsrcdir}/config-up \
+	$RPM_BUILD_ROOT%{_kernelsrcdir}
 fi
 
-if [ -e $KERNEL_BUILD_DIR/build-done/kernel-SMP/usr/src/linux-%{version}/include/linux/autoconf-smp.h ]; then
-install $KERNEL_BUILD_DIR/build-done/kernel-SMP/usr/src/linux-%{version}/include/linux/autoconf-smp.h \
-	$RPM_BUILD_ROOT/usr/src/linux-%{version}/include/linux
-install	$KERNEL_BUILD_DIR/build-done/kernel-SMP/usr/src/linux-%{version}/config-smp \
-	$RPM_BUILD_ROOT/usr/src/linux-%{version}
+if [ -e $KERNEL_BUILD_DIR/build-done/kernel-SMP%{_kernelsrcdir}/include/linux/autoconf-smp.h ]; then
+install $KERNEL_BUILD_DIR/build-done/kernel-SMP%{_kernelsrcdir}/include/linux/autoconf-smp.h \
+	$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
+install	$KERNEL_BUILD_DIR/build-done/kernel-SMP%{_kernelsrcdir}/config-smp \
+	$RPM_BUILD_ROOT%{_kernelsrcdir}
 fi
 
 %if %{with up} || %{with smp}
 # UP or SMP
-cp -Rdp $KERNEL_BUILD_DIR/include/linux/* \
-	$RPM_BUILD_ROOT/usr/src/linux-%{version}/include/linux
+cp -Rdp$l $KERNEL_BUILD_DIR/include/linux/* \
+	$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
 %endif
 
 %{__make} %CrossOpts mrproper
@@ -1937,6 +1935,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1687  2006/12/15 19:17:50  glen
+- more
+
 Revision 1.441.2.1686  2006/12/15 19:14:56  glen
 - let %install be re-entrant
 
================================================================

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