Jan Beulich
2006-Nov-21 16:45 UTC
[Xen-devel] [PATCH] add check for python-devel to tools build
Again, this must be given exec permission after applying.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: 2006-11-17/tools/check/check_python_devel
==================================================================--- /dev/null
1970-01-01 00:00:00.000000000 +0000
+++ 2006-11-17/tools/check/check_python_devel 2006-11-21 12:03:08.000000000
+0100
@@ -0,0 +1,13 @@
+#!/bin/bash
+# CHECK-BUILD
+
+function error {
+ echo
+ echo " *** Check for python development environment FAILED"
+ exit 1
+}
+
+lib=lib
+test "$(uname -m)" != x86_64 || lib=lib64
+set -e
+[ -e /usr/$lib/python/config/Makefile ] || error
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Daniel P. Berrange
2006-Nov-21 16:48 UTC
Re: [Xen-devel] [PATCH] add check for python-devel to tools build
On Tue, Nov 21, 2006 at 04:45:57PM +0000, Jan Beulich wrote:> Again, this must be given exec permission after applying. > > Signed-off-by: Jan Beulich <jbeulich@novell.com> > > Index: 2006-11-17/tools/check/check_python_devel > ==================================================================> --- /dev/null 1970-01-01 00:00:00.000000000 +0000 > +++ 2006-11-17/tools/check/check_python_devel 2006-11-21 12:03:08.000000000 +0100 > @@ -0,0 +1,13 @@ > +#!/bin/bash > +# CHECK-BUILD > + > +function error { > + echo > + echo " *** Check for python development environment FAILED" > + exit 1 > +} > + > +lib=lib > +test "$(uname -m)" != x86_64 || lib=lib64 > +set -e > +[ -e /usr/$lib/python/config/Makefile ] || errorUrm, python is in /usr/$lib/python2.4 on my systems (or python2.5, etc) Is there some way you can run the ''python'' binary and ask it what its install prefix is, rather than hardcoding it? Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=| _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Anthony Liguori
2006-Nov-21 16:51 UTC
[Xen-devel] Re: [PATCH] add check for python-devel to tools build
Jan Beulich wrote:> Again, this must be given exec permission after applying. > > Signed-off-by: Jan Beulich <jbeulich@novell.com> > > Index: 2006-11-17/tools/check/check_python_devel > ==================================================================> --- /dev/null 1970-01-01 00:00:00.000000000 +0000 > +++ 2006-11-17/tools/check/check_python_devel 2006-11-21 12:03:08.000000000 +0100 > @@ -0,0 +1,13 @@ > +#!/bin/bash > +# CHECK-BUILD > + > +function error { > + echo > + echo " *** Check for python development environment FAILED" > + exit 1 > +} > + > +lib=lib > +test "$(uname -m)" != x86_64 || lib=lib64 > +set -e > +[ -e /usr/$lib/python/config/Makefile ] || errorThere is no /usr/lib/python/config/Makefile on Ubuntu. You should be okay if you also check for /usr/lib/python-2.[345]/config/Makefile. Regards, Anthony Liguori _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ewan Mellor
2006-Nov-21 17:06 UTC
Re: [Xen-devel] Re: [PATCH] add check for python-devel to tools build
On Tue, Nov 21, 2006 at 10:51:49AM -0600, Anthony Liguori wrote:> Jan Beulich wrote: > >Again, this must be given exec permission after applying. > > > >Signed-off-by: Jan Beulich <jbeulich@novell.com> > > > >Index: 2006-11-17/tools/check/check_python_devel > >==================================================================> >--- /dev/null 1970-01-01 00:00:00.000000000 +0000 > >+++ 2006-11-17/tools/check/check_python_devel 2006-11-21 > >12:03:08.000000000 +0100 > >@@ -0,0 +1,13 @@ > >+#!/bin/bash > >+# CHECK-BUILD > >+ > >+function error { > >+ echo > >+ echo " *** Check for python development environment FAILED" > >+ exit 1 > >+} > >+ > >+lib=lib > >+test "$(uname -m)" != x86_64 || lib=lib64 > >+set -e > >+[ -e /usr/$lib/python/config/Makefile ] || error > > There is no /usr/lib/python/config/Makefile on Ubuntu. You should be > okay if you also check for /usr/lib/python-2.[345]/config/Makefile.My Debian box has /usr/lib/python2.3. How about /usr/lib/python*/config/Makefile? That should be OK, and has the advantage of including /usr/lib/python. Ewan. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Daniel P. Berrange
2006-Nov-21 17:10 UTC
Re: [Xen-devel] Re: [PATCH] add check for python-devel to tools build
On Tue, Nov 21, 2006 at 05:06:49PM +0000, Ewan Mellor wrote:> On Tue, Nov 21, 2006 at 10:51:49AM -0600, Anthony Liguori wrote: > > > Jan Beulich wrote: > > >Again, this must be given exec permission after applying. > > > > > >Signed-off-by: Jan Beulich <jbeulich@novell.com> > > > > > >Index: 2006-11-17/tools/check/check_python_devel > > >==================================================================> > >--- /dev/null 1970-01-01 00:00:00.000000000 +0000 > > >+++ 2006-11-17/tools/check/check_python_devel 2006-11-21 > > >12:03:08.000000000 +0100 > > >@@ -0,0 +1,13 @@ > > >+#!/bin/bash > > >+# CHECK-BUILD > > >+ > > >+function error { > > >+ echo > > >+ echo " *** Check for python development environment FAILED" > > >+ exit 1 > > >+} > > >+ > > >+lib=lib > > >+test "$(uname -m)" != x86_64 || lib=lib64 > > >+set -e > > >+[ -e /usr/$lib/python/config/Makefile ] || error > > > > There is no /usr/lib/python/config/Makefile on Ubuntu. You should be > > okay if you also check for /usr/lib/python-2.[345]/config/Makefile. > > My Debian box has /usr/lib/python2.3. How about > /usr/lib/python*/config/Makefile? That should be OK, and has the advantage of > including /usr/lib/python.Using wildcards though will not be reliable. eg I have both python 2.3 and 2.4 installed, but python 2.4 is the version I''m deploying Xen against. This test won''t catch the case where I have python-devel = 2.3, but don''t have the python-devel == 2.4 installed. We want to make sure we only check against the version we''re actually building against. Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=| _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ewan Mellor
2006-Nov-21 17:23 UTC
Re: [Xen-devel] Re: [PATCH] add check for python-devel to tools build
On Tue, Nov 21, 2006 at 05:10:43PM +0000, Daniel P. Berrange wrote:> On Tue, Nov 21, 2006 at 05:06:49PM +0000, Ewan Mellor wrote: > > On Tue, Nov 21, 2006 at 10:51:49AM -0600, Anthony Liguori wrote: > > > > > Jan Beulich wrote: > > > >Again, this must be given exec permission after applying. > > > > > > > >Signed-off-by: Jan Beulich <jbeulich@novell.com> > > > > > > > >Index: 2006-11-17/tools/check/check_python_devel > > > >==================================================================> > > >--- /dev/null 1970-01-01 00:00:00.000000000 +0000 > > > >+++ 2006-11-17/tools/check/check_python_devel 2006-11-21 > > > >12:03:08.000000000 +0100 > > > >@@ -0,0 +1,13 @@ > > > >+#!/bin/bash > > > >+# CHECK-BUILD > > > >+ > > > >+function error { > > > >+ echo > > > >+ echo " *** Check for python development environment FAILED" > > > >+ exit 1 > > > >+} > > > >+ > > > >+lib=lib > > > >+test "$(uname -m)" != x86_64 || lib=lib64 > > > >+set -e > > > >+[ -e /usr/$lib/python/config/Makefile ] || error > > > > > > There is no /usr/lib/python/config/Makefile on Ubuntu. You should be > > > okay if you also check for /usr/lib/python-2.[345]/config/Makefile. > > > > My Debian box has /usr/lib/python2.3. How about > > /usr/lib/python*/config/Makefile? That should be OK, and has the advantage of > > including /usr/lib/python. > > Using wildcards though will not be reliable. eg I have both python 2.3 and 2.4 > installed, but python 2.4 is the version I''m deploying Xen against. This test > won''t catch the case where I have python-devel = 2.3, but don''t have the > python-devel == 2.4 installed. We want to make sure we only check against the > version we''re actually building against.python -c '' import os.path, sys for p in sys.path: if os.path.exists(p + "/config/Makefile"): sys.exit(0) sys.exit(1) '' Ewan. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jan Beulich
2006-Nov-22 08:10 UTC
Re: [Xen-devel] Re: [PATCH] add check for python-devel to tools build
Keir - will you integrate this, or should I re-post a patch?>>> Ewan Mellor <ewan@xensource.com> 21.11.06 18:23 >>>On Tue, Nov 21, 2006 at 05:10:43PM +0000, Daniel P. Berrange wrote:> On Tue, Nov 21, 2006 at 05:06:49PM +0000, Ewan Mellor wrote: > > On Tue, Nov 21, 2006 at 10:51:49AM -0600, Anthony Liguori wrote: > > > > > Jan Beulich wrote: > > > >Again, this must be given exec permission after applying. > > > > > > > >Signed-off-by: Jan Beulich <jbeulich@novell.com> > > > > > > > >Index: 2006-11-17/tools/check/check_python_devel > > > >==================================================================> > > >--- /dev/null 1970-01-01 00:00:00.000000000 +0000 > > > >+++ 2006-11-17/tools/check/check_python_devel 2006-11-21 > > > >12:03:08.000000000 +0100 > > > >@@ -0,0 +1,13 @@ > > > >+#!/bin/bash > > > >+# CHECK-BUILD > > > >+ > > > >+function error { > > > >+ echo > > > >+ echo " *** Check for python development environment FAILED" > > > >+ exit 1 > > > >+} > > > >+ > > > >+lib=lib > > > >+test "$(uname -m)" != x86_64 || lib=lib64 > > > >+set -e > > > >+[ -e /usr/$lib/python/config/Makefile ] || error > > > > > > There is no /usr/lib/python/config/Makefile on Ubuntu. You should be > > > okay if you also check for /usr/lib/python-2.[345]/config/Makefile. > > > > My Debian box has /usr/lib/python2.3. How about > > /usr/lib/python*/config/Makefile? That should be OK, and has the advantage of > > including /usr/lib/python. > > Using wildcards though will not be reliable. eg I have both python 2.3 and 2.4 > installed, but python 2.4 is the version I''m deploying Xen against. This test > won''t catch the case where I have python-devel = 2.3, but don''t have the > python-devel == 2.4 installed. We want to make sure we only check against the > version we''re actually building against.python -c '' import os.path, sys for p in sys.path: if os.path.exists(p + "/config/Makefile"): sys.exit(0) sys.exit(1) '' Ewan. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2006-Nov-22 09:20 UTC
Re: [Xen-devel] Re: [PATCH] add check for python-devel to tools build
Please re-post. On 22/11/06 08:10, "Jan Beulich" <jbeulich@novell.com> wrote:> Keir - will you integrate this, or should I re-post a patch? > >>>> Ewan Mellor <ewan@xensource.com> 21.11.06 18:23 >>> > On Tue, Nov 21, 2006 at 05:10:43PM +0000, Daniel P. Berrange wrote: > >> On Tue, Nov 21, 2006 at 05:06:49PM +0000, Ewan Mellor wrote: >>> On Tue, Nov 21, 2006 at 10:51:49AM -0600, Anthony Liguori wrote: >>> >>>> Jan Beulich wrote: >>>>> Again, this must be given exec permission after applying. >>>>> >>>>> Signed-off-by: Jan Beulich <jbeulich@novell.com> >>>>> >>>>> Index: 2006-11-17/tools/check/check_python_devel >>>>> ==================================================================>>>>> --- /dev/null 1970-01-01 00:00:00.000000000 +0000 >>>>> +++ 2006-11-17/tools/check/check_python_devel 2006-11-21 >>>>> 12:03:08.000000000 +0100 >>>>> @@ -0,0 +1,13 @@ >>>>> +#!/bin/bash >>>>> +# CHECK-BUILD >>>>> + >>>>> +function error { >>>>> + echo >>>>> + echo " *** Check for python development environment FAILED" >>>>> + exit 1 >>>>> +} >>>>> + >>>>> +lib=lib >>>>> +test "$(uname -m)" != x86_64 || lib=lib64 >>>>> +set -e >>>>> +[ -e /usr/$lib/python/config/Makefile ] || error >>>> >>>> There is no /usr/lib/python/config/Makefile on Ubuntu. You should be >>>> okay if you also check for /usr/lib/python-2.[345]/config/Makefile. >>> >>> My Debian box has /usr/lib/python2.3. How about >>> /usr/lib/python*/config/Makefile? That should be OK, and has the advantage >>> of >>> including /usr/lib/python. >> >> Using wildcards though will not be reliable. eg I have both python 2.3 and >> 2.4 >> installed, but python 2.4 is the version I''m deploying Xen against. This test >> won''t catch the case where I have python-devel = 2.3, but don''t have the >> python-devel == 2.4 installed. We want to make sure we only check against the >> version we''re actually building against. > > python -c '' > import os.path, sys > for p in sys.path: > if os.path.exists(p + "/config/Makefile"): > sys.exit(0) > sys.exit(1) > '' > > Ewan._______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel