OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=53

2008-09-12 15:57:53 +00:00
parent 258bc46c96
commit 997dde689d
33 changed files with 5126 additions and 5313 deletions
--- a/xen.spec
+++ b/xen.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package xen (Version 3.3.0_18358_02)
+# spec file for package xen (Version 3.3.1_18390_01)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,8 +21,8 @@
 Name:           xen
 %define xvers 3.3
 %define xvermaj 3
-%define changeset 18358
-%define xen_build_dir xen-3.3.0-testing
+%define changeset 18390
+%define xen_build_dir xen-3.3.1-testing
 %if %sles_version
 %define with_kmp 1
 %else
@@ -40,14 +40,14 @@ BuildRequires:  glibc-32bit glibc-devel-32bit
 %if %{?with_kmp}0
 BuildRequires:  kernel-source kernel-syms module-init-tools xorg-x11
 %endif
-Version:        3.3.0_18358_02
-Release:        2
+Version:        3.3.1_18390_01
+Release:        1
 License:        GPL v2 only
 Group:          System/Kernel
 AutoReqProv:    on
 PreReq:         %insserv_prereq %fillup_prereq
 Summary:        Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
-Source0:        xen-3.3.0-testing-src.tar.bz2
+Source0:        xen-3.3.1-testing-src.tar.bz2
 Source2:        README.SuSE
 Source3:        boot.xen
 Source4:        boot.local.xenU
@@ -66,7 +66,11 @@ Source18:       init.xen_loop
 # Xen API remote authentication sources
 Source23:       etc_pam.d_xen-api
 Source24:       xenapiusers
+# sysconfig hook script for Xen
+Source25:       xen-updown.sh
 # Upstream patches
+Patch0:         18412-x86-page-type-preemptible.patch
+Patch1:         18420-x86-page-type-preemptible-fix.patch
 # Our patches
 Patch100:       xen-config.diff
 Patch101:       xend-config.diff
@@ -111,6 +115,7 @@ Patch156:       blktap.patch
 Patch157:       xen-api-auth.patch
 Patch158:       xen-qemu-iscsi-fix.patch
 Patch159:       xend-vif-fix.patch
+Patch160:       tools-gdbserver-build.diff
 # Patches for snapshot support
 Patch170:       qemu-img-snapshot.patch
 Patch171:       ioemu-blktap-fix-open.patch
@@ -126,18 +131,22 @@ Patch184:       ioemu-blktap-barriers.patch
 # Jim's domain lock patch
 Patch190:       xend-domain-lock.patch
 # Patches from Jan
-Patch240:       x86-show-page-walk-early.patch
-Patch241:       svm-lmsl.patch
-Patch242:       x86-extra-trap-info.patch
+Patch240:       poll-single-port.patch
+Patch241:       dump-exec-state.patch
+Patch242:       x86-show-page-walk-early.patch
+Patch243:       svm-lmsl.patch
+Patch244:       x86-extra-trap-info.patch
+Patch245:       x86-microcode.patch
 Patch250:       32on64-extra-mem.patch
 # PV Driver Patches
 Patch350:       pv-driver-build.patch
 Patch351:       xen-ioemu-hvm-pv-support.diff
 Patch352:       pvdrv_emulation_control.patch
+Patch353:       blktap-pv-cdrom.patch
 # novell_shim patches
-Patch400:       ns_tools.patch
-Patch401:       ns_xen_base.patch
-Patch402:       ns_xen_extension.patch
+Patch400:       hv_tools.patch
+Patch401:       hv_xen_base.patch
+Patch402:       hv_xen_extension.patch
 Url:            http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
@@ -469,6 +478,8 @@ Authors:

 %prep
 %setup -q -n %xen_build_dir
+%patch0 -p1
+%patch1 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -512,6 +523,7 @@ Authors:
 %patch157 -p1
 %patch158 -p1
 %patch159 -p1
+%patch160 -p1
 %patch170 -p1
 %patch171 -p1
 %patch172 -p1
@@ -527,16 +539,20 @@ Authors:
 %patch240 -p1
 %patch241 -p1
 %patch242 -p1
+%patch243 -p1
+%patch244 -p1
+%patch245 -p1
 %patch250 -p1
 %patch350 -p1
 %patch351 -p1
 %patch352 -p1
+%patch353 -p1
 # Don't use shim for now
-#%ifarch x86_64
-#%patch400 -p1
-#%patch401 -p1
-#%patch402 -p1
-#%endif
+%ifarch x86_64
+%patch400 -p1
+%patch401 -p1
+%patch402 -p1
+%endif

 %build
 XEN_EXTRAVERSION=%version-%release
@@ -548,6 +564,10 @@ export CFLAGS="${RPM_OPT_FLAGS}"
 export RPM_OPT_FLAGS
 make -C tools/include/xen-foreign
 make tools docs
+cd tools/debugger/gdb
+# there are code problems that don't pass the 02-check-gcc-output, hence bitbucket
+./gdbbuild 1>/dev/null 2>/dev/null
+cd ../../..
 %if %{?with_kmp}0
 # pv driver modules
 export XL=/usr/src/linux
@@ -610,6 +630,7 @@ make -C tools/include/xen-foreign
 export XEN_PYTHON_NATIVE_INSTALL=1
 make -C tools install \
    DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
+cp tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/gdb/gdbserver/gdbserver-xen $RPM_BUILD_ROOT/usr/bin/gdbserver-xen
 make -C tools/misc/serial-split install \
    DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
 %ifarch x86_64
@@ -656,6 +677,13 @@ install -m755 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE16 %SOURCE17 $RPM_BUILD_ROOT/
 install -d $RPM_BUILD_ROOT/etc/pam.d
 install -m644 %SOURCE23 $RPM_BUILD_ROOT/etc/pam.d/xen-api
 install -m644 %SOURCE24 $RPM_BUILD_ROOT/etc/xen/
+# sysconfig hook for Xen
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/network/scripts
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/network/if-up.d
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/network/if-down.d
+install -m755 %SOURCE25 $RPM_BUILD_ROOT/etc/sysconfig/network/scripts
+ln -s /etc/sysconfig/network/scripts/xen-updown.sh $RPM_BUILD_ROOT/etc/sysconfig/network/if-up.d/xen
+ln -s /etc/sysconfig/network/scripts/xen-updown.sh $RPM_BUILD_ROOT/etc/sysconfig/network/if-down.d/xen
 # logrotate
 install -m644 -D %SOURCE7 $RPM_BUILD_ROOT/etc/logrotate.d/xen
 # directories
@@ -722,6 +750,7 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 /usr/bin/pygrub
 /usr/bin/qemu-img-xen
 /usr/bin/tapdisk-ioemu
+/usr/bin/gdbserver-xen
 /usr/sbin/blktapctrl
 /usr/sbin/flask-loadpolicy
 /usr/sbin/img2qcow
@@ -783,6 +812,9 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 %dir /etc/udev
 %dir /etc/udev/rules.d
 /etc/udev/rules.d/40-xen.rules
+/etc/sysconfig/network/scripts/xen-updown.sh
+/etc/sysconfig/network/if-up.d/xen
+/etc/sysconfig/network/if-down.d/xen
 %dir %{_defaultdocdir}/xen
 %{_defaultdocdir}/xen/COPYING
 %{_defaultdocdir}/xen/README.SuSE
@@ -865,6 +897,25 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 /sbin/ldconfig

 %changelog
+* Thu Sep 11 2008 brogers@novell.com
+- Added gdbserver-xen to the set of tools we build.
+  fate#302942
+* Thu Sep 11 2008 jfehlig@novell.com
+- Added ocfs2 to Should-Start in xendomains init script
+* Wed Sep 10 2008 plc@novell.com
+- Added pv cdrom support to blktap
+  fate#300964
+* Wed Sep 10 2008 jfehlig@novell.com
+- Removed invocation of network-bridge script from xend-config.sxp.
+  Networks are now created through yast2-network package.
+- Added sysconfig hook script for Xen to cope with ifup/ifdown
+  events on network devices (e.g. bridges) in use by virtual
+  machines.
+  fate#303386
+* Mon Sep 08 2008 carnold@novell.com
+- Updated to xen version 3.3.1 RC changeset 18390.
+* Wed Sep 03 2008 kwolf@suse.de
+- Snapshots: Fix xend API functions for libvirt usage
 * Mon Sep 01 2008 carnold@novell.com
 - Fix problems building KMPs against the 2.6.27 kernel.
 * Fri Aug 29 2008 plc@novell.com