[PATCH 0 of 2] build: Some tweaks with makefiles and versions

[PATCH 0 of 2] build: Some tweaks with makefiles and versions

[George Dunlap]

A couple of miscellaneous makefile tweaks to make it easier for
packagers.

[PATCH 1 of 2] build: Don't remove user-supplied xen-version during make clean

[George Dunlap]

xen/Makefile is designed to allow the user to supply a file named
xen/xen-include to change the format of xen version strings.  Unfortunately,
"make clean" removes xen/xen*, which will remove this file.

Make the clean process more targeted.

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>

diff -r e88a49951212 -r b5faa10db14d xen/Makefile
--- a/xen/Makefile	Tue Mar 06 16:43:01 2012 +0100
+++ b/xen/Makefile	Tue Mar 06 18:11:32 2012 +0000
@@ -61,7 +61,7 @@ _clean: delete-unfresh-files
 	$(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean
 	$(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean
 	$(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean
-	rm -f include/asm *.o $(TARGET)* *~ core
+	rm -f include/asm *.o $(TARGET) $(TARGET).gz $(TARGET)-syms *~ core
 	rm -f include/asm-*/asm-offsets.h
 	[ -d tools/figlet ] && rm -f .banner*

[PATCH 2 of 2] build: Add xenversion as a top-level target

[George Dunlap]

We already have xenversion as a target in the xen subdirectory;
simply extend it so that "make xenversion" does what you'd expect.

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>

diff -r b5faa10db14d -r 91b85d00ea54 Makefile
--- a/Makefile	Tue Mar 06 18:11:32 2012 +0000
+++ b/Makefile	Tue Mar 06 18:11:39 2012 +0000
@@ -257,6 +257,9 @@ uninstall:
 linux26:
 	$(MAKE) 'KERNELS=linux-2.6*' kernels
 
+.PHONY: xenversion
+xenversion:
+	@$(MAKE) --no-print-directory -C xen xenversion
 
 #
 # tboot targets

Re: [PATCH 1 of 2] build: Don't remove user-supplied xen-version during make clean

[Jan Beulich]

>>> On 06.03.12 at 19:12, George Dunlap <george.dunlap@eu.citrix.com> wrote:
> xen/Makefile is designed to allow the user to supply a file named
> xen/xen-include to change the format of xen version strings.  Unfortunately,
> "make clean" removes xen/xen*, which will remove this file.
> 
> Make the clean process more targeted.
> 
> Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
> 
> diff -r e88a49951212 -r b5faa10db14d xen/Makefile
> --- a/xen/Makefile	Tue Mar 06 16:43:01 2012 +0100
> +++ b/xen/Makefile	Tue Mar 06 18:11:32 2012 +0000
> @@ -61,7 +61,7 @@ _clean: delete-unfresh-files
>  	$(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean
>  	$(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean
>  	$(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean
> -	rm -f include/asm *.o $(TARGET)* *~ core
> +	rm -f include/asm *.o $(TARGET) $(TARGET).gz $(TARGET)-syms *~ core

Would probably better be $(TARGET).* to also cover xen.efi.

Jan

>  	rm -f include/asm-*/asm-offsets.h
>  	[ -d tools/figlet ] && rm -f .banner*
>  
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org 
> http://lists.xen.org/xen-devel