SOURCES: rpm.macros - build_kernel_modules: added -c option which ...

sparky sparky at pld-linux.org
Tue Nov 14 22:58:29 CET 2006


Author: sparky                       Date: Tue Nov 14 21:58:29 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- build_kernel_modules: added -c option which prevents executing make clean

---- Files affected:
SOURCES:
   rpm.macros (1.331 -> 1.332) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.331 SOURCES/rpm.macros:1.332
--- SOURCES/rpm.macros:1.331	Tue Nov 14 22:54:04 2006
+++ SOURCES/rpm.macros	Tue Nov 14 22:58:24 2006
@@ -1073,6 +1073,7 @@
 #		without .ko extension, may be placed in subdirectory
 #  -C <directory> -- change to <directory> before doing anything
 #  -p <arg>, -P <arg> -- arguments passeed to make scripts
+#  -c -- do not execute make clean
 #  <additional arguments> -- all additional arguments will be passed to
 #		make modules
 #
@@ -1090,7 +1091,7 @@
 # - in last line \ has to touch arguments so arguments passing
 #   in new lines (using \) will be supported
 
-%build_kernel_modules(p:P:m:C:)										\
+%build_kernel_modules(p:P:m:C:c)									\
 %{!?-m:%{error:%{0}: Required module name/list missing} exit 1}		\
 																	\
 %define Opts 														\\\\\\\
@@ -1134,9 +1135,9 @@
 		ln -sf %{_kernelsrcdir}/scripts o/scripts					\
 	%endif															\
 																	\
-	%{__make} -C %{_kernelsrcdir} clean								\\\
+	%{!?-c:%{__make} -C %{_kernelsrcdir} clean						\\\
 		RCS_FIND_IGNORE="-name '*.ko' -o"							\\\
-		M=$PWD %{MakeOpts}											\
+		M=$PWD %{MakeOpts}}											\
 	%{__make} -C %{_kernelsrcdir} modules							\\\
 		${1+"$@"}													\\\
 		M=$PWD %{MakeOpts}											\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.331&r2=1.332&f=u



More information about the pld-cvs-commit mailing list