kernel: Renaming kernel names.

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

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 51efe611ef74fd8cbd0860d0d06aae1ebe54edb4..0413759bdc62da7f166647a16a203ac5048a3c51 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.1.5
-release    = 2
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -61,10 +61,10 @@ build
 
        kernel_target = bzImage
        if "%{DISTRO_ARCH}" == "i686"
-               # Build a default and PAE-enabled kernel for the
+               # Build a default and legacy kernel for the
                # i686 architecture.
                build_kernel_default = 1
-               build_kernel_pae = 1
+               build_kernel_legacy = 1
 
                kernel_arch  = x86
                kernel_image = arch/%{kernel_arch}/boot/bzImage
@@ -103,9 +103,9 @@ build
                kernels += default
        end
 
-       # Build PAE-enabled kernel.
-       if "%{build_kernel_pae}" == "1"
-               kernels += PAE
+       # Build legacy kernel.
+       if "%{build_kernel_legacy}" == "1"
+               kernels += legacy
        end
 
        # Build ARM versatile kernel.
@@ -315,8 +315,16 @@ packages
 
                summary = The Linux kernel %{kernel_release}.
 
-               prerequires = dracut grubby module-init-tools
-               provides = kernel=%{kernel_release}
+               prerequires
+                       dracut
+                       grubby
+                       module-init-tools
+               end
+
+               provides
+                       kernel=%{kernel_release}
+               end
+
                requires
                        %{prerequires}
                        linux-firmware
@@ -394,19 +402,19 @@ packages
                end
        end
 
-       if "%{build_kernel_pae}" == "1"
-               package kernel-PAE
+       if "%{build_kernel_legacy}" == "1"
+               package kernel-legacy
                        template KERNEL
 
-                       kernel_name = kernel-PAE
-                       kernel_release = %{fullver}.PAE
+                       kernel_name = kernel-legacy
+                       kernel_release = %{fullver}.legacy
                end
 
-               package kernel-PAE-devel
+               package kernel-legacy-devel
                        template KERNELDEVEL
 
-                       kernel_name = kernel-PAE
-                       kernel_release = %{fullver}.PAE
+                       kernel_name = kernel-legacy
+                       kernel_release = %{fullver}.legacy
                end
        end