mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 16:48:26 +02:00 
			
		
		
		
	kbuild: Automatically remove stale <linux/version.h> file
In 3.7, the file moved from include/linux/ to
include/generated/uapi/linux/. The path in the #include directive
remained the same for compatibility reasons, but this created a problem
when bisecting. Commit 9c8cdb71 (kbuild: unconditionally clobber
include/linux/version.h on distclean) fixes this, provided the user does
make distclean between builds. Better not rely on the user and delete
the stale file each time make is invoked.
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
			
			
This commit is contained in:
		
							parent
							
								
									2d56030609
								
							
						
					
					
						commit
						223c24a7db
					
				
					 1 changed files with 3 additions and 1 deletions
				
			
		
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							|  | @ -480,6 +480,7 @@ asm-generic: | ||||||
| # of make so .config is not included in this case either (for *config).
 | # of make so .config is not included in this case either (for *config).
 | ||||||
| 
 | 
 | ||||||
| version_h := include/generated/uapi/linux/version.h | version_h := include/generated/uapi/linux/version.h | ||||||
|  | old_version_h := include/linux/version.h | ||||||
| 
 | 
 | ||||||
| no-dot-config-targets := clean mrproper distclean \
 | no-dot-config-targets := clean mrproper distclean \
 | ||||||
| 			 cscope gtags TAGS tags help %docs check% coccicheck \
 | 			 cscope gtags TAGS tags help %docs check% coccicheck \
 | ||||||
|  | @ -1004,6 +1005,7 @@ endef | ||||||
| 
 | 
 | ||||||
| $(version_h): $(srctree)/Makefile FORCE | $(version_h): $(srctree)/Makefile FORCE | ||||||
| 	$(call filechk,version.h) | 	$(call filechk,version.h) | ||||||
|  | 	$(Q)rm -f $(old_version_h) | ||||||
| 
 | 
 | ||||||
| include/generated/utsrelease.h: include/config/kernel.release FORCE | include/generated/utsrelease.h: include/config/kernel.release FORCE | ||||||
| 	$(call filechk,utsrelease.h) | 	$(call filechk,utsrelease.h) | ||||||
|  | @ -1172,7 +1174,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ | ||||||
| 		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
 | 		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
 | ||||||
| 		  signing_key.priv signing_key.x509 x509.genkey		\
 | 		  signing_key.priv signing_key.x509 x509.genkey		\
 | ||||||
| 		  extra_certificates signing_key.x509.keyid		\
 | 		  extra_certificates signing_key.x509.keyid		\
 | ||||||
| 		  signing_key.x509.signer include/linux/version.h | 		  signing_key.x509.signer | ||||||
| 
 | 
 | ||||||
| # clean - Delete most, but leave enough to build external modules
 | # clean - Delete most, but leave enough to build external modules
 | ||||||
| #
 | #
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Michal Marek
						Michal Marek