xen: update to 4.1.1, broken until gcc-multilib is available...
This commit is contained in:
parent
d93b82da90
commit
769a2eed38
4 changed files with 11 additions and 63 deletions
|
@ -1,13 +0,0 @@
|
||||||
Pass library list to link in the correct place to avoid missing symbols.
|
|
||||||
|
|
||||||
--- tools/libxc/Makefile.orig 2011-01-10 11:13:56.365905921 +0100
|
|
||||||
+++ tools/libxc/Makefile 2011-01-10 11:14:12.261224745 +0100
|
|
||||||
@@ -174,7 +174,7 @@ xc_dom_bzimageloader.opic: CFLAGS += $(c
|
|
||||||
|
|
||||||
libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
|
|
||||||
libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
|
|
||||||
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
|
|
||||||
+ $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) $(LDFLAGS)
|
|
||||||
|
|
||||||
-include $(DEPS)
|
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
Fixes python-2.7, from http://www.gossamer-threads.com/lists/xen/devel/182210
|
|
||||||
|
|
||||||
--- tools/python/xen/util/xmlrpcclient.py.orig 2010-02-02 20:43:01.000000000 +0000
|
|
||||||
+++ tools/python/xen/util/xmlrpcclient.py 2010-08-18 21:36:05.000000000 +0100
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
import string
|
|
||||||
import xmlrpclib
|
|
||||||
from types import StringTypes
|
|
||||||
+from sys import hexversion
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
@@ -54,7 +55,12 @@
|
|
||||||
return xmlrpclib.Transport.request(self, host, '/RPC2',
|
|
||||||
request_body, verbose)
|
|
||||||
def make_connection(self, host):
|
|
||||||
- return HTTPUnix(self.__handler)
|
|
||||||
+ if hexversion < 0x02070000:
|
|
||||||
+ # python 2.6 or earlier
|
|
||||||
+ return HTTPUnix(self.__handler)
|
|
||||||
+ else:
|
|
||||||
+ # xmlrpclib.Transport changed in python 2.7
|
|
||||||
+ return HTTPUnixConnection(self.__handler)
|
|
||||||
|
|
||||||
|
|
||||||
# We need our own transport for HTTPS, because xmlrpclib.SafeTransport is
|
|
||||||
--- tools/python/xen/util/xmlrpclib2.py.orig 2010-02-02 20:43:01.000000000 +0000
|
|
||||||
+++ tools/python/xen/util/xmlrpclib2.py 2010-08-18 21:35:40.000000000 +0100
|
|
||||||
@@ -58,6 +58,9 @@
|
|
||||||
# some bugs in Keep-Alive handling and also enabled it by default
|
|
||||||
class XMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
|
|
||||||
protocol_version = "HTTP/1.1"
|
|
||||||
+ # xend crashes in python 2.7 unless disable_nagle_algorithm = False
|
|
||||||
+ # it isn't used in earlier versions so it is harmless to set it generally
|
|
||||||
+ disable_nagle_algorithm = False
|
|
||||||
|
|
||||||
def __init__(self, hosts_allowed, request, client_address, server):
|
|
||||||
self.hosts_allowed = hosts_allowed
|
|
|
@ -1,13 +1,14 @@
|
||||||
# Template file for 'xen'
|
# Template file for 'xen'
|
||||||
pkgname=xen
|
pkgname=xen
|
||||||
version=4.0.1
|
version=4.1.1
|
||||||
revision=2
|
|
||||||
wrksrc=xen-${version}
|
wrksrc=xen-${version}
|
||||||
distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
|
distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
|
||||||
build_style=custom-install
|
build_style=custom-install
|
||||||
short_desc="Xen Hypervisor and Utilities"
|
short_desc="Xen Hypervisor and Utilities"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
checksum=6e6d1d29400db93cb8095e034138aa8748b1bd4cffb4d3fd07af4ba15c918873
|
homepage="http://xen.org"
|
||||||
|
license="GPL-2"
|
||||||
|
checksum=246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
|
||||||
long_desc="
|
long_desc="
|
||||||
This package provides the official Xen Hypervisor and related utilities
|
This package provides the official Xen Hypervisor and related utilities
|
||||||
for starting/stopping/accessing unprivileged domains (domUs)."
|
for starting/stopping/accessing unprivileged domains (domUs)."
|
||||||
|
@ -37,7 +38,11 @@ Add_dependency run libXext
|
||||||
Add_dependency run MesaLib
|
Add_dependency run MesaLib
|
||||||
Add_dependency run ncurses-libs
|
Add_dependency run ncurses-libs
|
||||||
Add_dependency run libgcrypt
|
Add_dependency run libgcrypt
|
||||||
|
Add_dependency run iproute2 # Requires ip
|
||||||
|
Add_dependency run bridge-utils # Required brctl
|
||||||
|
|
||||||
|
Add_dependency build gettext
|
||||||
|
Add_dependency build openssl-devel
|
||||||
Add_dependency build e2fsprogs-devel
|
Add_dependency build e2fsprogs-devel
|
||||||
Add_dependency build bzip2-devel
|
Add_dependency build bzip2-devel
|
||||||
Add_dependency build zlib-devel
|
Add_dependency build zlib-devel
|
||||||
|
@ -56,9 +61,6 @@ Add_dependency build dev86
|
||||||
Add_dependency build acpica-utils
|
Add_dependency build acpica-utils
|
||||||
|
|
||||||
Add_dependency full python
|
Add_dependency full python
|
||||||
Add_dependency full net-tools # Requires ifconfig
|
|
||||||
Add_dependency full iproute2 # Requires ip
|
|
||||||
Add_dependency full bridge-utils # Required brctl
|
|
||||||
|
|
||||||
do_build()
|
do_build()
|
||||||
{
|
{
|
||||||
|
@ -82,7 +84,7 @@ do_install()
|
||||||
|
|
||||||
# Remove upstream xend and use our own.
|
# Remove upstream xend and use our own.
|
||||||
rm -f ${DESTDIR}/etc/init.d/xend
|
rm -f ${DESTDIR}/etc/init.d/xend
|
||||||
install -m755 ${FILESDIR}/xend.rc ${DESTDIR}/etc/init.d/xend
|
vinstall ${FILESDIR}/xend.rc 755 etc/init.d xend
|
||||||
|
|
||||||
# Remove unneeded stuff.
|
# Remove unneeded stuff.
|
||||||
rm -f ${DESTDIR}/install ${DESTDIR}/usr/lib64
|
rm -f ${DESTDIR}/install ${DESTDIR}/usr/lib64
|
||||||
|
|
|
@ -5,8 +5,6 @@ long_desc="${long_desc}
|
||||||
|
|
||||||
This package contains files for development, headers, static libs, etc."
|
This package contains files for development, headers, static libs, etc."
|
||||||
|
|
||||||
revision=2
|
|
||||||
|
|
||||||
Add_dependency run python-devel
|
Add_dependency run python-devel
|
||||||
Add_dependency run e2fsprogs-devel
|
Add_dependency run e2fsprogs-devel
|
||||||
Add_dependency run bzip2-devel
|
Add_dependency run bzip2-devel
|
||||||
|
@ -25,7 +23,6 @@ Add_dependency run xen
|
||||||
|
|
||||||
do_install()
|
do_install()
|
||||||
{
|
{
|
||||||
mkdir -p ${DESTDIR}/usr/lib
|
vmove usr/include usr
|
||||||
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
|
vmove "usr/lib/lib*.*a" usr/lib
|
||||||
mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue