[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2530-g6a39b31
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2530-g6a39b31
|
From: Julien B a. A. <ar...@us...> - 2011-10-06 08:59:52
|
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 6a39b31ff32c6407deb38e92a1a4dd04676fe41d (commit)
via 3a3a3e10666ba81f7347935aacbbf671183f1a8d (commit)
from b115a688bd0635c27a9bea1a4931814b9f116958 (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 6a39b31ff32c6407deb38e92a1a4dd04676fe41d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Oct 6 10:58:34 2011 +0200
[BUILDROOT] crosstool: bump kernel headers version
commit 3a3a3e10666ba81f7347935aacbbf671183f1a8d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Oct 6 10:44:25 2011 +0200
[BUILD] Supports external/crosstool toolchains and other libc librairies than uClibc in build end message
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
Makefile.in | 20 +++++++++-
...160-crosstool-bump_kernel_headers_version.patch | 41 ++++++++++++++++++++
3 files changed, 60 insertions(+), 3 deletions(-)
create mode 100644 patches/buildroot/2011.05/160-crosstool-bump_kernel_headers_version.patch
diff --git a/Makefile b/Makefile
index bac572a..0374289 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ ECHO_BUILD_IS_OK:= echo -en "\033[1m"; \
echo ""; \
echo "Your Armadeus BSP (version "$(ARMADEUS_BSP_VERSION)" for "$(ARMADEUS_BOARD_NAME)") was successfully built !"; \
echo " gcc: "$(ARMADEUS_GCC_VERSION)""; \
- echo " uClibc: "$(ARMADEUS_UCLIBC_VERSION)""; \
+ echo " libc: "$(ARMADEUS_LIBC_NAME) $(ARMADEUS_LIBC_VERSION)""; \
echo " busybox: "$(ARMADEUS_BUSYBOX_VERSION)""; \
echo " U-Boot: "$(ARMADEUS_U_BOOT_VERSION)""; \
echo " Linux: "$(ARMADEUS_LINUX_VERSION)""; \
diff --git a/Makefile.in b/Makefile.in
index 15c1e4e..43103b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,8 +14,19 @@ BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
-ARMADEUS_UCLIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
-ARMADEUS_GCC_VERSION:=$(shell echo $(BR2_GCC_VERSION))
+ARMADEUS_LIBC_NAME=unknown
+ARMADEUS_LIBC_VERSION=X.Y
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+ARMADEUS_LIBC_NAME=uClibc
+ARMADEUS_LIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
+endif
+ifeq ($(BR2_TOOLCHAIN_CTNG),y)
+ARMADEUS_LIBC_NAME:=$(BR2_TOOLCHAIN_CTNG_LIBC)
+ARMADEUS_LIBC_VERSION:=$(shell grep CT_LIBC_VERSION $(BUILDROOT_DIR)/$(BR2_TOOLCHAIN_CTNG_CONFIG) | cut -d = -f 2)
+endif
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+ARMADEUS_LIBC_NAME=glibc
+endif
ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
@@ -56,6 +67,11 @@ ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_V
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_OUTPUT_DIR)/host/usr/bin
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+ARMADEUS_GCC_VERSION:=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-gcc -dumpversion)
+else
+ARMADEUS_GCC_VERSION:=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -dumpversion)
+endif
ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/sdl-$(ARMADEUS_SDL_VERSION)
diff --git a/patches/buildroot/2011.05/160-crosstool-bump_kernel_headers_version.patch b/patches/buildroot/2011.05/160-crosstool-bump_kernel_headers_version.patch
new file mode 100644
index 0000000..f290cb1
--- /dev/null
+++ b/patches/buildroot/2011.05/160-crosstool-bump_kernel_headers_version.patch
@@ -0,0 +1,41 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+===================================================================
+--- buildroot.orig/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc 2011-10-06 10:47:24.000000000 +0200
++++ buildroot/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc 2011-10-06 10:47:47.000000000 +0200
+@@ -194,7 +194,7 @@
+ # CT_MINGW32 is not set
+ CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+ CT_KERNEL="linux"
+-CT_KERNEL_VERSION="2.6.38.4"
++CT_KERNEL_VERSION="2.6.38.8"
+ # CT_KERNEL_bare_metal is not set
+ CT_KERNEL_linux=y
+ # CT_KERNEL_mingw32 is not set
+Index: buildroot/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+===================================================================
+--- buildroot.orig/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc 2011-10-06 10:56:56.000000000 +0200
++++ buildroot/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc 2011-10-06 10:57:10.000000000 +0200
+@@ -194,7 +194,7 @@
+ # CT_MINGW32 is not set
+ CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+ CT_KERNEL="linux"
+-CT_KERNEL_VERSION="2.6.38.4"
++CT_KERNEL_VERSION="2.6.38.8"
+ # CT_KERNEL_bare_metal is not set
+ CT_KERNEL_linux=y
+ # CT_KERNEL_mingw32 is not set
+Index: buildroot/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+===================================================================
+--- buildroot.orig/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc 2011-10-06 10:56:22.000000000 +0200
++++ buildroot/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc 2011-10-06 10:56:39.000000000 +0200
+@@ -194,7 +194,7 @@
+ # CT_MINGW32 is not set
+ CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+ CT_KERNEL="linux"
+-CT_KERNEL_VERSION="2.6.38.4"
++CT_KERNEL_VERSION="2.6.38.8"
+ # CT_KERNEL_bare_metal is not set
+ CT_KERNEL_linux=y
+ # CT_KERNEL_mingw32 is not set
hooks/post-receive
--
armadeus
|
