From 1dae74fd4c7d9a4bf3b055c54cef5af9d29bed64 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Dec 24 2014 14:29:23 +0000
Subject: kernel spec changes


---

diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 4621e16..5c39174 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -149,6 +149,9 @@ Summary: The Linux kernel
 %ifarch i686
 %define asmarch x86
 %define hdrarch i386
+%define all_arch_configs kernel-%{version}-i?86*.config
+%define image_install_path boot
+%define kernel_image arch/x86/boot/bzImage
 %endif
 
 %ifarch x86_64
@@ -204,7 +207,7 @@ Summary: The Linux kernel
 # Which is a BadThing(tm).
 
 # We only build kernel-headers on the following...
-%define nobuildarches i686 s390 ppc
+%define nobuildarches s390 ppc
 
 %ifarch %nobuildarches
 %define with_default 0
@@ -216,7 +219,7 @@ Summary: The Linux kernel
 %endif
 
 # Architectures we build tools/cpupower on
-%define cpupowerarchs x86_64 ppc64
+%define cpupowerarchs i686 x86_64 ppc64
 
 #
 # Three sets of minimum package version requirements in the form of Conflicts:
@@ -363,6 +366,9 @@ Source70: kernel-%{version}-s390x.config
 Source71: kernel-%{version}-s390x-debug.config
 Source72: kernel-%{version}-s390x-kdump.config
 
+Source80: kernel-%{version}-i686.config
+Source81: kernel-%{version}-i686-debug.config
+
 # Sources for kernel-tools
 Source2000: cpupower.service
 Source2001: cpupower.config
@@ -372,6 +378,8 @@ Patch999999: linux-kernel-test.patch
 Patch1000: debrand-single-cpu.patch
 Patch1001: debrand-rh_taint.patch
 Patch1002: debrand-rh-i686-cpu.patch
+Patch1003: ignorewarnings.patch
+Patch1004: removejiffies.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
 
@@ -677,6 +685,10 @@ ApplyOptionalPatch debrand-single-cpu.patch
 ApplyOptionalPatch debrand-rh-i686-cpu.patch
 # End of CentOS Modification
 
+%ifarch %{ix86}
+ApplyPatch ignorewarnings.patch
+ApplyPatch removejiffies.patch
+%endif
 ApplyOptionalPatch linux-kernel-test.patch
 
 # Any further pre-build tree manipulations happen here.
@@ -1043,7 +1055,7 @@ make %{?cross_opts} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
     make %{?_smp_mflags} centrino-decode powernow-k8-decode
     popd
 %endif
-%ifarch x86_64
+%ifarch x86_64 i686
    pushd tools/power/x86/x86_energy_perf_policy/
    make
    popd