Sophie

Sophie

distrib > Mandriva > 2010.0 > x86_64 > by-pkgid > 4d8f63d4070326f88d9d81850c86d38a > files > 3

kernel-linus-2.6.31.5-1mdv2010.0.src.rpm

diff -Nurp linux-2.6.31.5/Makefile linux-2.6.31.5-test/Makefile
--- linux-2.6.31.5/Makefile	2009-10-24 03:14:59.007669055 +0300
+++ linux-2.6.31.5-test/Makefile	2009-10-24 03:17:04.977918822 +0300
@@ -462,8 +462,9 @@ ifeq ($(KBUILD_EXTMOD),)
 # Carefully list dependencies so we do not try to build scripts twice
 # in parallel
 PHONY += scripts
-scripts: scripts_basic include/config/auto.conf
-	$(Q)$(MAKE) $(build)=$(@)
+#scripts: scripts_basic include/config/auto.conf
+#	$(Q)$(MAKE) $(build)=$(@)
+scripts:
 
 # Objects we will link into vmlinux / subdirs we need to visit
 init-y		:= init/
@@ -978,7 +979,8 @@ prepare0: archprepare FORCE
 	$(Q)$(MAKE) $(build)=. missing-syscalls
 
 # All the preparing..
-prepare: prepare0
+#prepare: prepare0
+prepare:
 
 # The asm symlink changes when $(ARCH) changes.
 # Detect this and ask user to run make mrproper
@@ -1188,12 +1190,15 @@ CLEAN_FILES +=	vmlinux System.map \
                 .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
 
 # Directories & files removed with 'make mrproper'
-MRPROPER_DIRS  += include/config include2 usr/include include/generated
-MRPROPER_FILES += .config .config.old include/asm .version .old_version \
-                  include/linux/autoconf.h include/linux/version.h      \
-                  include/linux/utsrelease.h                            \
-                  include/linux/bounds.h include/asm*/asm-offsets.h     \
-		  Module.symvers Module.markers tags TAGS cscope*
+# This is a -devel rpm, so we dont let mrproper remove anything /tmb 12.10.2007
+#MRPROPER_DIRS  += include/config include2 usr/include include/generated
+#MRPROPER_FILES += .config .config.old include/asm .version .old_version \
+#                  include/linux/autoconf.h include/linux/version.h      \
+#                  include/linux/utsrelease.h                            \
+#                  include/linux/bounds.h include/asm*/asm-offsets.h     \
+#		  Module.symvers Module.markers tags TAGS cscope*
+MRPROPER_DIRS  += ""
+MRPROPER_FILES += ""
 
 # clean - Delete most, but leave enough to build external modules
 #
@@ -1219,7 +1224,7 @@ clean: archclean $(clean-dirs)
 #
 mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
 mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
-mrproper-dirs      := $(addprefix _mrproper_,Documentation/DocBook scripts)
+mrproper-dirs      := $(addprefix _mrproper_,Documentation/DocBook)
 
 PHONY += $(mrproper-dirs) mrproper archmrproper
 $(mrproper-dirs):
diff -Nurp linux-2.6.31.5/scripts/kconfig/Makefile linux-2.6.31.5-test/scripts/kconfig/Makefile
--- linux-2.6.31.5/scripts/kconfig/Makefile	2009-09-10 01:13:59.000000000 +0300
+++ linux-2.6.31.5-test/scripts/kconfig/Makefile	2009-10-24 03:17:04.978918966 +0300
@@ -10,23 +10,29 @@ else
 Kconfig := arch/$(SRCARCH)/Kconfig
 endif
 
-xconfig: $(obj)/qconf
-	$< $(Kconfig)
-
-gconfig: $(obj)/gconf
-	$< $(Kconfig)
-
-menuconfig: $(obj)/mconf
-	$< $(Kconfig)
-
-config: $(obj)/conf
-	$< $(Kconfig)
-
-oldconfig: $(obj)/conf
-	$< -o $(Kconfig)
-
-silentoldconfig: $(obj)/conf
-	$< -s $(Kconfig)
+#xconfig: $(obj)/qconf
+#	$< $(Kconfig)
+xconfig:
+
+#gconfig: $(obj)/gconf
+#	$< $(Kconfig)
+gconfig:
+
+#menuconfig: $(obj)/mconf
+#	$< $(Kconfig)
+menuconfig:
+
+#config: $(obj)/conf
+#	$< $(Kconfig)
+config:
+
+#oldconfig: $(obj)/conf
+#	$< -o $(Kconfig)
+oldconfig:
+
+#silentoldconfig: $(obj)/conf
+#	$< -s $(Kconfig)
+silentoldconfig:
 
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files