add new kernel for OSCI-946

[packages/centos6/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index c0cd2a58d97a52c5725052beac181ce40fc61446..8fa149b61dd30e432842a81f1cff6e2b374803e5 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -19,7 +19,7 @@ Summary: The Linux kernel
 
 %define rhel 1
 %if %{rhel}
-%define distro_build 358.123.2.openstack
+%define distro_build 358.123.3.openstack
 %define signmodules 1
 %else
 # fedora_build defines which build revision of this kernel version we're
@@ -171,7 +171,7 @@ Summary: The Linux kernel
 %endif
 
 # The kernel tarball/base version
-%define kversion 2.6.32-358.123.2.openstack.el6
+%define kversion 2.6.32-358.123.3.openstack.el6
 
 %define make_target bzImage
 
@@ -309,6 +309,12 @@ Summary: The Linux kernel
 %define all_arch_configs kernel-%{version}-x86_64*.config
 %define image_install_path boot
 %define kernel_image arch/x86/boot/bzImage
+#HACK for obs
+%define with_up 1
+%define with_headers 1
+%define with_perf 1
+%define all_arch_configs kernel-%{version}-*.config
+%define with_firmware 1
 %endif
 
 %ifarch ppc64
@@ -571,7 +577,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 7Gb
 %define strip_cmd strip
 %endif
 
-Source0: linux-2.6.32-358.123.2.openstack.el6.tar.bz2
+Source0: linux-2.6.32-358.123.3.openstack.el6.tar.bz2
 
 Source1: Makefile.common
 
@@ -1741,6 +1747,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 3 2013 Andrey Korolyov <akorolev@mirantis.com> [2.6.32-358.123.3.openstack.el6]
+- [config] remove OVS dp from the kconfig and move GRE symbols to the module
+ 
 * Thu Sep 26 2013 Radomir Vrbovsky <rvrbovsk@redhat.com> [2.6.32-358.123.2.openstack.el6]
 - [net] vxlan: Avoid creating fdb entry with NULL destination (Amerigo Wang) [1009025 923915]
 - [md] dm-snapshot: fix data corruption (Mikulas Patocka) [1004252 1004233] {CVE-2013-4299}