[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-190-gac1dc3a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-190-gac1dc3a
|
From: Julien B a. A. <ar...@us...> - 2010-02-11 11:02:43
|
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 ac1dc3aa6157acaf797cfa640dbee0bc00a3e261 (commit)
via 1276f6f26edb9290765aceae3d7d3d3a203eb6c0 (commit)
via ab2e9dac07e5b6d2836055ead9722c5290f85653 (commit)
from b85dd01b87c06f451feae95331533709c7bbf6f6 (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 ac1dc3aa6157acaf797cfa640dbee0bc00a3e261
Merge: 1276f6f26edb9290765aceae3d7d3d3a203eb6c0 b85dd01b87c06f451feae95331533709c7bbf6f6
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 12:02:08 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 1276f6f26edb9290765aceae3d7d3d3a203eb6c0
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 12:01:31 2010 +0100
[BUILDROOT] [2010.02] Adapt main Makefile.in for new BR
commit ab2e9dac07e5b6d2836055ead9722c5290f85653
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 10:56:49 2010 +0100
[BUILDROOT] [2010.02] Makes Linux use the correct config file again
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +-
Makefile.in | 54 +++++++++++++------
...config.sh-sets-THIS_MINOR-to-0-by-default.patch | 29 +++++++++++
3 files changed, 69 insertions(+), 20 deletions(-)
create mode 100644 patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
diff --git a/Makefile b/Makefile
index 17fc7d3..592a7a3 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ include ./Makefile.in
#--- User configurable stuff:
#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-#BUILDROOT_VERSION:=20100129
+#BUILDROOT_VERSION:=20100211
#BUILDROOT_PATCH_DIR = patches/buildroot/2010.02
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
@@ -83,9 +83,9 @@ help:
@echo ' source - download all sources needed for offline-build'
@echo ' source-check - check all packages for valid download URLs'
@echo
- @echo 'See www.armadeus.org for further armadeus details'
+ @echo 'See http://www.armadeus.org for further Armadeus details'
@echo 'See ./buildroot/docs/README and ./buildroot/docs/buildroot.html'
- @echo ' for further buildroot details'
+ @echo ' for further Buildroot details'
@echo
diff --git a/Makefile.in b/Makefile.in
index aef85c8..c3910b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,18 +5,26 @@
#
ifeq ($(ARMADEUS_BASE_DIR),)
-ARMADEUS_BASE_DIR=$(shell pwd)
+ARMADEUS_BASE_DIR:=$(shell pwd)
endif
-BUILDROOT_DIR=$(ARMADEUS_BASE_DIR)/buildroot
+BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
-include $(BUILDROOT_DIR)/.config
+ifeq ($(BR2_VERSION),"0.10.0-svn")
+# Old buildroot:
ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
ARMADEUS_U_BOOT_VERSION:=$(shell grep "U_BOOT_VERSION:=" $(BUILDROOT_DIR)/target/u-boot/Makefile.in 2>/dev/null | cut -d = -f 2)
-ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_PROJECT_NAME:=$(shell echo $(BR2_PROJECT))
-ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
ARMADEUS_UCLIBC_VERSION:=0.9.29
+else
+# New buildroot:
+ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_DEFAULT_KERNEL_VERSION))
+ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_UBOOT_VERSION))
+ARMADEUS_UCLIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
+endif
+ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
+ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
ARMADEUS_SDL_VERSION:=$(shell grep "SDL_VERSION:=" $(BUILDROOT_DIR)/package/sdl/sdl.mk 2>/dev/null | cut -d = -f 2)
ifeq ($(ARMADEUS_SDL_VERSION),)
@@ -24,16 +32,28 @@ ARMADEUS_SDL_VERSION:=SDL_NOT_INSTALLED
endif
ARMADEUS_PATCH_DIR=patches
-ARMADEUS_LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)/linux-$(ARMADEUS_LINUX_VERSION)
-ARMADEUS_LINUX_PATCH_DIR=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-patches/$(ARMADEUS_LINUX_VERSION)
-ARMADEUS_U_BOOT_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
-ARMADEUS_UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
-ARMADEUS_BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)/
-ARMADEUS_ROOTFS_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)/root
-ARMADEUS_BINARIES=$(BUILDROOT_DIR)/binaries/$(ARMADEUS_PROJECT_NAME)
-ARMADEUS_ROOTFS_TAR=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
-ARMADEUS_STAGING_DIR=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)/staging_dir
-ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_STAGING_DIR)/usr/bin
-
-ARMADEUS_BUILD_DIR=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)
-ARMADEUS_SDL_DIR=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
+ifeq ($(BR2_VERSION),"0.10.0-svn")
+BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)
+BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)
+BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)
+ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/binaries/$(ARMADEUS_PROJECT_NAME)
+else
+BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
+BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/output/toolchain
+BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
+ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/output/images
+endif
+
+ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
+ARMADEUS_LINUX_PATCH_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-patches/$(ARMADEUS_LINUX_VERSION)
+ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
+ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
+ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
+ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/root
+ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
+ARMADEUS_STAGING_DIR:=$(BUILDROOT_BUILD_DIR)/staging_dir
+ARMADEUS_TOOLCHAIN_PATH:=$(ARMADEUS_STAGING_DIR)/usr/bin
+
+ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
+ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
+
diff --git a/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch b/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
new file mode 100644
index 0000000..edf01db
--- /dev/null
+++ b/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
@@ -0,0 +1,29 @@
+From 13cef349fdc8d01d09e8b1d62f1dd32376d53523 Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Tue, 9 Feb 2010 15:18:29 +0100
+Subject: [PATCH] get_linux_config.sh: sets THIS_MINOR to 0 if not valid.
+
+Sets THIS_MINOR to 0 if not valid, ie when processing a Linux config file who do not
+have a minor number extension; ex: "<name>-linux-2.6.<major>.config"
+Otherwise bash is raising an error/exception (line 59) and script can not complete.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ scripts/get_linux_config.sh | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/get_linux_config.sh b/scripts/get_linux_config.sh
+index 1950e9d..5cd0e37 100755
+--- a/scripts/get_linux_config.sh
++++ b/scripts/get_linux_config.sh
+@@ -35,6 +35,7 @@ function linux_version()
+ KERNEL=`echo ${KCONFIG} | sed s/.*linux-2.6./linux-2.6./g -`
+ THIS_MAJOR=${KERNEL:10:2}
+ THIS_MINOR=${KERNEL:13}
++ THIS_MINOR=${THIS_MINOR:=0}
+ }
+
+ # Try to be careful...
+--
+1.6.0.4
+
hooks/post-receive
--
armadeus
|
