[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-121-g801af28
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2012-03-12 11:13:04
|
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 801af28ec24b76e609bd0029e38962a2e332411d (commit)
via 4ed1e85ebfd61dac85a0457e31f8001332f16e43 (commit)
via 54487038760fb3beebe6706a8f0f3cc85699558c (commit)
from 1832d5f51bde806af48fd6f4bad4dba5184ce30d (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 801af28ec24b76e609bd0029e38962a2e332411d
Merge: 4ed1e85 1832d5f
Author: Eric Jarrige <eri...@ar...>
Date: Mon Mar 12 12:22:54 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 4ed1e85ebfd61dac85a0457e31f8001332f16e43
Author: Eric Jarrige <eri...@ar...>
Date: Mon Mar 12 12:21:00 2012 +0100
[BUILDROOT] update elftosb patch name
commit 54487038760fb3beebe6706a8f0f3cc85699558c
Author: Eric Jarrige <eri...@ar...>
Date: Mon Mar 12 12:15:38 2012 +0100
[BUILDROOT] Rework elftosb package for BR2012.02
-----------------------------------------------------------------------
Summary of changes:
.../165-Add-Freescale-elftosb-host-package.patch | 70 ++++++++++++++++++
.../2012.02/165-elftosb-add_host_tools.patch | 74 --------------------
2 files changed, 70 insertions(+), 74 deletions(-)
create mode 100644 patches/buildroot/2012.02/165-Add-Freescale-elftosb-host-package.patch
delete mode 100644 patches/buildroot/2012.02/165-elftosb-add_host_tools.patch
diff --git a/patches/buildroot/2012.02/165-Add-Freescale-elftosb-host-package.patch b/patches/buildroot/2012.02/165-Add-Freescale-elftosb-host-package.patch
new file mode 100644
index 0000000..b2fbfb8
--- /dev/null
+++ b/patches/buildroot/2012.02/165-Add-Freescale-elftosb-host-package.patch
@@ -0,0 +1,70 @@
+From 25876250d2d0fe7fffa0855b65ea2b824618779e Mon Sep 17 00:00:00 2001
+From: Eric Jarrige <eri...@ar...>
+Date: Mon, 12 Mar 2012 11:57:34 +0100
+Subject: [PATCH] Add (Freescale) elftosb host package
+
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ package/elftosb/elftosb.mk | 28 ++++++++++++++++++++
+ .../elftosb/elftosb10.12.01-fixes_includes.patch | 13 +++++++++
+ 2 files changed, 41 insertions(+), 0 deletions(-)
+ create mode 100644 package/elftosb/elftosb.mk
+ create mode 100644 package/elftosb/elftosb10.12.01-fixes_includes.patch
+
+diff --git a/package/elftosb/elftosb.mk b/package/elftosb/elftosb.mk
+new file mode 100644
+index 0000000..75b95a5
+--- /dev/null
++++ b/package/elftosb/elftosb.mk
+@@ -0,0 +1,28 @@
++#############################################################
++#
++# elftosb
++#
++#############################################################
++ELFTOSB_VERSION = 10.12.01
++ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
++ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
++
++define HOST_ELFTOSB_BUILD_CMDS
++ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) all
++endef
++
++define HOST_ELFTOSB_INSTALL_CMDS
++ $(INSTALL) -D $(@D)/bld/linux/elftosb $(HOST_DIR)/usr/bin/elftosb
++ $(INSTALL) -D $(@D)/bld/linux/keygen $(HOST_DIR)/usr/bin/keygen
++ $(INSTALL) -D $(@D)/bld/linux/sbtool $(HOST_DIR)/usr/bin/sbtool
++endef
++
++define HOST_ELFTOSB_CLEAN_CMDS
++ rm -rf $(@D)/bld/linux
++ rm -f $(HOST_DIR)/usr/bin/elftosb
++ rm -f $(HOST_DIR)/usr/bin/keygen
++ rm -f $(HOST_DIR)/usr/bin/sbtool
++endef
++
++$(eval $(call GENTARGETS,host))
++
+diff --git a/package/elftosb/elftosb10.12.01-fixes_includes.patch b/package/elftosb/elftosb10.12.01-fixes_includes.patch
+new file mode 100644
+index 0000000..5e31233
+--- /dev/null
++++ b/package/elftosb/elftosb10.12.01-fixes_includes.patch
+@@ -0,0 +1,13 @@
++Index: host-elftosb-10.12.01/common/stdafx.h
++===================================================================
++--- host-elftosb-10.12.01.orig/common/stdafx.h 2012-01-30 12:43:35.000000000 +0100
+++++ host-elftosb-10.12.01/common/stdafx.h 2012-01-30 12:43:54.000000000 +0100
++@@ -27,7 +27,7 @@
++ // For Linux systems only, types.h only defines the signed
++ // integer types. This is not professional code.
++ // Update: They are defined in the header files in the more recent version of redhat enterprise gcc.
++-#include "/usr/include/sys/types.h"
+++#include <sys/types.h>
++ #include <stdint.h>
++ //typedef unsigned long uint32_t;
++ //typedef unsigned short uint16_t;
+--
+1.7.2.5
+
diff --git a/patches/buildroot/2012.02/165-elftosb-add_host_tools.patch b/patches/buildroot/2012.02/165-elftosb-add_host_tools.patch
deleted file mode 100644
index 0f56591..0000000
--- a/patches/buildroot/2012.02/165-elftosb-add_host_tools.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Add Freescale elftosb tools
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
-
-Index: buildroot/package/elftosb/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/elftosb/Config.in 2012-02-21 16:46:11.000000000 +0100
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_ELFTOSB
-+ bool "elftosb"
-+ depends on BR2_arm
-+ help
-+ Freescale host toolset to generate bootcode for some i.MX CPUs:
-+ iMX28...
-+
-Index: buildroot/package/elftosb/elftosb.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/elftosb/elftosb.mk 2012-02-21 16:46:11.000000000 +0100
-@@ -0,0 +1,35 @@
-+#############################################################
-+#
-+# elftosb
-+#
-+#############################################################
-+ELFTOSB_VERSION = 10.12.01
-+ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
-+ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
-+
-+ELFTOSB_HOST_CFLAGS = $(HOST_CFLAGS)
-+ELFTOSB_HOST_CFLAGS += -I${@D}/elftosb2 -I${@D}/keygen -I${@D}/sbtool -I${@D}/common
-+ELFTOSB_HOST_CFLAGS += -DLinux
-+
-+define HOST_ELFTOSB_BUILD_CMDS
-+ $(TARGET_MAKE_ENV) $(MAKE) \
-+ CFLAGS="$(ELFTOSB_HOST_CFLAGS)" \
-+ -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))
-+$(eval $(call GENTARGETS,host))
-+
-Index: buildroot/package/elftosb/elftosb10.12.01-fixes_includes.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/elftosb/elftosb10.12.01-fixes_includes.patch 2012-02-21 16:46:11.000000000 +0100
-@@ -0,0 +1,13 @@
-+Index: host-elftosb-10.12.01/common/stdafx.h
-+===================================================================
-+--- host-elftosb-10.12.01.orig/common/stdafx.h 2012-01-30 12:43:35.000000000 +0100
-++++ host-elftosb-10.12.01/common/stdafx.h 2012-01-30 12:43:54.000000000 +0100
-+@@ -27,7 +27,7 @@
-+ // For Linux systems only, types.h only defines the signed
-+ // integer types. This is not professional code.
-+ // Update: They are defined in the header files in the more recent version of redhat enterprise gcc.
-+-#include "/usr/include/sys/types.h"
-++#include <sys/types.h>
-+ #include <stdint.h>
-+ //typedef unsigned long uint32_t;
-+ //typedef unsigned short uint16_t;
hooks/post-receive
--
armadeus
|