mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	kconfig/streamline_config.pl: merge local{mod,yes}config
The two targets `localmodconfig' and `localyesconfig' only differs from the sed(1) ran on the result of `streamline_config.pl' to convert symbols set to `modules' to `yes'. This conversion can be made directly from the perl script, and thus avoid duplicating the command to generate the configuration. Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
This commit is contained in:
		
							parent
							
								
									22d550ae83
								
							
						
					
					
						commit
						50bce3e807
					
				
					 1 changed files with 1 additions and 17 deletions
				
			
		| 
						 | 
				
			
			@ -33,7 +33,7 @@ silentoldconfig: $(obj)/conf
 | 
			
		|||
	$(Q)mkdir -p include/generated
 | 
			
		||||
	$< --$@ $(Kconfig)
 | 
			
		||||
 | 
			
		||||
localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 | 
			
		||||
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 | 
			
		||||
	$(Q)mkdir -p include/generated
 | 
			
		||||
	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
 | 
			
		||||
	$(Q)if [ -f .config ]; then 					\
 | 
			
		||||
| 
						 | 
				
			
			@ -48,22 +48,6 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 | 
			
		|||
	fi
 | 
			
		||||
	$(Q)rm -f .tmp.config
 | 
			
		||||
 | 
			
		||||
localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 | 
			
		||||
	$(Q)mkdir -p include/generated
 | 
			
		||||
	$(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 --silentoldconfig $(Kconfig);	\
 | 
			
		||||
			 mv -f .config.old.1 .config.old)		\
 | 
			
		||||
	else								\
 | 
			
		||||
			mv -f .tmp.config .config;			\
 | 
			
		||||
			$(obj)/conf --silentoldconfig $(Kconfig);	\
 | 
			
		||||
	fi
 | 
			
		||||
	$(Q)rm -f .tmp.config
 | 
			
		||||
 | 
			
		||||
# 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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue