Fix i686 compilation for 2.6.39

Patch also makes it possible to compile i686 on 64bit machine.

diff --git a/uek-rpm/ol5/config-generic b/uek-rpm/ol5/config-generic
index 4823ac8daa31e016bfd02accdadc74c3e84b614a..0b76c0fdd3bf09a36e4774bc4c5f97bdf2e7e0e5 100644 (file)
--- a/uek-rpm/ol5/config-generic
+++ b/uek-rpm/ol5/config-generic
@@ -5073,3 +5073,23 @@ CONFIG_AVERAGE=y
 CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_SIGNATURE=y
 CONFIG_CRYPTO_SIGNATURE_DSA=y
+
+
+# CONFIG_SCx200 is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_TOSHIBA_FIR is not set
+# CONFIG_MTD_NAND_CS553X is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_EFFICEON is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set

diff --git a/uek-rpm/ol5/config-x86-generic b/uek-rpm/ol5/config-x86-generic
index e78c7dfd8f83644bbdad24c87c8a5865996946a0..5e46d91008ff5d8f0c68e10d3b68b9878a26108e 100644 (file)
--- a/uek-rpm/ol5/config-x86-generic
+++ b/uek-rpm/ol5/config-x86-generic
@@ -1,3 +1,12 @@
+CONFIG_X86_32=y
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# # CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+
+
 CONFIG_UID16=y
 # CONFIG_64BIT is not set
 # CONFIG_KERNEL_LZMA is not set
@@ -18,9 +27,6 @@ CONFIG_X86_32_NON_STANDARD=y
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_SUMMIT is not set
 CONFIG_X86_BIGSMP=y
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_ES7000 is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -35,12 +41,21 @@ CONFIG_M686=y
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
 # CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_ES7000 is not set
+
 CONFIG_SMP=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
@@ -81,6 +96,23 @@ CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_NUMA is not set
+CONFIG_NEED_NODE_MEMMAP_SIZE=y
+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_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
+
 
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
@@ -396,7 +428,6 @@ CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
 CONFIG_MTD_NAND_CAFE=m
 
-#CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
@@ -483,3 +514,8 @@ CONFIG_X86_MCE_AMD=y
 # CONFIG_X86_MCE_INJECT is not set
 
 CONFIG_ACERHDF=m
+
+# CONFIG_LBDAF is not set
+# CONFIG_X86_MRST is not set
+# CONFIG_X86_32_IRIS is not set
+# CONFIG_MCA is not set

diff --git a/uek-rpm/ol5/config-x86_64-generic b/uek-rpm/ol5/config-x86_64-generic
index 8792188970465cf76f4d1882090753f7ee6ae2fe..51cfdbddae8d9e1de0ad19786aec9150254f7997 100644 (file)
--- a/uek-rpm/ol5/config-x86_64-generic
+++ b/uek-rpm/ol5/config-x86_64-generic
@@ -2,6 +2,7 @@ CONFIG_64BIT=y
 CONFIG_UID16=y
 # CONFIG_KERNEL_LZMA is not set
 
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index 5ee679bc747ff071a8430c78f20f4a8b10df7e19..01b647ef9175ce27f45bf75b2d86a00ce336e6cb 100644 (file)
--- a/uek-rpm/ol5/kernel-uek.spec
+++ b/uek-rpm/ol5/kernel-uek.spec
@@ -365,13 +365,7 @@ Summary: The Linux kernel
 %define vdso_arches ppc ppc64
 %endif
 
-%if %{nopatches}%{using_upstream_branch}
-# Ignore unknown options in our config-* files.
-# Some options go with patches we're not applying.
-%define oldconfig_target oldconfig
-%else
-%define oldconfig_target oldconfig
-%endif
+%define oldconfig_target oldnoconfig
 
 # To temporarily exclude an architecture from being built, add it to
 # %nobuildarches. Do _NOT_ use the ExclusiveArch: line, because if we
@@ -855,9 +849,8 @@ test_config_file()
   if [ `make ARCH=$Arch listnewconfig 2>/dev/null | grep -c CONFIG`  -ne 0 ]; then 
        echo "Following config options are unconfigured"
        make ARCH=$Arch listnewconfig 2> /dev/null
-       echo "Error: Kernel version and config file missmatch"
-       echo "Please fix $TestConfig"
-       exit 1
+       echo "WARNING: Kernel version and config file missmatch"
+       echo "WARNING: This options will be unset by default in config file"
   fi
 }
 
@@ -1627,11 +1620,13 @@ rm -rf $RPM_BUILD_ROOT/usr/include/drm
 
 %if %{with_firmware}
 mkdir -p $RPM_BUILD_ROOT/lib/firmware
-make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+Arch=`head -n 3 .config |grep -e "Linux.*Kernel" |cut -d '/' -f 2 | cut -d ' ' -f 1`
+make ARCH=$Arch INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
 %endif
 
 %if %{with_bootwrapper}
-make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
+Arch=`head -n 3 .config |grep -e "Linux.*Kernel" |cut -d '/' -f 2 | cut -d ' ' -f 1`
+make ARCH=$Arch DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
 %endif
 
 ###

diff --git a/uek-rpm/ol6/config-generic b/uek-rpm/ol6/config-generic
index 4823ac8daa31e016bfd02accdadc74c3e84b614a..0b76c0fdd3bf09a36e4774bc4c5f97bdf2e7e0e5 100644 (file)
--- a/uek-rpm/ol6/config-generic
+++ b/uek-rpm/ol6/config-generic
@@ -5073,3 +5073,23 @@ CONFIG_AVERAGE=y
 CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_SIGNATURE=y
 CONFIG_CRYPTO_SIGNATURE_DSA=y
+
+
+# CONFIG_SCx200 is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_TOSHIBA_FIR is not set
+# CONFIG_MTD_NAND_CS553X is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_EFFICEON is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set

diff --git a/uek-rpm/ol6/config-x86-generic b/uek-rpm/ol6/config-x86-generic
index e78c7dfd8f83644bbdad24c87c8a5865996946a0..c21634062e634c7ef7ece987bfbbe730714d67be 100644 (file)
--- a/uek-rpm/ol6/config-x86-generic
+++ b/uek-rpm/ol6/config-x86-generic
@@ -1,3 +1,12 @@
+CONFIG_X86_32=y
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# # CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+
+
 CONFIG_UID16=y
 # CONFIG_64BIT is not set
 # CONFIG_KERNEL_LZMA is not set
@@ -12,15 +21,11 @@ CONFIG_UID16=y
 CONFIG_X86_GENERICARCH=y
 CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_32_NON_STANDARD=y
-
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_SUMMIT is not set
 CONFIG_X86_BIGSMP=y
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_ES7000 is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -35,12 +40,21 @@ CONFIG_M686=y
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
 # CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_ES7000 is not set
+
 CONFIG_SMP=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
@@ -81,6 +95,23 @@ CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_NUMA is not set
+CONFIG_NEED_NODE_MEMMAP_SIZE=y
+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_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
+
 
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
@@ -396,7 +427,6 @@ CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
 CONFIG_MTD_NAND_CAFE=m
 
-#CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
@@ -483,3 +513,8 @@ CONFIG_X86_MCE_AMD=y
 # CONFIG_X86_MCE_INJECT is not set
 
 CONFIG_ACERHDF=m
+
+# CONFIG_LBDAF is not set
+# CONFIG_X86_MRST is not set
+# CONFIG_X86_32_IRIS is not set
+# CONFIG_MCA is not set

diff --git a/uek-rpm/ol6/config-x86_64-generic b/uek-rpm/ol6/config-x86_64-generic
index 8792188970465cf76f4d1882090753f7ee6ae2fe..51cfdbddae8d9e1de0ad19786aec9150254f7997 100644 (file)
--- a/uek-rpm/ol6/config-x86_64-generic
+++ b/uek-rpm/ol6/config-x86_64-generic
@@ -2,6 +2,7 @@ CONFIG_64BIT=y
 CONFIG_UID16=y
 # CONFIG_KERNEL_LZMA is not set
 
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 989e245c2c719d5c1ea56176c1d98d3cac752139..485e55a15a1e518fce2d8686922ac1cae7919280 100644 (file)
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -367,13 +367,7 @@ Summary: The Linux kernel
 %define vdso_arches ppc ppc64
 %endif
 
-%if %{nopatches}%{using_upstream_branch}
-# Ignore unknown options in our config-* files.
-# Some options go with patches we're not applying.
-%define oldconfig_target oldconfig
-%else
-%define oldconfig_target oldconfig
-%endif
+%define oldconfig_target oldnoconfig
 
 # To temporarily exclude an architecture from being built, add it to
 # %nobuildarches. Do _NOT_ use the ExclusiveArch: line, because if we
@@ -863,9 +857,8 @@ test_config_file()
   if [ `make ARCH=$Arch listnewconfig 2>/dev/null | grep -c CONFIG`  -ne 0 ]; then 
        echo "Following config options are unconfigured"
        make ARCH=$Arch listnewconfig 2> /dev/null
-       echo "Error: Kernel version and config file missmatch"
-       echo "Please fix $TestConfig"
-       exit 1
+       echo "WARNING: Kernel version and config file missmatch"
+       echo "WARNING: This options will be unset by default in config file"
   fi
 }
 
@@ -1605,11 +1598,13 @@ rm -rf $RPM_BUILD_ROOT/usr/include/drm
 
 %if %{with_firmware}
 mkdir -p $RPM_BUILD_ROOT/lib/firmware
-make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+Arch=`head -n 3 .config |grep -e "Linux.*Kernel" |cut -d '/' -f 2 | cut -d ' ' -f 1`
+make ARCH=$Arch INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
 %endif
 
 %if %{with_bootwrapper}
-make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
+Arch=`head -n 3 .config |grep -e "Linux.*Kernel" |cut -d '/' -f 2 | cut -d ' ' -f 1`
+make ARCH=$Arch DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
 %endif
 
 ###