Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > contrib-release-src > by-pkgid > 78de67e74911614589444e3003538953 > files > 4

kernel-rsbac-2.6.33.4-1mdv2010.1.src.rpm

diff -Nurp linux-2.6.33-rc4-git7-t1.1/Makefile linux-2.6.33-rc4-git7-t1.2/Makefile
--- linux-2.6.33-rc4-git7-t1.1/Makefile	2010-01-20 23:52:22.337329287 +0200
+++ linux-2.6.33-rc4-git7-t1.2/Makefile	2010-01-20 23:55:49.340078994 +0200
@@ -470,8 +470,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 include/config/tristate.conf
-	$(Q)$(MAKE) $(build)=$(@)
+#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/
@@ -987,7 +988,8 @@ prepare0: archprepare FORCE
 	$(Q)$(MAKE) $(build)=. missing-syscalls
 
 # All the preparing..
-prepare: prepare0
+#prepare: prepare0
+prepare:
 
 # Generate some files
 # ---------------------------------------------------------------------------
diff -Nurp linux-2.6.33-rc4-git7-t1.1/scripts/kconfig/Makefile linux-2.6.33-rc4-git7-t1.2/scripts/kconfig/Makefile
--- linux-2.6.33-rc4-git7-t1.1/scripts/kconfig/Makefile	2010-01-20 23:45:34.895412571 +0200
+++ linux-2.6.33-rc4-git7-t1.2/scripts/kconfig/Makefile	2010-01-21 00:05:07.088328874 +0200
@@ -11,101 +11,116 @@
 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
-	$(Q)mkdir -p include/generated
-	$< -s $(Kconfig)
-
-localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
-	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
-	$(Q)if [ -f .config ]; then 				\
-			cmp -s .tmp.config .config ||		\
-			(mv -f .config .config.old.1;		\
-			 mv -f .tmp.config .config;		\
-			 $(obj)/conf -s $(Kconfig);		\
-			 mv -f .config.old.1 .config.old)	\
-	else							\
-			mv -f .tmp.config .config;		\
-			$(obj)/conf -s $(Kconfig);		\
-	fi
-	$(Q)rm -f .tmp.config
-
-localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
-	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
-	$(Q)sed -i s/=m/=y/ .tmp.config
-	$(Q)if [ -f .config ]; then 				\
-			cmp -s .tmp.config .config ||		\
-			(mv -f .config .config.old.1;		\
-			 mv -f .tmp.config .config;		\
-			 $(obj)/conf -s $(Kconfig);		\
-			 mv -f .config.old.1 .config.old)	\
-	else							\
-			mv -f .tmp.config .config;		\
-			$(obj)/conf -s $(Kconfig);		\
-	fi
-	$(Q)rm -f .tmp.config
+#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
+#	$(Q)mkdir -p include/generated
+#	$< -s $(Kconfig)
+silentoldconfig:
+
+#localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+#	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
+#	$(Q)if [ -f .config ]; then 				\
+#			cmp -s .tmp.config .config ||		\
+#			(mv -f .config .config.old.1;		\
+#			 mv -f .tmp.config .config;		\
+#			 $(obj)/conf -s $(Kconfig);		\
+#			 mv -f .config.old.1 .config.old)	\
+#	else							\
+#			mv -f .tmp.config .config;		\
+#			$(obj)/conf -s $(Kconfig);		\
+#	fi
+#	$(Q)rm -f .tmp.config
+localmodconfig:
+
+#localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
+#	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
+#	$(Q)sed -i s/=m/=y/ .tmp.config
+#	$(Q)if [ -f .config ]; then 				\
+#			cmp -s .tmp.config .config ||		\
+#			(mv -f .config .config.old.1;		\
+#			 mv -f .tmp.config .config;		\
+#			 $(obj)/conf -s $(Kconfig);		\
+#			 mv -f .config.old.1 .config.old)	\
+#	else							\
+#			mv -f .tmp.config .config;		\
+#			$(obj)/conf -s $(Kconfig);		\
+#	fi
+#	$(Q)rm -f .tmp.config
+localyesconfig:
 
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 # The symlink is used to repair a deficiency in arch/um
-update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
-	$(Q)echo "  GEN config"
-	$(Q)xgettext --default-domain=linux              \
-	    --add-comments --keyword=_ --keyword=N_      \
-	    --from-code=UTF-8                            \
-	    --files-from=scripts/kconfig/POTFILES.in     \
-	    --output $(obj)/config.pot
-	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-	$(Q)(for i in `ls arch/*/Kconfig`;               \
-	    do                                           \
-		echo "  GEN $$i";                        \
-		$(obj)/kxgettext $$i                     \
-		     >> $(obj)/config.pot;               \
-	    done )
-	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
-	    --output $(obj)/linux.pot
-	$(Q)rm -f arch/um/Kconfig.arch
-	$(Q)rm -f $(obj)/config.pot
+#update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
+#	$(Q)echo "  GEN config"
+#	$(Q)xgettext --default-domain=linux              \
+#	    --add-comments --keyword=_ --keyword=N_      \
+#	    --from-code=UTF-8                            \
+#	    --files-from=scripts/kconfig/POTFILES.in     \
+#	    --output $(obj)/config.pot
+#	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
+#	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
+#	$(Q)(for i in `ls arch/*/Kconfig`;               \
+#	    do                                           \
+#		echo "  GEN $$i";                        \
+#		$(obj)/kxgettext $$i                     \
+#		     >> $(obj)/config.pot;               \
+#	    done )
+#	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
+#	    --output $(obj)/linux.pot
+#	$(Q)rm -f arch/um/Kconfig.arch
+#	$(Q)rm -f $(obj)/config.pot
+update-po-config:
 
 PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
 
-randconfig: $(obj)/conf
-	$< -r $(Kconfig)
-
-allyesconfig: $(obj)/conf
-	$< -y $(Kconfig)
-
-allnoconfig: $(obj)/conf
-	$< -n $(Kconfig)
-
-allmodconfig: $(obj)/conf
-	$< -m $(Kconfig)
-
-defconfig: $(obj)/conf
-ifeq ($(KBUILD_DEFCONFIG),)
-	$< -d $(Kconfig)
-else
-	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-	$(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
-endif
-
-%_defconfig: $(obj)/conf
-	$(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig)
+#randconfig: $(obj)/conf
+#	$< -r $(Kconfig)
+randconfig:
+
+#allyesconfig: $(obj)/conf
+#	$< -y $(Kconfig)
+allyesconfig:
+
+#allnoconfig: $(obj)/conf
+#	$< -n $(Kconfig)
+allnoconfig:
+
+#allmodconfig: $(obj)/conf
+#	$< -m $(Kconfig)
+allmodconfig:
+
+#defconfig: $(obj)/conf
+#ifeq ($(KBUILD_DEFCONFIG),)
+#	$< -d $(Kconfig)
+#else
+#	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
+#	$(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+#endif
+defconfig:
+
+#%_defconfig: $(obj)/conf
+#	$(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig)
+%_defconfig:
 
 # Help text used by make help
 help: