xen: Update to 4.0.1.

Squashed commit of the following:

commit 922154fc149bfef6e018ae4afc758e6c5f28f213
Author: Ben Schweikert <trikolon@ipfire.org>
Date:   Fri Oct 1 18:01:30 2010 +0200

    libvirt: added xen support.

commit 108f274f424528c413a88aa570725e4c8da90211
Author: Ben Schweikert <trikolon@ipfire.org>
Date:   Fri Oct 1 17:52:00 2010 +0200

    Xen: Added spaces and adjusted length of comments.

commit 7ff3e02a090dfb3534e13081564a985cad41329c
Author: Ben Schweikert <trikolon@ipfire.org>
Date:   Fri Oct 1 17:46:42 2010 +0200

    Forgot to sort deps.

commit 676b494d5fe7435a1717bd8f7582701f32df6b68
Author: Ben Schweikert <trikolon@ipfire.org>
Date:   Fri Oct 1 17:40:12 2010 +0200

    Seperated Xen and Xen-tools to devel, hypervisor, libs, runtime for
    better modularity.

commit 542cfcf431bf6dcc70ca3d6abfe5aa01f061748b
Author: Ben Schweikert <trikolon@ipfire.org>
Date:   Wed Sep 29 14:36:24 2010 +0200

    Updated Xen to version 4.0.1 and added the xen tools.

diff --git a/pkgs/core/libvirt/libvirt.nm b/pkgs/core/libvirt/libvirt.nm
index 6ce4878543dccea91ab305af1f9eebe44e8e6c41..b4196f424a44537e13d20a93d1cc49067d0e12e2 100644 (file)
--- a/pkgs/core/libvirt/libvirt.nm
+++ b/pkgs/core/libvirt/libvirt.nm
@@ -36,7 +36,7 @@ PKG_SUMMARY    = A library for controlling VMs.
 
 PKG_BUILD_DEPS+= avahi-devel libcurl-devel cyrus-sasl-devel gnutls-devel \
        libpciaccess-devel libssh2-devel libtool libxml2-devel lvm2 parted-devel \
-       pkg-config readline-devel libudev-devel
+       pkg-config readline-devel libudev-devel xen-tools
 PKG_DEPS      += lvm2
 
 define PKG_DESCRIPTION
@@ -57,7 +57,7 @@ CONFIGURE_OPTIONS += \
        --without-polkit \
        --without-uml \
        --without-vbox \
-       --without-xen \
+       --with-xen \
        --with-storage-fs \
        --with-storage-lvm \
        --with-storage-mpath \

diff --git a/pkgs/core/xen/patches/xen-tools.patch b/pkgs/core/xen/patches/xen-tools.patch
new file mode 100644 (file)
index 0000000..1df3803
--- /dev/null
+++ b/pkgs/core/xen/patches/xen-tools.patch
@@ -0,0 +1,11 @@
+--- xen-4.0.1/tools/Rules.mk      2010-09-26 19:28:02.748059404 +0000
++++ xen-4.0.1/tools/Rules.mk      2010-09-26 19:25:30.769293405 +0000
+@@ -15,6 +15,7 @@ XEN_XENSTORE       = $(XEN_ROOT)/tools/x
+ XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
+
+ CFLAGS_include = -I$(XEN_INCLUDE)
++CFLAGS-y               += -fno-pie -fno-stack-protector
+
+ CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include)
+ LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl
+

diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm
index 3b941d9ffe1f719cabf80d1b1d2154c0875ec5b8..bcc8630314d121a0829429774312c90676b84972 100644 (file)
--- a/pkgs/core/xen/xen.nm
+++ b/pkgs/core/xen/xen.nm
@@ -25,33 +25,65 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = xen
-PKG_VER        = 3.4.0-2
+PKG_VER        = 4.0.1
 PKG_REL        = 0
 
 PKG_MAINTAINER = Ben Schweikert <ben.schweikert@ipfire.org>
 PKG_GROUP      = Applications/Virtualization
 PKG_URL        = http://www.xen.org/
 PKG_LICENSE    = GPLv2+
-PKG_SUMMARY    = The Xen hypervisor.
+PKG_SUMMARY    = The Xen tools.
 
 define PKG_DESCRIPTION
-       The Xen hypervisor, the powerful open source industry standard \
-       for virtualization, offers a powerful, efficient, and secure \
-       feature set for virtualization.
+       The Xen hypervisor, the powerful open source industry standard \
+       for virtualization, offers a powerful, efficient, and secure \
+       feature set for virtualization.
 endef
 
+PKG_BUILD_DEPS+=gettext-deve openssl-devel python python-devel sdl-devel \
+       util-linux-ng-devel xorg-x11-proto-devel zlib zlib-devel
+
 PKG_TARBALL    = $(THISAPP).tar.gz
 
-define QUALITY_AGENT_WHITELIST_EXECSTACK
+PKG_PACKAGES  += $(PKG_NAME)-devel $(PKG_NAME)-libs $(PKG_NAME)-hypervisor \
+       $(PKG_NAME)-runtime
+
+PKG_SUMMARY-$(PKG_NAME)-hypervisor = This package contains the Xen hypervisor
+PKG_SUMMARY-$(PKG_NAME)-devel = This package contains what's needed to \
+       develop applications which manage Xen virtual machines.
+PKG_SUMMARY-$(PKG_NAME)-libs = This package contains the libraries needed to \
+       run applications which manage Xen virtual machines
+PKG_SUMMARY-$(PKG_NAME)-runtime = This package contains the runtime programs \
+       and daemons which form the core Xen userspace environment.
+
+define PKG_FILES-$(PKG_NAME)-hypervisor
        /boot/*
 endef
 
-DIR_APP = $(DIR_SRC)/$(PKG_NAME)-3.4.0
+define PKG_FILES-$(PKG_NAME)-runtime
+       /usr/bin/*
+endef
+
+define PKG_FILES-$(PKG_NAME)-libs
+        /usr/lib/*
+endef
+
+define QUALITY_AGENT_WHITELIST_EXECSTACK
+       /boot/*
+endef
 
 define STAGE_BUILD
-       cd $(DIR_APP) && make xen $(PARALLELISMFLAGS)
+       ldconfig
+       # Following two lines are disabling HVM. HVM does not work because \
+       # of soem PIE errors we get when we try to build the firmware part \
+       # needed for different architektures.
+       cd $(DIR_APP) && sed -i -e '/^CONFIG_IOEMU := y$$/d' config/*.mk
+       cd $(DIR_APP) && sed -i -e '/SUBDIRS-$$(CONFIG_X86) += firmware/d' tools/Makefile
+
+       cd $(DIR_APP) && make tools xen $(PARALLELISMFLAGS)
 endef
 
 define STAGE_INSTALL
-       cd $(DIR_APP) && make install-xen DESTDIR=$(BUILDROOT)
+       cd $(DIR_APP) && make install-tools install-xen DESTDIR=$(BUILDROOT)
+       rm -R $(BUILDROOT)/etc/init.d
 endef