make a few commands silent and fix defconfig logic
SVN-Revision: 6886
This commit is contained in:
		
							
								
								
									
										12
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								Makefile
									
									
									
									
									
								
							| @@ -50,20 +50,18 @@ target/%/Makefile: ; | |||||||
| tmp/.packageinfo: FORCE | tmp/.packageinfo: FORCE | ||||||
| tmp/.targetinfo: FORCE | tmp/.targetinfo: FORCE | ||||||
| tmp/.%info: | tmp/.%info: | ||||||
| 	mkdir -p tmp/info | 	@mkdir -p tmp/info | ||||||
| 	$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$^" SCAN_EXTRA="" | 	@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$^" SCAN_EXTRA="" | ||||||
|  |  | ||||||
| tmpinfo-clean: FORCE | tmpinfo-clean: FORCE | ||||||
| 	-rm -rf tmp/.*info | 	-rm -rf tmp/.*info | ||||||
|  |  | ||||||
| tmp/.config-%.in: tmp/.%info | tmp/.config-%.in: tmp/.%info | ||||||
| 	./scripts/metadata.pl $*_config < $< > $@ || rm -f $@ | 	@./scripts/metadata.pl $*_config < $< > $@ || rm -f $@ | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| .config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in | .config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in | ||||||
| 	if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \ | 	if [ \! -f .config ]; then \ | ||||||
| 		cp $(HOME)/.openwrt/defconfig .config; \ | 		[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \ | ||||||
| 		$(NO_TRACE_MAKE) menuconfig; \ | 		$(NO_TRACE_MAKE) menuconfig; \ | ||||||
| 	fi | 	fi | ||||||
| 	$< -D .config Config.in &> /dev/null | 	$< -D .config Config.in &> /dev/null | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Felix Fietkau
					Felix Fietkau