kernel: Update to 3.11.6.

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

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index b22f071af24bbc697ad1ce6f772b5607605f40b6..1694b8cb5769fc6c6b15dc0a9f13fab9628a4e47 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kernel
-version    = 3.10.9
-release    = 2
+version    = 3.11.6
+release    = 1
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
@@ -108,9 +108,6 @@ build
                # Build the default unified kernel.
                build_kernel_default = 1
 
-               # Build a kernel for Samsung's Exynos SoCs.
-               build_kernel_exynos = 1
-
                kernel_arch = arm
                kernel_target = zImage
        end
@@ -125,11 +122,6 @@ build
                kernels += default
        end
 
-       # Build exynos kernel.
-       if "%{build_kernel_exynos}" == "1"
-               kernels += exynos
-       end
-
        # Build legacy kernel.
        if "%{build_kernel_legacy}" == "1"
                kernels += legacy
@@ -465,6 +457,10 @@ packages
                                kernel_name = kernel
                                kernel_release = %{fullver}
 
+                               # Replace the Exynos kernel.
+                               obsoletes += kernel-exynos < %{kernel_release}
+                               conflicts += kernel-exynos < %{kernel_release}
+
                                # Replace the OMAP kernel.
                                obsoletes += kernel-omap < %{kernel_release}
                                conflicts += kernel-omap < %{kernel_release}
@@ -476,6 +472,10 @@ packages
                                kernel_name = kernel
                                kernel_release = %{fullver}
 
+                               # Replace the Exynos kernel.
+                               obsoletes += kernel-exynos-devel < %{kernel_release}
+                               conflicts += kernel-exynos-devel < %{kernel_release}
+
                                # Replace the OMAP kernel.
                                obsoletes += kernel-omap-devel < %{kernel_release}
                                conflicts += kernel-omap-devel < %{kernel_release}
@@ -498,22 +498,6 @@ packages
                end
        end
 
-       if "%{build_kernel_exynos}" == "1"
-               package kernel-exynos
-                       template KERNEL
-
-                       kernel_name = kernel-exynos
-                       kernel_release = %{fullver}.exynos
-               end
-
-               package kernel-exynos-devel
-                       template KERNELDEVEL
-
-                       kernel_name = kernel-exynos
-                       kernel_release = %{fullver}.exynos
-               end
-       end
-
        if "%{build_kernel_legacy}" == "1"
                package kernel-legacy
                        template KERNEL