Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 0b9227b6fd3f198024fdef65bd4afb45 > files > 2

kernel-2.6.38.8-6.mga1.src.rpm


 Makefile                 |   13 +++++--------
 scripts/kconfig/Makefile |   18 ------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff -urp linux-2.6.38-mga0.2/Makefile linux-2.6.38-mga0.2-mrproper/Makefile
--- linux-2.6.38-mga0.2/Makefile	2011-03-20 05:16:56.702931902 +0200
+++ linux-2.6.38-mga0.2-mrproper/Makefile	2011-03-20 05:18:01.828314994 +0200
@@ -482,8 +482,7 @@ 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 include/config/tristate.conf
-	$(Q)$(MAKE) $(build)=$(@)
+scripts:
 
 # Objects we will link into vmlinux / subdirs we need to visit
 init-y		:= init/
@@ -956,7 +955,7 @@ prepare0: archprepare FORCE
 	$(Q)$(MAKE) $(build)=. missing-syscalls
 
 # All the preparing..
-prepare: prepare0
+prepare:
 
 # Generate some files
 # ---------------------------------------------------------------------------
@@ -1132,10 +1131,8 @@ CLEAN_FILES +=	vmlinux System.map \
                 .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
 
 # Directories & files removed with 'make mrproper'
-MRPROPER_DIRS  += include/config usr/include include/generated
-MRPROPER_FILES += .config .config.old .version .old_version             \
-                  include/linux/version.h                               \
-		  Module.symvers tags TAGS cscope*
+MRPROPER_DIRS	+= ""
+MRPROPER_FILES	+= ""
 
 # clean - Delete most, but leave enough to build external modules
 #
@@ -1153,7 +1150,7 @@ clean: archclean
 #
 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 -urp linux-2.6.38-mga0.2/scripts/kconfig/Makefile linux-2.6.38-mga0.2-mrproper/scripts/kconfig/Makefile
--- linux-2.6.38-mga0.2/scripts/kconfig/Makefile	2011-03-20 05:16:56.702931902 +0200
+++ linux-2.6.38-mga0.2-mrproper/scripts/kconfig/Makefile	2011-03-20 05:18:01.828314994 +0200
@@ -12,26 +12,18 @@ Kconfig := Kconfig
 endif
 
 xconfig: $(obj)/qconf 3rdparty/Makefile
-	$< $(Kconfig)
 
 gconfig: $(obj)/gconf 3rdparty/Makefile
-	$< $(Kconfig)
 
 menuconfig: $(obj)/mconf 3rdparty/Makefile
-	$< $(Kconfig)
 
 config: $(obj)/conf 3rdparty/Makefile
-	$< --oldaskconfig $(Kconfig)
 
 nconfig: $(obj)/nconf 3rdparty/Makefile
-	$< $(Kconfig)
 
 oldconfig: $(obj)/conf 3rdparty/Makefile
-	$< --$@ $(Kconfig)
 
 silentoldconfig: $(obj)/conf 3rdparty/Makefile
-	$(Q)mkdir -p include/generated
-	$< --$@ $(Kconfig)
 
 # if no path is given, then use src directory to find file
 ifdef LSMOD
@@ -98,26 +90,16 @@ update-po-config: $(obj)/kxgettext $(obj
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
 
 allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
-	$< --$@ $(Kconfig)
 
 PHONY += listnewconfig oldnoconfig savedefconfig defconfig
 
 listnewconfig oldnoconfig: $(obj)/conf 3rdparty/Makefile
-	$< --$@ $(Kconfig)
 
 savedefconfig: $(obj)/conf 3rdparty/Makefile
-	$< --$@=defconfig $(Kconfig)
 
 defconfig: $(obj)/conf 3rdparty/Makefile
-ifeq ($(KBUILD_DEFCONFIG),)
-	$< --defconfig $(Kconfig)
-else
-	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
-endif
 
 %_defconfig: $(obj)/conf 3rdparty/Makefile
-	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 
 # Help text used by make help
 help: