[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-765-gc0ca4e8
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2015-06-15 14:36:10
|
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 "armadeus".
The branch, master has been updated
via c0ca4e8c0d6626eba8c1daea64403ace0ce785ed (commit)
via 401d09314b188e5471d3796df32f2059795ae95b (commit)
from d819e7c0b529684af9b9f7b386472f33730c3c57 (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 c0ca4e8c0d6626eba8c1daea64403ace0ce785ed
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 15 16:35:26 2015 +0200
[BUILDROOT] APF27: fixes build of apf27preempt-rtmainline_defconfig
commit 401d09314b188e5471d3796df32f2059795ae95b
Author: Philippe Reynes <tr...@gm...>
Date: Sat May 30 11:31:03 2015 +0200
[BUILDROOT] 2015.02: backport patches from mainline to support linux headers 4.x
Signed-off-by: Julien Boibessot <jul...@ar...>
-----------------------------------------------------------------------
Summary of changes:
.../configs/apf27preempt-rtmainline_defconfig | 2 +-
...-BR-mainline-linux-headers-add-4.0-config.patch | 52 ++++++++++++++++++++
...BR-mainline-linux-headers-add-4.0-support.patch | 27 ++++++++++
...ort-BR-mainline-toolchain-add-4.0-support.patch | 32 ++++++++++++
4 files changed, 112 insertions(+), 1 deletions(-)
create mode 100644 patches/buildroot/2015.02/053-armadeus-backport-BR-mainline-linux-headers-add-4.0-config.patch
create mode 100644 patches/buildroot/2015.02/054-armadeus-backport-BR-mainline-linux-headers-add-4.0-support.patch
create mode 100644 patches/buildroot/2015.02/055-armadeus-backport-BR-mainline-toolchain-add-4.0-support.patch
diff --git a/buildroot/configs/apf27preempt-rtmainline_defconfig b/buildroot/configs/apf27preempt-rtmainline_defconfig
index 2348730..e0f1f32 100644
--- a/buildroot/configs/apf27preempt-rtmainline_defconfig
+++ b/buildroot/configs/apf27preempt-rtmainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="4.0.5"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
diff --git a/patches/buildroot/2015.02/053-armadeus-backport-BR-mainline-linux-headers-add-4.0-config.patch b/patches/buildroot/2015.02/053-armadeus-backport-BR-mainline-linux-headers-add-4.0-config.patch
new file mode 100644
index 0000000..5b541dd
--- /dev/null
+++ b/patches/buildroot/2015.02/053-armadeus-backport-BR-mainline-linux-headers-add-4.0-config.patch
@@ -0,0 +1,52 @@
+From 53e36065c7fb4f1725cb8013ccd0aeae8db22f8a Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gu...@za...>
+Date: Mon, 13 Apr 2015 10:00:24 -0300
+Subject: [PATCH 11/18] linux-headers: add 4.0.x series
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+---
+ package/linux-headers/Config.in.host | 11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+Index: b/package/linux-headers/Config.in.host
+===================================================================
+--- a/package/linux-headers/Config.in.host
++++ b/package/linux-headers/Config.in.host
+@@ -5,7 +5,7 @@ comment "Kernel Header Options"
+
+ choice
+ prompt "Kernel Headers"
+- default BR2_KERNEL_HEADERS_3_19
++ default BR2_KERNEL_HEADERS_4_0
+ help
+ Select the version of kernel header files you wish to use.
+ You must select the correct set of header files to match
+@@ -81,6 +81,10 @@ choice
+ bool "Linux 3.19.x kernel headers"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
+
++ config BR2_KERNEL_HEADERS_4_0
++ bool "Linux 4.0.x kernel headers"
++ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
++
+ config BR2_KERNEL_HEADERS_VERSION
+ bool "Manually specified Linux version"
+ endchoice
+@@ -102,6 +106,10 @@ choice
+ This is used to hide/show some packages that have strict
+ requirements on the version of kernel headers.
+
++config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0
++ bool "4.0.x"
++ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
++
+ config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19
+ bool "3.19.x"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
+@@ -202,4 +210,5 @@ config BR2_DEFAULT_KERNEL_HEADERS
+ default "3.17.8" if BR2_KERNEL_HEADERS_3_17
+ default "3.18.9" if BR2_KERNEL_HEADERS_3_18
+ default "3.19.2" if BR2_KERNEL_HEADERS_3_19
++ default "4.0" if BR2_KERNEL_HEADERS_4_0
+ default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/patches/buildroot/2015.02/054-armadeus-backport-BR-mainline-linux-headers-add-4.0-support.patch b/patches/buildroot/2015.02/054-armadeus-backport-BR-mainline-linux-headers-add-4.0-support.patch
new file mode 100644
index 0000000..f74ecdf
--- /dev/null
+++ b/patches/buildroot/2015.02/054-armadeus-backport-BR-mainline-linux-headers-add-4.0-support.patch
@@ -0,0 +1,27 @@
+From 9c7710015112464d74cb6be16c05dd6fc23ae122 Mon Sep 17 00:00:00 2001
+From: Jerzy Grzegorek <jer...@tr...>
+Date: Fri, 10 Apr 2015 21:57:54 +0200
+Subject: [PATCH] linux-headers: add support for 4.x versions
+
+Signed-off-by: Jerzy Grzegorek <jer...@tr...>
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+---
+ package/linux-headers/linux-headers.mk | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+Index: b/package/linux-headers/linux-headers.mk
+===================================================================
+--- a/package/linux-headers/linux-headers.mk
++++ b/package/linux-headers/linux-headers.mk
+@@ -10,8 +10,10 @@
+ LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))
+ ifeq ($(findstring x2.6.,x$(LINUX_HEADERS_VERSION)),x2.6.)
+ LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
+-else
++else ifeq ($(findstring x3.,x$(LINUX_HEADERS_VERSION)),x3.)
+ LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
++else ifeq ($(findstring x4.,x$(LINUX_HEADERS_VERSION)),x4.)
++LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
+ endif
+ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
+
diff --git a/patches/buildroot/2015.02/055-armadeus-backport-BR-mainline-toolchain-add-4.0-support.patch b/patches/buildroot/2015.02/055-armadeus-backport-BR-mainline-toolchain-add-4.0-support.patch
new file mode 100644
index 0000000..4577417
--- /dev/null
+++ b/patches/buildroot/2015.02/055-armadeus-backport-BR-mainline-toolchain-add-4.0-support.patch
@@ -0,0 +1,32 @@
+From e714ee9412ea873af68a48edbe60f48029728186 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gu...@za...>
+Date: Mon, 13 Apr 2015 10:00:23 -0300
+Subject: [PATCH] toolchain: add 4.0.x choice for headers
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+---
+ toolchain/toolchain-common.in | 5 +++++
+ toolchain/toolchain-external/Config.in | 4 ++++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+Index: b/toolchain/toolchain-common.in
+===================================================================
+--- a/toolchain/toolchain-common.in
++++ b/toolchain/toolchain-common.in
+@@ -225,10 +225,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+
++config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
++ bool
++ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
++
+ # This order guarantees that the highest version is set, as kconfig
+ # stops affecting a value on the first matching default.
+ config BR2_TOOLCHAIN_HEADERS_AT_LEAST
+ string
++ default "4.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
+ default "3.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
+ default "3.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+ default "3.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
hooks/post-receive
--
armadeus
|