From 1c9b6c79d917e0d441be685915872d092db032c5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 29 Jan 2012 11:45:15 +0100 Subject: [PATCH] kernel: Renaming kernel names. Replacing the -PAE kernel with the default kernel, and the default kernel by the -legacy kernel. See bug #10008 for more details. --- kernel/config.i686 | 38 +++++++++++++------ .../{config.i686-PAE => config.i686-legacy} | 38 ++++++------------- kernel/kernel.nm | 38 +++++++++++-------- 3 files changed, 61 insertions(+), 53 deletions(-) rename kernel/{config.i686-PAE => config.i686-legacy} (99%) diff --git a/kernel/config.i686 b/kernel/config.i686 index 0cb854c31..6344c968f 100644 --- a/kernel/config.i686 +++ b/kernel/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.1-1.ip3.i686 Kernel Configuration +# Linux/i386 3.1.1-1.ip3.i686.PAE Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -295,6 +295,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y +# CONFIG_XEN is not set # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y @@ -331,7 +332,7 @@ CONFIG_M686=y # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set CONFIG_X86_GENERIC=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_INTERNODE_CACHE_SHIFT=7 CONFIG_X86_CMPXCHG=y CONFIG_CMPXCHG_LOCAL=y CONFIG_CMPXCHG_DOUBLE=y @@ -388,28 +389,40 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=y CONFIG_X86_CPUID=y # CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set -CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_NUMA=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=3 +CONFIG_HAVE_ARCH_BOOTMEM=y +CONFIG_HAVE_ARCH_ALLOC_REMAP=y +CONFIG_ARCH_HAVE_MEMORY_PRESENT=y +CONFIG_NEED_NODE_MEMMAP_SIZE=y +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y +CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y +CONFIG_DISCONTIGMEM=y CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y CONFIG_HAVE_MEMBLOCK=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y CONFIG_MIGRATION=y -# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y @@ -451,6 +464,7 @@ CONFIG_PHYSICAL_ALIGN=0x400000 CONFIG_HOTPLUG_CPU=y # CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y # # Power management and ACPI options @@ -482,6 +496,7 @@ CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=y +# CONFIG_ACPI_NUMA is not set # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=1999 # CONFIG_ACPI_DEBUG is not set @@ -585,7 +600,6 @@ CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set # CONFIG_SCx200 is not set -# CONFIG_OLPC is not set CONFIG_AMD_NB=y CONFIG_PCCARD=m # CONFIG_PCMCIA is not set @@ -1537,6 +1551,7 @@ CONFIG_FIREWIRE_SBP2=m CONFIG_I2O=m # CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -4599,6 +4614,7 @@ CONFIG_GRKERNSEC_FLOODBURST=6 # PaX # CONFIG_ARCH_TRACK_EXEC_LIMIT=y +CONFIG_PAX_PER_CPU_PGD=y CONFIG_PAX=y # diff --git a/kernel/config.i686-PAE b/kernel/config.i686-legacy similarity index 99% rename from kernel/config.i686-PAE rename to kernel/config.i686-legacy index 6344c968f..0cb854c31 100644 --- a/kernel/config.i686-PAE +++ b/kernel/config.i686-legacy @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.1-1.ip3.i686.PAE Kernel Configuration +# Linux/i386 3.1.1-1.ip3.i686 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -295,7 +295,6 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y -# CONFIG_XEN is not set # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y @@ -332,7 +331,7 @@ CONFIG_M686=y # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set CONFIG_X86_GENERIC=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=7 +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y CONFIG_CMPXCHG_LOCAL=y CONFIG_CMPXCHG_DOUBLE=y @@ -389,40 +388,28 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=y CONFIG_X86_CPUID=y # CONFIG_NOHIGHMEM is not set -# CONFIG_HIGHMEM4G is not set -CONFIG_HIGHMEM64G=y +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -CONFIG_X86_PAE=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_NUMA=y -# CONFIG_NUMA_EMU is not set -CONFIG_NODES_SHIFT=3 -CONFIG_HAVE_ARCH_BOOTMEM=y -CONFIG_HAVE_ARCH_ALLOC_REMAP=y -CONFIG_ARCH_HAVE_MEMORY_PRESENT=y -CONFIG_NEED_NODE_MEMMAP_SIZE=y -CONFIG_ARCH_DISCONTIGMEM_ENABLE=y -CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set +CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set -CONFIG_DISCONTIGMEM_MANUAL=y +CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_DISCONTIGMEM=y +CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y CONFIG_HAVE_MEMBLOCK=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y CONFIG_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y @@ -464,7 +451,6 @@ CONFIG_PHYSICAL_ALIGN=0x400000 CONFIG_HOTPLUG_CPU=y # CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_USE_PERCPU_NUMA_NODE_ID=y # # Power management and ACPI options @@ -496,7 +482,6 @@ CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=y -# CONFIG_ACPI_NUMA is not set # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=1999 # CONFIG_ACPI_DEBUG is not set @@ -600,6 +585,7 @@ CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set # CONFIG_SCx200 is not set +# CONFIG_OLPC is not set CONFIG_AMD_NB=y CONFIG_PCCARD=m # CONFIG_PCMCIA is not set @@ -1551,7 +1537,6 @@ CONFIG_FIREWIRE_SBP2=m CONFIG_I2O=m # CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_EXT_ADAPTEC_DMA64=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -4614,7 +4599,6 @@ CONFIG_GRKERNSEC_FLOODBURST=6 # PaX # CONFIG_ARCH_TRACK_EXEC_LIMIT=y -CONFIG_PAX_PER_CPU_PGD=y CONFIG_PAX=y # diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 51efe611e..0413759bd 100644 --- 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 @@ -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 -- 2.39.2