kernel-headers: add 3.5.x and bump 3.{0, 2, 4}.x stable versions

PATCH Superseded Gustavo Zacarias 2 participants 8 messages Sep 4, 2012

lore

Share & tools

lore

Gustavo Zacarias

author

2012-09-04 12:00 UTC #0 lore raw

PATCH 1/3 kernel-headers: add 3.5.x and bump 3.{0, 2, 4}.x stable versions

Signed-off-by Gustavo Zacarias <[email protected]>

---
 toolchain/kernel-headers/Config.in                 |   12 ++++++++----
 ...all-fix-__packed-in-exported-kernel-head.patch} |    0
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.41-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

toolchain/kernel-headers/Config.in +8 -4

index dc5c2ad..d35aed2 100644
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_4
+	default BR2_KERNEL_HEADERS_3_5
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match

@@ -44,6 +44,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_4
 		bool "Linux 3.4.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_5
+		bool "Linux 3.5.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"

@@ -64,10 +67,11 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.40"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.42"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.26"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.28"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.8"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.10"	if BR2_KERNEL_HEADERS_3_4
+	default "3.5.3"		if BR2_KERNEL_HEADERS_3_5
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

toolchain/kernel-headers/linux-3.0.41-headers_install-fix-__packed-in-exported-kernel-head.patch renamed from toolchain/kernel-headers/linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch +0 -0

similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.41-headers_install-fix-__packed-in-exported-kernel-head.patch

Signature · 1 line

1.7.8.6

Gustavo Zacarias

author

2012-09-04 12:00 UTC #1 lore raw

PATCH 2/3 linux: bump default to kernel version 3.5.3

Signed-off-by Gustavo Zacarias <[email protected]>

---
 linux/Config.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

linux/Config.in +4 -4

index 0306348..30cb5ed 100644
@@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_3_4
+	default BR2_LINUX_KERNEL_3_5
 
-config BR2_LINUX_KERNEL_3_4
-	bool "3.4.8"
+config BR2_LINUX_KERNEL_3_5
+	bool "3.5.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"

@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.8" if BR2_LINUX_KERNEL_3_4
+	default "3.5.3" if BR2_LINUX_KERNEL_3_5
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

Signature · 1 line

1.7.8.6

Peter Korsgaard

2012-09-04 13:50 UTC #2 lore raw

PATCH 2/3 linux: bump default to kernel version 3.5.3

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2012-09-04 12:00 UTC #3 lore raw

PATCH 3/3 u-boot: add version 2012.07

In reply to Gustavo Zacarias

Signed-off-by Gustavo Zacarias <[email protected]>

---
 boot/uboot/Config.in                               |    6 +++-
 ...oot-tools-2012.07-drop-configh-from-tools.patch |   31 ++++++++++++++++++++
 ...oot-tools-2012.07-hostcflags-override-fix.patch |   29 ++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletions(-)
 create mode 100644 package/uboot-tools/uboot-tools-2012.07-drop-configh-from-tools.patch
 create mode 100644 package/uboot-tools/uboot-tools-2012.07-hostcflags-override-fix.patch

boot/uboot/Config.in +5 -1

index 900fac7..7f3cae0 100644
@@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2012_04
+	default BR2_TARGET_UBOOT_2012_07
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2012_07
+	bool "2012.07"
+
 config BR2_TARGET_UBOOT_2012_04
 	bool "2012.04.01"

@@ -50,6 +53,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2012.07"	if BR2_TARGET_UBOOT_2012_07
 	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04
 	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09

package/uboot-tools/uboot-tools-2012.07-drop-configh-from-tools.patch new file +31 -0

new file mode 100644
index 0000000..2b3a0e5
@@ -0,0 +1,31 @@
+From 39857718f4df9b40a7acf38b73140fd86c628ef0 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+Date: Mon, 30 Apr 2012 09:07:38 -0300
+Subject: [PATCH] fw_env: allow it to build without a config
+
+We need to build u-boot tools without a board configuration for the
+target packages.
+fw_env just uses config.h to define the default environment of the
+created image, so it really isn't mandatory.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+---
+ tools/env/fw_env.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
+index e292d2b..2bb061a 100644
+--- a/tools/env/fw_env.c
++++ b/tools/env/fw_env.c
+@@ -45,8 +45,6 @@
+ 
+ #include "fw_env.h"
+ 
+-#include <config.h>
+-
+ #define WHITESPACE(c) ((c == '\t') || (c == ' '))
+ 
+ #define min(x, y) ({				\
+-- 
+1.7.3.4
+

package/uboot-tools/uboot-tools-2012.07-hostcflags-override-fix.patch new file +29 -0

new file mode 100644
index 0000000..0202eda
@@ -0,0 +1,29 @@
+[PATCH] Fix tools build with custom HOSTCFLAGS
+
+We always need to append HOSTCPPFLAGS, even if HOSTCFLAGS have been
+overridden on the cmdline.
+
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ config.mk |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: u-boot-2011.03/config.mk
+===================================================================
+--- u-boot-2011.03.orig/config.mk
++++ u-boot-2011.03/config.mk
+@@ -46,10 +46,12 @@
+ 
+ #########################################################################
+ 
+-HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \
+-		  $(HOSTCPPFLAGS)
++HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+ HOSTSTRIP	= strip
+ 
++# append CPPFLAGS even if CFLAGS has been overridden on cmdline
++override HOSTCFLAGS += $(HOSTCPPFLAGS)
++
+ #
+ # Mac OS X / Darwin's C preprocessor is Apple specific.  It
+ # generates numerous errors and warnings.  We want to bypass it

Signature · 1 line

1.7.8.6

Peter Korsgaard

2012-09-04 13:52 UTC #4 lore raw

PATCH 3/3 u-boot: add version 2012.07

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  boot/uboot/Config.in                               |    6 +++-
 Gustavo>  ...oot-tools-2012.07-drop-configh-from-tools.patch |   31 ++++++++++++++++++++
 Gustavo>  ...oot-tools-2012.07-hostcflags-override-fix.patch |   29 ++++++++++++++++++
 Gustavo>  3 files changed, 65 insertions(+), 1 deletions(-)
 Gustavo>  create mode 100644 package/uboot-tools/uboot-tools-2012.07-drop-configh-from-tools.patch
 Gustavo>  create mode 100644 package/uboot-tools/uboot-tools-2012.07-hostcflags-override-fix.patch

You don't seem to be removing the 2012.04 patches?

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2012-09-04 13:56 UTC #5 lore raw

PATCH 3/3 u-boot: add version 2012.07

Quoted 1 line · Peter Korsgaard

You don't seem to be removing the 2012.04 patches?

Duh!
My bad, that's what 0 sleep at night does when the old kid is jealous of the new kid (and cutting new teeth to spice it up a little more). Sent v2.
Regards.

Peter Korsgaard

2012-09-04 14:01 UTC #6 lore raw

PATCH 3/3 u-boot: add version 2012.07

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Quoted 1 line · Peter Korsgaard

Quoted 1 line
You don't seem to be removing the 2012.04 patches?

Gustavo> Duh!

Gustavo> My bad, that's what 0 sleep at night does when the old kid is Gustavo> jealous of the new kid (and cutting new teeth to spice it up a Gustavo> little more). Sent v2. Regards.

Heh, congratulations on the 2nd child!

Signature · 1 line

Bye, Peter Korsgaard

Peter Korsgaard

2012-09-04 13:49 UTC #7 lore raw

PATCH 1/3 kernel-headers: add 3.5.x and bump 3.{0, 2, 4}.x stable versions

In reply to Gustavo Zacarias

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Sorry, I did the same change here locally already before noticing your mail.

Signature · 1 line

Bye, Peter Korsgaard