From 4790095364524da25677808eac224a645ebaead8bb589ec7f5095ac530fed62d Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 2 Mar 2009 23:46:51 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=72

---
 kmp_filelist  |  3 +++
 xen.changes   |  7 +++++++
 xen.spec      | 22 ++++++++++++++++------
 xen_pvdrivers |  7 +++++++
 4 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 kmp_filelist
 create mode 100644 xen_pvdrivers

diff --git a/kmp_filelist b/kmp_filelist
new file mode 100644
index 0000000..3ad3337
--- /dev/null
+++ b/kmp_filelist
@@ -0,0 +1,3 @@
+%defattr (-,root,root)
+/lib/modules/%2-%1
+/etc/modprobe.d/xen_pvdrivers
diff --git a/xen.changes b/xen.changes
index 109dbfb..b9c2a91 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 27 18:32:01 MST 2009 - carnold@novell.com
+
+- bnc#480164 - Default network proposal in fully virtualized 
+  SLES 11 VM is invalid.
+  xen_pvdrivers
+
 -------------------------------------------------------------------
 Tue Feb 24 14:13:35 EST 2009 - ksrinivasan@novell.com
 
diff --git a/xen.spec b/xen.spec
index 20ae7a6..d986ad9 100644
--- a/xen.spec
+++ b/xen.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package xen (Version 3.3.1_18546_10)
+# spec file for package xen (Version 3.3.1_18546_12)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -37,7 +37,7 @@ BuildRequires:  glibc-32bit glibc-devel-32bit
 %if %{?with_kmp}0
 BuildRequires:  kernel-source kernel-syms module-init-tools xorg-x11
 %endif
-Version:        3.3.1_18546_10
+Version:        3.3.1_18546_12
 Release:        2
 License:        GPL v2 only
 Group:          System/Kernel
@@ -60,6 +60,10 @@ Source13:       block-npiv
 Source16:       xmclone.sh
 Source17:       xend-relocation.sh
 Source18:       init.xen_loop
+%if %{?with_kmp}0
+Source19:       xen_pvdrivers
+Source20:       kmp_filelist
+%endif
 # Xen API remote authentication sources
 Source23:       etc_pam.d_xen-api
 Source24:       xenapiusers
@@ -254,7 +258,7 @@ 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()")
 %if %{?with_kmp}0
-%suse_kernel_module_package -n xen um xen
+%suse_kernel_module_package -n xen um xen -f kmp_filelist
 %endif
 
 %description
@@ -850,6 +854,8 @@ for flavor in %flavors_to_build; do
     make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \
         M=$PWD/obj/$flavor
 done
+mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
+install -m644 %SOURCE19 $RPM_BUILD_ROOT/etc/modprobe.d/xen_pvdrivers
 %endif
 # docs
 make -C docs install \
@@ -1102,6 +1108,10 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 /sbin/ldconfig
 
 %changelog
+* Fri Feb 27 2009 carnold@novell.com
+- bnc#480164 - Default network proposal in fully virtualized
+  SLES 11 VM is invalid.
+  xen_pvdrivers
 * Tue Feb 24 2009 ksrinivasan@novell.com
 - bnc#470238 - SLE11 32FV guest is hanging during certification
   tests.
@@ -1280,7 +1290,7 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
   vcpus > VCPUs_max on running domain.
 * Tue Oct 21 2008 carnold@novell.com
 - Update to changeset 18455.
-* Fri Oct 17 2008 olh@suse.de
+* Thu Oct 16 2008 olh@suse.de
 - add ExclusiveArch x86 x86_64
 * Wed Oct 15 2008 jfehlig@novell.com
 - bnc#433722 - Fix handling of default bridge in qemu-ifup.
@@ -1557,7 +1567,7 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 - #298176: Do not enable NX if CPU/BIOS does not support it
 - #289569: Modify network-bridge to handle vlan
 - #297295: Fix bridge setup: stop using getcfg
-* Tue Aug 07 2007 olh@suse.de
+* Mon Aug 06 2007 olh@suse.de
 - remove inclusion of linux/compiler.h and linux/string.h
   remove ExclusiveArch and fix prep section for quilt setup *.spec
 * Thu Aug 02 2007 jfehlig@novell.com
@@ -2836,7 +2846,7 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 - tgif not needed any more.
 * Tue Mar 01 2005 garloff@suse.de
 - Include serial-split from Charles Coffing.
-* Tue Mar 01 2005 garloff@suse.de
+* Mon Feb 28 2005 garloff@suse.de
 - Update xen to latest snapshot.
 * Mon Feb 21 2005 garloff@suse.de
 - Update README.SuSE.
diff --git a/xen_pvdrivers b/xen_pvdrivers
new file mode 100644
index 0000000..7dd8c0f
--- /dev/null
+++ b/xen_pvdrivers
@@ -0,0 +1,7 @@
+# Install the paravirtualized drivers
+install libata  /sbin/modprobe xen-vbd 2>&1 |:; /sbin/modprobe --ignore-install libata
+
+install 8139cp  /sbin/modprobe xen-vnif 2>&1 |:; /sbin/modprobe --ignore-install 8139cp
+
+install 8139too  /sbin/modprobe xen-vnif 2>&1 |:; /sbin/modprobe --ignore-install 8139too
+