rpms/kernel-xen-2.6/F-8 xen-version-strings.patch,1.5,1.6

[Mark McLoughlin (markmc)]

Author: markmc

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23117

Modified Files:
	xen-version-strings.patch 
Log Message:
Rediff

xen-version-strings.patch:

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-8/xen-version-strings.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xen-version-strings.patch	20 Mar 2008 18:42:00 -0000	1.5
+++ xen-version-strings.patch	7 Aug 2008 16:23:29 -0000	1.6
@@ -1,12 +1,12 @@
-diff -up xen-3.1.3/xen/Makefile.version-strings xen-3.1.3/xen/Makefile
---- xen-3.1.3/xen/Makefile.version-strings	2008-01-31 10:06:54.000000000 +0000
-+++ xen-3.1.3/xen/Makefile	2008-03-20 18:34:54.000000000 +0000
+diff -up xen-3.1.4/xen/Makefile.version-strings xen-3.1.4/xen/Makefile
+--- xen-3.1.4/xen/Makefile.version-strings	2008-08-07 17:19:17.000000000 +0100
++++ xen-3.1.4/xen/Makefile	2008-08-07 17:22:37.000000000 +0100
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3
  export XEN_SUBVERSION    = 1
--export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION)
-+export XEN_BASEVERSION  ?= .3$(XEN_VENDORVERSION)
+-export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION)
++export XEN_BASEVERSION  ?= .4$(XEN_VENDORVERSION)
 +export XEN_BUILDER      ?=
 +export XEN_BUILDVERSION ?=
 +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION)
@@ -14,12 +14,12 @@
  export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
  -include xen-version
  
-@@ -114,7 +118,7 @@ include/xen/compile.h: include/xen/compi
- 	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
- 	    -e 's!@@changeset@@!$(shell ((hg parents --template "{date|date} {rev}:{node|short}" >/dev/null && hg parents --template "{date|date} {rev}:{node|short}") || echo "unavailable") 2>/dev/null)!g' \
- 	    < include/xen/compile.h.in > $@.new
--	tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) >> $@.new
-+	tools/figlet/figlet -d tools/figlet Xen $(XEN_SHORTVERSION) >> $@.new
- 	@mv -f $@.new $@
+@@ -104,7 +108,7 @@ include/xen/acm_policy.h:
+ 
+ .banner: Makefile
+ 	$(MAKE) -C tools
+-	@tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) 2>$@2 >$@1
++	@tools/figlet/figlet -d tools/figlet Xen $(XEN_SHORTVERSION) 2>$@2 >$@1
+ 	@cat $@1 $@2 >$@
+ 	@rm -f $@1 $@2
  
- include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s