From: Guru Anbalagane <guru.anbalagane@oracle.com>
Date: Thu, 29 Sep 2011 00:19:02 +0000 (-0700)
Subject: SPEC: v2.6.39-100.0.11
X-Git-Tag: v2.6.39-400.9.0~878
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=637158c439a1c35bf33ff98bb3da2f628b0e5bc3;p=users%2Fjedix%2Flinux-maple.git

SPEC: v2.6.39-100.0.11

Signed-off-by: Guru Anbalagane <guru.anbalagane@oracle.com>
---

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index c88340ec3f4d2..6dca7fd0f4f74 100644
--- a/uek-rpm/ol5/kernel-uek.spec
+++ b/uek-rpm/ol5/kernel-uek.spec
@@ -192,7 +192,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{rhel}
-%define pkg_release %{distro_build}.0.10%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.11%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -638,6 +638,8 @@ glibc package.
 %package firmware
 Summary: Firmware files used by the Linux kernel
 Group: Development/System
+Obsoletes: kernel-firmware
+Obsoletes: kernel-uek-firmware < 2.6.39
 # This is... complicated.
 # Look at the WHENCE file.
 License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -1697,6 +1699,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep 28 2011 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-100.0.11.el5uek]
+- xen:  Add  bootmem.h in xen-selfballoon.c
+
 * Wed Sep 28 2011 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-100.0.10.el5uek]
 - mpt2sas: Add a module parameter that permits overriding protection capabilities
 - mpt2sas: Return the correct sense key for DIF errors
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 21cd76a32863e..37012143bb1ce 100644
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -105,7 +105,7 @@ Summary: The Linux kernel
 # kernel-headers
 %define with_headers   1
 # kernel-firmware
-%define with_firmware  1
+%define with_firmware  0
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
@@ -200,7 +200,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{rhel}
-%define pkg_release %{distro_build}.0.10%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.11%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -647,6 +647,8 @@ glibc package.
 %package firmware
 Summary: Firmware files used by the Linux kernel
 Group: Development/System
+Obsoletes: kernel-firmware 
+Obsoletes: kernel-uek-firmware <  2.6.39
 # This is... complicated.
 # Look at the WHENCE file.
 License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -1710,6 +1712,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Sep 28 2011 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-100.0.11.el6uek]
+- xen:  Add  bootmem.h in xen-selfballoon.c 
+
 * Wed Sep 28 2011 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-100.0.10.el6uek]
 - mpt2sas: Add a module parameter that permits overriding protection capabilities
 - mpt2sas: Return the correct sense key for DIF errors