[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-149-g9948cb4
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-149-g9948cb4
|
From: Julien B a. A. <ar...@us...> - 2013-02-08 11:10:53
|
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 9948cb451a6678b55d996dde216ab73f7cc26750 (commit)
from 70bf7884a4fdeed08185f13dbeb556bf5a19b59c (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 9948cb451a6678b55d996dde216ab73f7cc26750
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 8 12:10:06 2013 +0100
[BUILD] Fixes quiltify for U-Boot
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 ++
Makefile.in | 2 ++
buildroot/target/device/armadeus/Makefile.in | 1 +
scripts/quiltify.sh | 7 +++++++
4 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 75d5200..a8973f3 100644
--- a/Makefile
+++ b/Makefile
@@ -200,6 +200,7 @@ shell_env:
@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_U_BOOT_CONFIG=$(ARMADEUS_U_BOOT_CONFIG) >> $(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)
@@ -214,6 +215,7 @@ shell_env:
@echo ARMADEUS_BUSYBOX_VERSION=$(ARMADEUS_BUSYBOX_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BSP_VERSION=$(ARMADEUS_BSP_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BOARD_NAME=$(ARMADEUS_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_U_BOOT_BOARD_NAME=$(ARMADEUS_U_BOOT_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_DL_DIR=$(BR2_DL_DIR) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index a93db1e..ae0c830 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ ARMADEUS_LIBC_NAME=glibc
endif
ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
+ARMADEUS_U_BOOT_BOARD_NAME:=$(shell echo $(BR2_TARGET_UBOOT_BOARDNAME))
ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
ifeq ($(BR2_PACKAGE_SDL),y)
@@ -67,6 +68,7 @@ ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERS
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
+ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE))
ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_OUTPUT_DIR)/host/usr/bin
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 0232231..79803ca 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,6 +9,7 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
# for old BR:
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
+# !! if you modify the following, please also update scripts/quiltify.sh !!
define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
$(ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),))
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 8f7da8e..77e2e6b 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -71,6 +71,7 @@ elif [ "$answer" == "U-Boot" ]; then
else
QUILT_MAKEFILE_TARGET="uboot-extract"
QUILT_MAKEFILE_TARGET_TOUCH=".stamp_patched"
+ QUILT_POST_PATCH_HOOK="cp -pf $ARMADEUS_U_BOOT_CONFIG $ARMADEUS_U_BOOT_DIR/include/configs/"$ARMADEUS_U_BOOT_BOARD_NAME".h"
fi
QUILT_TARGET_DIR=$ARMADEUS_U_BOOT_DIR
if [ "$ARMADEUS_U_BOOT_VERSION" == "custom" ]; then
@@ -192,6 +193,12 @@ else
fi
popd
+# Hooks
+if [ "$QUILT_POST_PATCH_HOOK" != "" ]; then
+ echo "Applying hook: $QUILT_POST_PATCH_HOOK"
+ $QUILT_POST_PATCH_HOOK
+fi
+
# Build it
echo -e "\n--- Your "$QUILT_TARGET_NAME" is \"quiltified\" ! I will now compile it...\n"
sleep 2
hooks/post-receive
--
armadeus
|
