file: Update to 5.18.

[people/ms/ipfire-3.x.git] / xen / xen.nm

diff --git a/xen/xen.nm b/xen/xen.nm
index f0a8e3992bd1fd64fdbc588a6d7b1e1c29965c57..0ef8178613aa8277695e1fac019f87353372e7c2 100644 (file)
--- a/xen/xen.nm
+++ b/xen/xen.nm
@@ -4,8 +4,9 @@
 ###############################################################################
 
 name       = xen
-version    = 4.1.1
-release    = 4
+version    = 4.1.2
+release    = 6
+sup_arches = i686 x86_64
 
 maintainer = Ben Schweikert <ben.schweikert@ipfire.org>
 groups     = Applications/Virtualization
@@ -17,21 +18,25 @@ description
        The Xen hypervisor, the powerful open source industry standard
        for virtualization, offers a powerful, efficient, and secure
        feature set for virtualization.
+       It is possible to use a i686 host, but it is not supported.
 end
 
-source_dl  =
-sources    = %{thisapp}.tar.gz
+source_dl  = http://bits.xensource.com/oss-xen/release/%{version}/
+sources    = %{thisapp}.tar.gz xen-utils-0.2.tar.bz2
 
 build
        requires
-               gettext-devel
-               kernel-headers
+               chrpath
+               dev86
+               gettext
+               iasl
                libuuid-devel
                ncurses-devel
                openssl-devel
-               python
+               pciutils-devel
+               perl
                python-devel
-               sdl-devel
+               SDL-devel
                texinfo
                xorg-x11-proto-devel
                wget
@@ -39,23 +44,57 @@ build
        end
 
        prepare_cmds
-               # Following two lines are disabling HVM. HVM does not work because \
-               # of some PIE errors we get when we try to build the firmware part \
-               # needed for different architektures.
-               sed -i -e '/^CONFIG_IOEMU := y$/d' config/*.mk
-               sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' tools/Makefile
-
+               mv ../xen-utils/ipxe.tar.gz tools/firmware/etherboot/
+               mv ../xen-utils/newlib-1.16.0.tar.gz stubdom/
+               mv ../xen-utils/grub-0.97.tar.gz stubdom/
+               mv ../xen-utils/lwip-1.3.0.tar.gz stubdom/
+               mv ../xen-utils/pciutils-2.2.9.tar.bz2 stubdom/
+               mv ../xen-utils/zlib-1.2.3.tar.gz stubdom/
                rm -f Config.mk~
+
+               if [ "${DISTRO_ARCH}" = "x86_64" ]; then
+                       # Dirty ugly workaround for stub-32.h error (is missing).
+                       ln -s /usr/include/gnu/stubs-64.h /usr/include/gnu/stubs-32.h
+               fi
        end
 
-       make_build_targets += \
-               xen tools
+       build
+               # Have to build it this way, else parts of the xen stubdom \
+               # would get build too.
+               make dist-xen %{PARALLELISMFLAGS}
+               make dist-tools %{PARALLELISMFLAGS}
+       end
 
-       make_install_targets +=\
-               xen install-tools
+       # Only install xen and tools
+       make_install_targets = \
+               DESTDIR=%{BUILDROOT} \
+               prefix=/usr \
+               install-xen \
+               install-tools
 
        install_cmds
-               rm -R %{BUILDROOT}/etc/init.d
+               # Remove unneeded files:
+               # hypervisor symlinks
+               rm -Rf %{BUILDROOT}/boot/xen-syms*
+               rm -Rf %{BUILDROOT}/boot/xen-4.1.gz
+               rm -Rf %{BUILDROOT}/boot/xen-4.gz
+               # init.d file
+               rm -Rf %{BUILDROOT}/etc/init.d
+               chrpath --delete %{BUILDROOT}/usr/lib/xen/bin/qemu-dm
+               # silly doc dir fun             
+               rm -Rf %{BUILDROOT}/usr/share/doc/xen
+               rm -Rf %{BUILDROOT}/usr/share/doc/qemu
+               # Pointless helper
+               rm -Rf %{BUILDROOT}/usr/sbin/xen-python-path
+               # qemu stuff (unused or available from upstream)
+               rm -Rf %{BUILDROOT}/usr/share/xen/man
+
+               # create dirs in /var
+               mkdir -p %{BUILDROOT}/var/lib/xen/xend-db/domain
+               mkdir -p %{BUILDROOT}/var/lib/xen/xend-db/vnet
+               mkdir -p %{BUILDROOT}/var/lib/xen/xend-db/migrate
+               mkdir -p %{BUILDROOT}/var/lib/xen/images
+               mkdir -p %{BUILDROOT}/var/log/xen/console
        end
 end
 
@@ -76,7 +115,7 @@ packages
                        run applications which manage Xen virtual machines
                end
 
-               files += /usr/lib/fs
+               files += %{libdir}/fs
        end
 
        package %{name}-hypervisor
@@ -99,6 +138,7 @@ packages
 
                files
                        /usr/bin/*
+                       /usr/sbin/*
                end
        end
 
@@ -110,4 +150,10 @@ packages
                        develop applications which manage Xen virtual machines.
                end
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end
+
+