[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 967da24b3c6e63d02a3fd0b94ee9c68be875e013

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 967da24b3c6e63d02a3fd0b94ee9c68be875e013

[git]

[-- Attachment #1: Type: text/plain, Size: 5481 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  967da24b3c6e63d02a3fd0b94ee9c68be875e013 (commit)
      from  e4edd42d8987550fcf2d242b922731e7958f7b09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 967da24b3c6e63d02a3fd0b94ee9c68be875e013
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Mar 20 17:10:34 2013 +0000

    kernel: Disable LPAE on ARM - create uImage.
    
    LPAE has been enabled on all ARMv7 platforms, but
    OMAP4 (at least) does not support that, so the kernels
    did not boot.
    
    Also, we directly generate u-boot images.

-----------------------------------------------------------------------

Summary of changes:
 kernel/config-armv7hl-exynos |  6 +++---
 kernel/config-armv7hl-omap   |  6 ++----
 kernel/config-generic        |  4 +---
 kernel/kernel.nm             | 24 ++++++++++++++----------
 4 files changed, 20 insertions(+), 20 deletions(-)

Difference in files:
diff --git a/kernel/config-armv7hl-exynos b/kernel/config-armv7hl-exynos
index a31f8d1..ba0656e 100644
--- a/kernel/config-armv7hl-exynos
+++ b/kernel/config-armv7hl-exynos
@@ -157,8 +157,7 @@ CONFIG_CPU_HAS_ASID=y
 #
 # Processor Features
 #
-CONFIG_ARM_LPAE=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+# CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
@@ -218,7 +217,6 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_PHYS_ADDR_T_64BIT=y
 
 #
 # Boot options
@@ -665,10 +663,12 @@ CONFIG_PAX_PAGEEXEC=y
 CONFIG_PAX_MPROTECT=y
 # CONFIG_PAX_MPROTECT_COMPAT is not set
 CONFIG_PAX_ELFRELOCS=y
+# CONFIG_PAX_KERNEXEC is not set
 
 #
 # Miscellaneous hardening features
 #
+# CONFIG_PAX_MEMORY_UDEREF is not set
 CONFIG_PAX_REFCOUNT=y
 
 #
diff --git a/kernel/config-armv7hl-omap b/kernel/config-armv7hl-omap
index 1f69140..73de603 100644
--- a/kernel/config-armv7hl-omap
+++ b/kernel/config-armv7hl-omap
@@ -128,9 +128,8 @@ CONFIG_CPU_HAS_ASID=y
 #
 # Processor Features
 #
-CONFIG_ARM_LPAE=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARM_THUMBEE=y
+# CONFIG_ARM_LPAE is not set
+# CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -183,7 +182,6 @@ CONFIG_HZ=128
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_XEN_DOM0=y
diff --git a/kernel/config-generic b/kernel/config-generic
index 40feeba..074a90c 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -3973,10 +3973,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
@@ -4096,6 +4093,7 @@ CONFIG_PAX_RANDMMAP=y
 #
 # Miscellaneous hardening features
 #
+CONFIG_PAX_CONSTIFY_PLUGIN=y
 CONFIG_PAX_USERCOPY=y
 # CONFIG_PAX_LATENT_ENTROPY is not set
 
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index b9215c4..16c5b59 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.8.3
-release    = 1
+release    = 2
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -72,22 +72,21 @@ build
 	kernel_build_flags =
 
 	kernel_target = bzImage
+	kernel_image = arch/%{kernel_arch}/boot/%{kernel_target}
+
 	if "%{DISTRO_ARCH}" == "i686"
 		# Build a default and legacy kernel for the
 		# i686 architecture.
 		build_kernel_default = 1
 		build_kernel_legacy = 1
 
-		kernel_arch  = x86
-		kernel_image = arch/%{kernel_arch}/boot/bzImage
-
+		kernel_arch = x86
 	end
 
 	if "%{DISTRO_ARCH}" == "x86_64"
 		build_kernel_default = 1
 
-		kernel_arch  = x86
-		kernel_image = arch/%{kernel_arch}/boot/bzImage
+		kernel_arch = x86
 	end
 
 	if "%{DISTRO_ARCH}" == "armv5tel"
@@ -97,8 +96,8 @@ build
 		# Build a kernel for Marvell Kirkwood-based devices.
 		build_kernel_kirkwood = 1
 
-		kernel_arch  = arm
-		kernel_image = arch/%{kernel_arch}/boot/zImage
+		kernel_arch = arm
+		kernel_target = zImage
 
 		# http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/091404.html
 		kernel_build_flags = KALLSYMS_EXTRA_PASS=1
@@ -111,8 +110,13 @@ build
 		# Build a kernel for TI OMAP SoCs.
 		build_kernel_omap = 1
 
-		kernel_arch  = arm
-		kernel_image = arch/%{kernel_arch}/boot/zImage
+		kernel_arch = arm
+		kernel_target = uImage
+	end
+
+	# mkimage is a requirement to build uImage images.
+	if "%{kernel_target}" == "uImage"
+		requires += u-boot-tools
 	end
 
 	# Build default kernel.


hooks/post-receive
--
IPFire 3.x development tree