From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: Re: Xen build - Debian vs Redhat layout patch options
Date: Tue, 11 Jan 2011 17:37:07 +0000
Message-ID: <19756.38211.320507.531016@mariner.uk.xensource.com>
References: <AANLkTimi2-DzvysGnzJmEZtL4TXSsX6YDS0TPtoU-FiE@mail.gmail.com>
	<alpine.DEB.2.00.1007071207480.17029@kaball-desktop>
	<AANLkTim48T7Y3Pq0_nS1zZ5jWH_kXrS8JceWLf-yUOM6@mail.gmail.com>
	<AANLkTinumJX1x+2AZ8vB97XRXFS3vWYArg0XJk8iiebt@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <AANLkTinumJX1x+2AZ8vB97XRXFS3vWYArg0XJk8iiebt@mail.gmail.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: user virtual <virtualusr@gmail.com>
Cc: xen-devel@lists.xensource.com, Bruce Edge <bruce.edge@gmail.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

user virtual writes ("Re: [Xen-devel] Xen build - Debian vs Redhat layout patch options"):
> I was encouraged by Bruce to forward my patches upstream to make Xen sources
> buildable from debian makefile debian/rules and for debian based target
> systems.

Thanks.

> I tried to make my 3 of 4 (5) patches to xen40-testing.hg as non intrusive
> as possible
> 
> - backport-StdGNU.mk.diff  (from xen-devel, already here)

Thanks for this.  Posting them all one after another in a single
message is not the most convenient format for a submission; better
would be one per email.

And there is no need to send us patches we already have; it just
causes confusion ...

> - debian-sysconfig-default.diff  (conditional Makefile expansion)

We have machinery in xen-unstable.hg now which should cope with this,
so I don't think we need that change.

Stefano has dealt with most of these I think, but we still had
outstanding this:


> Description: Simple Python install layout for Debian based systems
>  Ported from origin below (Xen-3.4), which is a follower of
>  previous version from ubuntu Xen-3.3 sources
>  xen-3.3-3.3.0/debian/patches/use-python-2.6.diff
>  Drivers: User Virtual <virtualusr@gmail.com>
>  URL: http://virtualusr.wordpress.com
> Origin: https://bugs.launchpad.net/ubuntu/+source/xen-3.3/+bug/378240/+attachment/662345/+files/xen-3.4_3.4.1-1ubuntu1.diff.gz
> Index: xen-4.0-4.0.1/tools/pygrub/Makefile
> ===================================================================
> --- xen-4.0-4.0.1.orig/tools/pygrub/Makefile	2010-08-25 10:22:42.000000000 +0200
> +++ xen-4.0-4.0.1/tools/pygrub/Makefile	2011-01-04 19:08:18.556582404 +0100
> @@ -11,7 +11,8 @@
>  .PHONY: install
>  install: all
>  	CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
> -		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force
> +		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force \
> +		$(if $(filter y,$(DEBIANBASE)),--install-layout=deb)
>  	$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(BINDIR)/pygrub
>  	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot

This special casing of Debian is pretty horrid.  How about we provide
a general way to pass arguments to setup.py install and setup.py
build, with the variables set by default to the empty string ?

Ian.