[Pkg-xen-devel] Re: [Pkg-xen-changes] r26 - in trunk/debian: . patches

Ralph Passgang ralph at debianbase.de
Sun Feb 19 21:28:20 UTC 2006


Hi Guido,

why is it needed to have the changeset configurable at compile time?

if a stable release is downloaded as source archive the upstream ChangeLog is 
included and will reflect the changeset and as you already noticed this will 
be used at compile time.

if you download the hg repository the "ChangeLog" file is missing, and that's 
why my 3.0.1-0tha2 release hadn't this file included, but the solution is 
simple, just use: "hg log >ChangeLog" and your done. If added this file in my 
tha3 release.

I think there is no need to patch upstream to make the changeset configurable. 
If you are using my tha2 source for your compile tests, then simply add the 
ChangeLog would be the easiest solution.

--Ralph

Am Sonntag, 19. Februar 2006 19:38 schrieb Guido Trotter:
> Author: ultrotter
> Date: 2006-02-19 18:38:10 +0000 (Sun, 19 Feb 2006)
> New Revision: 26
>
> Added:
>    trunk/debian/patches/30xenchangeset.dpatch
> Modified:
>    trunk/debian/patches/00list
>    trunk/debian/patches/10sysconfig.dpatch
>    trunk/debian/rules
> Log:
> Add 10sysconfig.dpatch description
> Add 30xenchangeset.dpatch to make the xen changeset configurable
> Force the xen changeset to be the correct one even if we compile without
> the .hg stuff
>
>
> Modified: trunk/debian/patches/00list
> ===================================================================
> --- trunk/debian/patches/00list	2006-02-19 16:41:16 UTC (rev 25)
> +++ trunk/debian/patches/00list	2006-02-19 18:38:10 UTC (rev 26)
> @@ -1,2 +1,3 @@
>  10sysconfig
>  20lib64
> +30xenchangeset
>
> Modified: trunk/debian/patches/10sysconfig.dpatch
> ===================================================================
> --- trunk/debian/patches/10sysconfig.dpatch	2006-02-19 16:41:16 UTC (rev
> 25) +++ trunk/debian/patches/10sysconfig.dpatch	2006-02-19 18:38:10 UTC
> (rev 26) @@ -2,7 +2,7 @@
>  ## 10sysconfig.dpatch by Ralph Passgang <ralph at debianbase.de>
>  ##
>  ## All lines beginning with `## DP:' are a description of the patch.
> -## DP: No description.
> +## DP: Move xendomains init script config file from /etc/sysconfig to
> /etc/default
>
>  @DPATCH@
>  diff -Naur a/Makefile b/Makefile
>
> Added: trunk/debian/patches/30xenchangeset.dpatch
> ===================================================================
> --- trunk/debian/patches/30xenchangeset.dpatch	2006-02-19 16:41:16 UTC (rev
> 25) +++ trunk/debian/patches/30xenchangeset.dpatch	2006-02-19 18:38:10 UTC
> (rev 26) @@ -0,0 +1,27 @@
> +#! /bin/sh /usr/share/dpatch/dpatch-run
> +## 30xenchangeset.dpatch by Guido Trotter <ultrotter at debian.org>
> +##
> +## All lines beginning with `## DP:' are a description of the patch.
> +## DP: Make the changeset configurable, defaulting to the old value
> +
> + at DPATCH@
> +diff -urNad xen-3.0.1+hg8743/xen/Makefile
> /tmp/dpep.Ek3jgb/xen-3.0.1+hg8743/xen/Makefile +---
> xen-3.0.1+hg8743/xen/Makefile	2006-02-18 19:57:57.971524368 +0100 ++++
> /tmp/dpep.Ek3jgb/xen-3.0.1+hg8743/xen/Makefile	2006-02-19
> 19:20:15.000000000 +0100 +@@ -8,6 +8,7 @@
> + export XEN_SUBVERSION    = 0
> + export XEN_EXTRAVERSION  = .1
> + export XEN_FULLVERSION   =
> $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) ++export
> XEN_CHANGESET	?= $(shell ((hg parents || head -n 7 ../ChangeLog || echo
> date: unavailable) | awk '{FS="changeset:[
> ]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END {print D,
> CS}') 2>/dev/null) +
> + export BASEDIR          := $(CURDIR)
> +
> +@@ -96,7 +97,7 @@
> + 	    -e 's/@@version@@/$(XEN_VERSION)/g' \
> + 	    -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
> + 	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
> +-	    -e 's!@@changeset@@!$(shell ((hg parents || head -n 7 ../ChangeLog
> || echo date: unavailable) | awk '{FS="changeset:[
> ]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END {print D,
> CS}') 2>/dev/null)!g' \ ++	    -e 's/@@changeset@@/$(XEN_CHANGESET)/g' \
> + 	    < include/xen/compile.h.in > $@.new
> + 	@cat include/xen/banner.h >> $@.new
> + 	@mv -f $@.new $@
>
>
> Property changes on: trunk/debian/patches/30xenchangeset.dpatch
> ___________________________________________________________________
> Name: svn:executable
>    + *
>
> Modified: trunk/debian/rules
> ===================================================================
> --- trunk/debian/rules	2006-02-19 16:41:16 UTC (rev 25)
> +++ trunk/debian/rules	2006-02-19 18:38:10 UTC (rev 26)
> @@ -15,6 +15,8 @@
>  UP_VERSION	:= $(shell echo "$(DEB_VERSION)" | sed 's/-[^-]*$$//')
>  DEB_BUILD_ARCH  := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
>
> +XEN_CHANGESET	:= "Thu Feb  2 12:28:53 2006 +0100 8743:2804be3661ba"
> +
>  include /usr/share/dpatch/dpatch.make
>
>  clean: really-clean unpatch
> @@ -34,10 +36,10 @@
>
>  install: debian/stamps/build
>  	rm -rf debian/install
> -	$(MAKE) dist DESTDIR=$(CURDIR)/debian/install KERNELS=
> XEN_PYTHON_NATIVE_INSTALL=1 CC=$(CC) GCC=$(CC) HOSTCC=$(CC) +	$(MAKE) dist
> DESTDIR=$(CURDIR)/debian/install KERNELS= XEN_PYTHON_NATIVE_INSTALL=1
> CC=$(CC) GCC=$(CC) HOSTCC=$(CC) XEN_CHANGESET=$(XEN_CHANGESET) ifeq
> ($(DEB_BUILD_ARCH),i386)
>  	$(MAKE) mrproper
> -	$(MAKE) xen DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC)
> HOSTCC=$(CC) XEN_TARGET_X86_PAE=y TARGET=$(CURDIR)/xen/xen_pae +	$(MAKE)
> xen DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC)
> HOSTCC=$(CC) XEN_TARGET_X86_PAE=y TARGET=$(CURDIR)/xen/xen_pae
> XEN_CHANGESET=$(XEN_CHANGESET) endif
>  	$(MAKE) -C tools/examples install-udev DESTDIR=$(CURDIR)/debian/install
>  	find $(CURDIR)/debian/install -name '*.pyc' | xargs rm
>
>
> _______________________________________________
> Pkg-xen-changes mailing list
> Pkg-xen-changes at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-xen-changes



More information about the Pkg-xen-devel mailing list