[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-676-g80a4175
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-676-g80a4175
|
From: Julien B a. A. <ar...@us...> - 2015-03-19 13:05:48
|
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 80a41756482d13accc4bc02e4dd0bf4639354c73 (commit)
from 71c75c625713b1f2d658e344a45b2315dc2beea8 (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 80a41756482d13accc4bc02e4dd0bf4639354c73
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 19 14:04:10 2015 +0100
[BUILDROOT] 2015.02: allow build of 3.19 kernels and update apfxxmainline_defconfig to 3.19.2 while we are at it
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 5 +-
buildroot/configs/apf28mainline_defconfig | 5 +-
buildroot/configs/apf51mainline_defconfig | 5 +-
...nux-3.19.1.config => apf27-linux-3.19.2.config} | 0
...nux-3.19.1.config => apf28-linux-3.19.2.config} | 0
...nux-3.19.1.config => apf51-linux-3.19.2.config} | 0
...backport-BR-mainline-linux-headers-config.patch | 199 ++++++++++++++++++++
patches/buildroot/2015.02/cleanup_buildroot.sh | 4 +-
8 files changed, 211 insertions(+), 7 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.19.1.config => apf27-linux-3.19.2.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.19.1.config => apf28-linux-3.19.2.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.19.1.config => apf51-linux-3.19.2.config} (100%)
create mode 100644 patches/buildroot/2015.02/052-armadeus-backport-BR-mainline-linux-headers-config.patch
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 1063020..fa6cbee 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,8 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.1"
+BR2_DEFAULT_KERNEL_VERSION="3.19.2"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +35,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 8ffbce7..18dfb73 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,8 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.1"
+BR2_DEFAULT_KERNEL_VERSION="3.19.2"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +36,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 1befffa..d23e265 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,8 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.1"
+BR2_DEFAULT_KERNEL_VERSION="3.19.2"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +98,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.19.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.19.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.19.1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.19.2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.19.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.19.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.19.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.19.2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.19.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.19.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.19.1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.19.2.config
diff --git a/patches/buildroot/2015.02/052-armadeus-backport-BR-mainline-linux-headers-config.patch b/patches/buildroot/2015.02/052-armadeus-backport-BR-mainline-linux-headers-config.patch
new file mode 100644
index 0000000..782c573
--- /dev/null
+++ b/patches/buildroot/2015.02/052-armadeus-backport-BR-mainline-linux-headers-config.patch
@@ -0,0 +1,199 @@
+Latest BR mainline linux-headers config stuff. (Until we move to 2015.05).
+
+Index: buildroot/package/linux-headers/Config.in.host
+===================================================================
+--- buildroot.orig/package/linux-headers/Config.in.host 2015-03-01 22:26:12.000000000 +0100
++++ buildroot/package/linux-headers/Config.in.host 2015-03-19 11:42:50.594037388 +0100
+@@ -5,7 +5,7 @@
+
+ choice
+ prompt "Kernel Headers"
+- default BR2_KERNEL_HEADERS_3_18
++ default BR2_KERNEL_HEADERS_3_19
+ help
+ Select the version of kernel header files you wish to use.
+ You must select the correct set of header files to match
+@@ -14,59 +14,73 @@
+ config BR2_KERNEL_HEADERS_3_0
+ bool "Linux 3.0.x kernel headers"
+ depends on BR2_DEPRECATED_SINCE_2014_08
+- depends on !BR2_arc
++ depends on !BR2_arc && !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+
+ config BR2_KERNEL_HEADERS_3_2
+ bool "Linux 3.2.x kernel headers"
+- depends on !BR2_arc
++ depends on !BR2_arc && !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+
+ config BR2_KERNEL_HEADERS_3_4
+ bool "Linux 3.4.x kernel headers"
+- depends on !BR2_arc
++ depends on !BR2_arc && !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+
+ config BR2_KERNEL_HEADERS_3_10
+ bool "Linux 3.10.x kernel headers"
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+
+ config BR2_KERNEL_HEADERS_3_11
+ bool "Linux 3.11.x kernel headers"
+ depends on BR2_DEPRECATED_SINCE_2014_08
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11
+
+ config BR2_KERNEL_HEADERS_3_12
+ bool "Linux 3.12.x kernel headers"
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
+
+ config BR2_KERNEL_HEADERS_3_13
+ bool "Linux 3.13.x kernel headers"
+ depends on BR2_DEPRECATED_SINCE_2014_08
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
+
+ config BR2_KERNEL_HEADERS_3_14
+ bool "Linux 3.14.x kernel headers"
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
+
+ config BR2_KERNEL_HEADERS_3_15
+ bool "Linux 3.15.x kernel headers"
+ depends on BR2_DEPRECATED_SINCE_2014_08
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
+
+ config BR2_KERNEL_HEADERS_3_16
+ bool "Linux 3.16.x kernel headers"
+ depends on BR2_DEPRECATED_SINCE_2015_02
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
+
+ config BR2_KERNEL_HEADERS_3_17
+ bool "Linux 3.17.x kernel headers"
++ depends on BR2_DEPRECATED_SINCE_2015_05
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+
+ config BR2_KERNEL_HEADERS_3_18
+ bool "Linux 3.18.x kernel headers"
++ depends on !BR2_nios2
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+
++ config BR2_KERNEL_HEADERS_3_19
++ bool "Linux 3.19.x kernel headers"
++ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
++
+ config BR2_KERNEL_HEADERS_VERSION
+ bool "Manually specified Linux version"
+ endchoice
+@@ -88,6 +102,10 @@
+ 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_3_19
++ bool "3.19.x"
++ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
++
+ config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18
+ bool "3.18.x"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+@@ -172,15 +190,16 @@
+ config BR2_DEFAULT_KERNEL_HEADERS
+ string
+ default "3.0.101" if BR2_KERNEL_HEADERS_3_0
+- default "3.2.66" if BR2_KERNEL_HEADERS_3_2
++ default "3.2.68" if BR2_KERNEL_HEADERS_3_2
+ default "3.4.106" if BR2_KERNEL_HEADERS_3_4
+- default "3.10.68" if BR2_KERNEL_HEADERS_3_10
++ default "3.10.72" if BR2_KERNEL_HEADERS_3_10
+ default "3.11.10" if BR2_KERNEL_HEADERS_3_11
+- default "3.12.37" if BR2_KERNEL_HEADERS_3_12
++ default "3.12.38" if BR2_KERNEL_HEADERS_3_12
+ default "3.13.11" if BR2_KERNEL_HEADERS_3_13
+- default "3.14.32" if BR2_KERNEL_HEADERS_3_14
++ default "3.14.36" if BR2_KERNEL_HEADERS_3_14
+ default "3.15.10" if BR2_KERNEL_HEADERS_3_15
+ default "3.16.7" if BR2_KERNEL_HEADERS_3_16
+ default "3.17.8" if BR2_KERNEL_HEADERS_3_17
+- default "3.18.6" if BR2_KERNEL_HEADERS_3_18
++ default "3.18.9" if BR2_KERNEL_HEADERS_3_18
++ default "3.19.2" if BR2_KERNEL_HEADERS_3_19
+ default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
+Index: buildroot/linux/Config.in
+===================================================================
+--- buildroot.orig/linux/Config.in 2015-03-01 22:26:12.000000000 +0100
++++ buildroot/linux/Config.in 2015-03-19 11:57:52.206069223 +0100
+@@ -21,7 +21,7 @@
+ prompt "Kernel version"
+
+ config BR2_LINUX_KERNEL_LATEST_VERSION
+- bool "3.18.6"
++ bool "3.19.2"
+
+ config BR2_LINUX_KERNEL_SAME_AS_HEADERS
+ bool "Same as toolchain kernel headers"
+@@ -109,7 +109,7 @@
+
+ config BR2_LINUX_KERNEL_VERSION
+ string
+- default "3.18.6" if BR2_LINUX_KERNEL_LATEST_VERSION
++ default "3.19.2" if BR2_LINUX_KERNEL_LATEST_VERSION
+ 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
+@@ -140,10 +140,10 @@
+ default BR2_LINUX_KERNEL_USE_DEFCONFIG
+
+ config BR2_LINUX_KERNEL_USE_DEFCONFIG
+- bool "Using a defconfig"
++ bool "Using an in-tree defconfig file"
+
+ config BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG
+- bool "Using a custom config file"
++ bool "Using a custom (def)config file"
+
+ endchoice
+
+@@ -161,6 +161,9 @@
+ help
+ Path to the kernel configuration file
+
++ Note: this can be a defconfig file or a complete .config file,
++ which can later be saved back with make linux-update-(def)config.
++
+ #
+ # Binary format
+ #
+@@ -174,7 +177,7 @@
+ config BR2_LINUX_KERNEL_UIMAGE
+ bool "uImage"
+ depends on BR2_arc || BR2_arm || BR2_armeb || BR2_bfin || \
+- BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 || \
++ BR2_powerpc || BR2_sh || BR2_sh64 || \
+ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+ select BR2_LINUX_KERNEL_UBOOT_IMAGE
+
+diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
+index 2ee2019..304afe4 100644
+--- a/toolchain/toolchain-common.in
++++ b/toolchain/toolchain-common.in
+@@ -221,10 +221,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+
++config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
++ bool
++ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
++
+ # 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 "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
+ default "3.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index ea3157b..be158a4 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -14,6 +14,7 @@ rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
+rm -rf buildroot/linux/Config.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
rm -rf buildroot/linux/linux.mk
rm -rf buildroot/package/Config.in
@@ -68,6 +69,7 @@ rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
+rm -rf buildroot/package/linux-headers/Config.in.host
rm -rf buildroot/package/ltrace/Config.in
rm -rf buildroot/package/marble/Config.in
rm -rf buildroot/package/marble/marble.mk
@@ -84,7 +86,6 @@ rm -rf buildroot/package/owfs/Config.in
rm -rf buildroot/package/owfs/owfs.mk
rm -rf buildroot/package/pci_debug/Config.in
rm -rf buildroot/package/pci_debug/pci_debug.mk
-rm -rf buildroot/package/python/Config.in
rm -rf buildroot/package/python-flask-jsonrpc/Config.in
rm -rf buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.hash
rm -rf buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
@@ -153,4 +154,5 @@ rm -rf buildroot/package/xenomai/Config.in
rm -rf buildroot/package/xenomai/xenomai.mk
rm -rf buildroot/system/Config.in
rm -rf buildroot/system/system.mk
+rm -rf buildroot/toolchain/toolchain-common.in
rm -rf buildroot/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-add___kernel_long_and___kernel_ulong.patch
hooks/post-receive
--
armadeus
|