[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2603-gb51aab5
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2603-gb51aab5
|
From: jorasse <jo...@us...> - 2011-12-02 15:32:29
|
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 b51aab5748ad2428096c6868d3bf96583115c283 (commit)
from 55286b60475974a4432af12c0ff2d9605cc8529d (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 b51aab5748ad2428096c6868d3bf96583115c283
Author: Eric Jarrige <eri...@ar...>
Date: Fri Dec 2 16:31:57 2011 +0100
[BUILDROOT] update elftosb toolset to be align with the BR convention
-----------------------------------------------------------------------
Summary of changes:
buildroot/toolchain/elftosb/Config.in | 7 --
buildroot/toolchain/elftosb/elftosb.mk | 50 ------------
.../2011.05/165-elftosb-add_host_tools.patch | 80 +++++++++++---------
patches/buildroot/2011.05/cleanup_buildroot.sh | 1 +
4 files changed, 45 insertions(+), 93 deletions(-)
delete mode 100644 buildroot/toolchain/elftosb/Config.in
delete mode 100644 buildroot/toolchain/elftosb/elftosb.mk
diff --git a/buildroot/toolchain/elftosb/Config.in b/buildroot/toolchain/elftosb/Config.in
deleted file mode 100644
index 590a745..0000000
--- a/buildroot/toolchain/elftosb/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_ELFTOSB
- bool "Enable elftosb freescale host toolset?"
- depends on BR2_arm
- help
- Freescale host toolset to generate bootcode for some iMX CPUs:
- iMX28...
-
diff --git a/buildroot/toolchain/elftosb/elftosb.mk b/buildroot/toolchain/elftosb/elftosb.mk
deleted file mode 100644
index 4d78018..0000000
--- a/buildroot/toolchain/elftosb/elftosb.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#############################################################
-#
-# elftosb
-#
-#############################################################
-ELFTOSB_VERSION:=10.12.01
-ELFTOSB_SOURCE:=elftosb-$(ELFTOSB_VERSION).tar.gz
-ELFTOSB_CAT:=$(ZCAT)
-ELFTOSB_SITE:=http://foss.doredevelopment.dk/mirrors/imx/
-ELFTOSB_PATCH_DIR:=toolchain/elftosb
-ELFTOSB_DIR:=$(TOOLCHAIN_DIR)/elftosb-$(ELFTOSB_VERSION)
-ELFTOSB_BINARY_PATH:=bld/linux
-
-$(DL_DIR)/$(ELFTOSB_SOURCE):
- $(WGET) -P $(DL_DIR) $(ELFTOSB_SITE)/$(ELFTOSB_SOURCE)
-
-$(ELFTOSB_DIR)/.unpacked: $(DL_DIR)/$(ELFTOSB_SOURCE)
- mkdir -p $(TOOLCHAIN_DIR)
- $(ELFTOSB_CAT) $(DL_DIR)/$(ELFTOSB_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(ELFTOSB_DIR)/.patched: $(ELFTOSB_DIR)/.unpacked
- toolchain/patch-kernel.sh $(ELFTOSB_DIR) $(ELFTOSB_PATCH_DIR) \*.patch
- touch $@
-
-$(ELFTOSB_DIR)/.configured: $(ELFTOSB_DIR)/.patched
- touch $@
-
-$(ELFTOSB_DIR)/.compiled: $(ELFTOSB_DIR)/.configured
- $(MAKE) LIBS="-lstdc++ -lm" -C $(ELFTOSB_DIR) all
- touch $@
-
-$(STAMP_DIR)/elftosb_host_installed: $(ELFTOSB_DIR)/.compiled
- $(INSTALL) -D -m 0755 $(ELFTOSB_DIR)/$(ELFTOSB_BINARY_PATH)/elftosb $(HOST_DIR)/usr/bin/elftosb
- $(INSTALL) -D -m 0755 $(ELFTOSB_DIR)/$(ELFTOSB_BINARY_PATH)/keygen $(HOST_DIR)/usr/bin/keygen
- $(INSTALL) -D -m 0755 $(ELFTOSB_DIR)/$(ELFTOSB_BINARY_PATH)/sbtool $(HOST_DIR)/usr/bin/sbtool
- touch $@
-
-elftosb: $(STAMP_DIR)/elftosb_host_installed
-
-elftosb-clean:
- rm -rf $(ELFTOSB_DIR)/$(ELFTOSB_BINARY_PATH)
-
-elftosb-dirclean:
- rm -rf $(ELFTOSB_DIR)
-
-ifeq ($(BR2_ELFTOSB),y)
-TARGETS+=elftosb
-endif
-
diff --git a/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch b/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
index 83fe004..c7854b7 100644
--- a/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
+++ b/patches/buildroot/2011.05/165-elftosb-add_host_tools.patch
@@ -2,41 +2,49 @@ Add Freescale elftosb tools
Signed-off-by: Eric Jarrige <eri...@ar...>
-Index: buildroot/toolchain/Config.in
+Index: buildroot/package/elftosb/Config.in
===================================================================
---- buildroot.ori/toolchain/Config.in 2011-05-27 16:18:21.000000000 +0200
-+++ buildroot/toolchain/Config.in 2011-12-01 12:02:24.990794919 +0100
-@@ -33,5 +33,6 @@ source "toolchain/toolchain-external/Con
- source "toolchain/toolchain-crosstool-ng/Config.in"
- source "toolchain/toolchain-common.in"
- source "toolchain/toolchain-buildroot/Config.in.2"
-+source "toolchain/elftosb/Config.in"
-
- endmenu
-Index: buildroot/toolchain/toolchain-buildroot.mk
+--- buildroot/package/elftosb/Config.in 1970-01-01 01:00:00.000000000 +0100
++++ buildroot/package/elftosb/Config.in 2011-12-02 12:00:57.720649075 +0100
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_ELFTOSB
++ bool "Enable elftosb freescale host toolset?"
++ depends on BR2_arm
++ help
++ Freescale host toolset to generate bootcode for some iMX CPUs:
++ iMX28...
++
+Index: buildroot/package/elftosb/elftosb.mk
===================================================================
---- buildroot.ori/toolchain/toolchain-buildroot.mk 2011-05-27 16:18:21.000000000 +0200
-+++ buildroot/toolchain/toolchain-buildroot.mk 2011-12-01 12:03:41.897893700 +0100
-@@ -7,3 +7,4 @@ include toolchain/gdb/gdb.mk
- include toolchain/kernel-headers/kernel-headers.mk
- include toolchain/mklibs/mklibs.mk
- include toolchain/uClibc/uclibc.mk
-+include toolchain/elftosb/elftosb.mk
-Index: buildroot/toolchain/toolchain-crosstool-ng.mk
-===================================================================
---- buildroot.ori/toolchain/toolchain-crosstool-ng.mk 2011-05-27 16:18:21.000000000 +0200
-+++ buildroot/toolchain/toolchain-crosstool-ng.mk 2011-12-01 12:03:50.636437731 +0100
-@@ -9,3 +9,4 @@ include toolchain/gdb/gdb.mk
- include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
- include toolchain/mklibs/mklibs.mk
- include toolchain/uClibc/uclibc.mk
-+include toolchain/elftosb/elftosb.mk
-Index: buildroot/toolchain/toolchain-external.mk
-===================================================================
---- buildroot.ori/toolchain/toolchain-external.mk 2011-05-27 16:18:21.000000000 +0200
-+++ buildroot/toolchain/toolchain-external.mk 2011-12-01 12:03:59.805598730 +0100
-@@ -9,3 +9,4 @@ include toolchain/kernel-headers/kernel-
- include toolchain/mklibs/mklibs.mk
- include toolchain/toolchain-external/ext-tool.mk
- include toolchain/uClibc/uclibc.mk
-+include toolchain/elftosb/elftosb.mk
+--- buildroot/package/elftosb/elftosb.mk 1970-01-01 01:00:00.000000000 +0100
++++ buildroot/package/elftosb/elftosb.mk 2011-12-02 16:09:12.650212706 +0100
+@@ -0,0 +1,29 @@
++#############################################################
++#
++# elftosb
++#
++#############################################################
++ELFTOSB_VERSION = 10.12.01
++ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
++ELFTOSB_SITE = http://foss.doredevelopment.dk/mirrors/imx/
++
++define HOST_ELFTOSB_BUILD_CMDS
++ $(MAKE) LIBS="-lstdc++ -lm" -C $(@D) all
++endef
++
++define HOST_ELFTOSB_INSTALL_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/bld/linux/elftosb $(HOST_DIR)/usr/bin/elftosb
++ $(INSTALL) -D -m 0755 $(@D)/bld/linux/keygen $(HOST_DIR)/usr/bin/keygen
++ $(INSTALL) -D -m 0755 $(@D)/bld/linux/sbtool $(HOST_DIR)/usr/bin/sbtool
++endef
++
++define HOST_ELFTOSB_CLEAN_CMDS
++ rm -rf $(@D)/bld/linux
++ rm -rf $(HOST_DIR)/usr/bin/elftosb
++ rm -rf $(HOST_DIR)/usr/bin/keygen
++ rm -rf $(HOST_DIR)/usr/bin/sbtool
++endef
++
++$(eval $(call GENTARGETS,package,elftosb))
++$(eval $(call GENTARGETS,package,elftosb,host))
++
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index e14b991..5166b62 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -59,3 +59,4 @@ rm -f buildroot/package/busybox/busybox-1.16.2/*.patch
rm -f buildroot/target/generic/Config.in
rm -rf buildroot/package/libmodbus
rm -rf buildroot/package/nanocom
+rm -rf buildroot/package/elftosb
hooks/post-receive
--
armadeus
|
