[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-118-g1832d5f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-118-g1832d5f
|
From: Julien B a. A. <ar...@us...> - 2012-03-09 19:57:54
|
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 1832d5f51bde806af48fd6f4bad4dba5184ce30d (commit)
via df9b06754a5ee12be3a0eba1a8fbc5356473cc3b (commit)
from c0d1b01a67909bb68e19e2a680764fbb85ebc7ef (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 1832d5f51bde806af48fd6f4bad4dba5184ce30d
Merge: df9b067 c0d1b01
Author: Julien Boibessot <jul...@ar...>
Date: Fri Mar 9 20:48:21 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit df9b06754a5ee12be3a0eba1a8fbc5356473cc3b
Author: Julien Boibessot <jul...@ar...>
Date: Fri Mar 9 20:35:05 2012 +0100
[BUILD] Updates build scripts for BR 2012.02
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 ++-
Makefile.in | 6 ++++-
.../051g-u-boot-add_u-boot-unpacked_target.patch | 15 -----------
...x-adds_linux26-patched_target_to_Makefile.patch | 15 -----------
scripts/quiltify.sh | 26 ++++++++++++++++----
scripts/show_build_infos.sh | 3 ++
6 files changed, 32 insertions(+), 37 deletions(-)
delete mode 100644 patches/buildroot/2012.02/051g-u-boot-add_u-boot-unpacked_target.patch
delete mode 100644 patches/buildroot/2012.02/052-linux-adds_linux26-patched_target_to_Makefile.patch
diff --git a/Makefile b/Makefile
index 42bdabd..20c4e1c 100644
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,13 @@
# You shouldn't need to mess with anything beyond this point...
#--------------------------------------------------------------
-include ./Makefile.in
ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
#BUILDROOT_VERSION:=2012.02
BUILDROOT_VERSION:=2011.05
+include ./Makefile.in
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
@@ -198,6 +198,7 @@ buildroot-dirclean:
# Generate shell's most useful variables:
shell_env:
@echo ARMADEUS_BUILDROOT_DIR=$(BUILDROOT_DIR) > $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_BUILDROOT_VERSION=$(BUILDROOT_VERSION) > $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BUILDROOT_PATCH_DIR=$(BUILDROOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@@ -206,6 +207,7 @@ shell_env:
@echo ARMADEUS_LINUX_MAIN_VERSION=$(ARMADEUS_LINUX_MAIN_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_DIR=$(ARMADEUS_U_BOOT_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_VERSION=$(ARMADEUS_U_BOOT_VERSION) >> $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_U_BOOT_CUSTOM_VERSION=$(ARMADEUS_U_BOOT_CUSTOM_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_ROOTFS_DIR=$(ARMADEUS_ROOTFS_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BINARIES=$(ARMADEUS_BINARIES) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_ROOTFS_TAR=$(ARMADEUS_ROOTFS_TAR) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index 73dbfa7..34cb796 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,6 @@
# calling directory before including this file !!
#
-
ifeq ($(ARMADEUS_BASE_DIR),)
ARMADEUS_BASE_DIR:=$(shell pwd)
endif
@@ -15,6 +14,7 @@ BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
ARMADEUS_LINUX_MAIN_VERSION:=$(shell echo $(ARMADEUS_LINUX_VERSION) | cut -d . -f 1-3)
ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
+ARMADEUS_U_BOOT_CUSTOM_VERSION = $(shell echo $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) | awk '{ print substr( $$0, length($$0) - 6, 7 ) }')
ARMADEUS_LIBC_NAME=unknown
ARMADEUS_LIBC_VERSION=X.Y
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
@@ -63,7 +63,11 @@ ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
+ifeq ($(BUILDROOT_VERSION),2011.05)
ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
+else
+ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
+endif
ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
ARMADEUS_LINUX_CONFIG:=$(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
diff --git a/patches/buildroot/2012.02/051g-u-boot-add_u-boot-unpacked_target.patch b/patches/buildroot/2012.02/051g-u-boot-add_u-boot-unpacked_target.patch
deleted file mode 100644
index c358510..0000000
--- a/patches/buildroot/2012.02/051g-u-boot-add_u-boot-unpacked_target.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Specific for Armadeus (needed by quiltify.sh script).
-
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot.orig/boot/uboot/uboot.mk 2012-02-21 16:44:26.000000000 +0100
-+++ buildroot/boot/uboot/uboot.mk 2012-02-21 16:44:28.000000000 +0100
-@@ -58,6 +58,8 @@
- @echo '#define $(strip $(1)) $(call qstrip,$(2))' >> $(@D)/include/config.h)
- endef
-
-+u-boot-src-unpacked: $(@D)/.stamp_extracted
-+
- ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
- define UBOOT_APPLY_CUSTOM_PATCHES
- support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
diff --git a/patches/buildroot/2012.02/052-linux-adds_linux26-patched_target_to_Makefile.patch b/patches/buildroot/2012.02/052-linux-adds_linux26-patched_target_to_Makefile.patch
deleted file mode 100644
index 105b111..0000000
--- a/patches/buildroot/2012.02/052-linux-adds_linux26-patched_target_to_Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Specific for Armadeus (needed by script/quiltify.sh)
-
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk 2012-02-21 16:44:16.000000000 +0100
-+++ buildroot/linux/linux.mk 2012-02-21 16:44:30.000000000 +0100
-@@ -118,6 +118,8 @@
-
- LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES
-
-+linux26-patched: $(@D)/.stamp_extracted
-+ touch $(@D)/.stamp_patched
-
- ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
- KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 2cf7e2d..d0e6dd9 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -65,14 +65,29 @@ if [ "$answer" == "Buildroot" ]; then
QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_PATCH_DIR
elif [ "$answer" == "U-Boot" ]; then
QUILT_TARGET_NAME="U-Boot"
- QUILT_MAKEFILE_TARGET="u-boot-src-unpacked"
- QUILT_MAKEFILE_TARGET_TOUCH=".unpacked .patched"
- QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_VERSION"
+ if [ "$ARMADEUS_BUILDROOT_VERSION" == "2011.05" ]; then
+ QUILT_MAKEFILE_TARGET="u-boot-src-unpacked"
+ QUILT_MAKEFILE_TARGET_TOUCH=".unpacked .patched"
+ else
+ QUILT_MAKEFILE_TARGET="uboot-extract"
+ QUILT_MAKEFILE_TARGET_TOUCH=".stamp_patched"
+ fi
QUILT_TARGET_DIR=$ARMADEUS_U_BOOT_DIR
- QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/u-boot/$ARMADEUS_U_BOOT_VERSION
+ if [ "$ARMADEUS_U_BOOT_VERSION" == "custom" ]; then
+ QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/u-boot/$ARMADEUS_U_BOOT_CUSTOM_VERSION
+ QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_CUSTOM_VERSION"
+ else
+ QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/u-boot/$ARMADEUS_U_BOOT_VERSION
+ QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_VERSION"
+ fi
else
QUILT_TARGET_NAME="Linux kernel"
- QUILT_MAKEFILE_TARGET="linux26-patched"
+ if [ "$ARMADEUS_BUILDROOT_VERSION" == "2011.05" ]; then
+ QUILT_MAKEFILE_TARGET="linux26-patched"
+ else
+ QUILT_MAKEFILE_TARGET="linux-extract"
+ QUILT_MAKEFILE_TARGET_TOUCH=".stamp_patched"
+ fi
QUILT_TARGET_DIR=$ARMADEUS_LINUX_DIR
QUILT_TARGET_PATCH_DIR=$ARMADEUS_LINUX_PATCH_DIR
fi
@@ -129,6 +144,7 @@ echo "Getting sources... (make $QUILT_MAKEFILE_TARGET)"
make $QUILT_MAKEFILE_TARGET
if [ "$?" != 0 ]; then
echo "Failed to get sources, please check your view !!"
+ exit 1
fi
# Import patches
diff --git a/scripts/show_build_infos.sh b/scripts/show_build_infos.sh
index e5dd44b..93964d7 100755
--- a/scripts/show_build_infos.sh
+++ b/scripts/show_build_infos.sh
@@ -7,6 +7,9 @@ if [ ! -f "$MYDIR/../armadeus_env.sh" ]; then
fi
source $MYDIR/../armadeus_env.sh
+if [ "$ARMADEUS_U_BOOT_VERSION" == "custom" ]; then
+ ARMADEUS_U_BOOT_VERSION="custom ($ARMADEUS_U_BOOT_CUSTOM_VERSION)"
+fi
echo -en "\033[1m"
echo ""
hooks/post-receive
--
armadeus
|
