[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-87-gf10d91b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-87-gf10d91b
|
From: Julien B a. A. <ar...@us...> - 2012-03-02 11:23:25
|
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 f10d91b02b680c81104ce4223de277abaf52d416 (commit)
via 8f98e18f43373ef3ff65b429ae3067a79a3c4905 (commit)
via 0a22ae592e731aae8e523cdf810db5f87bc441a1 (commit)
from 30e619d2d46d6aaa5e5e5f1cb1cb7e7ab12de4f0 (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 f10d91b02b680c81104ce4223de277abaf52d416
Merge: 8f98e18 30e619d
Author: Julien Boibessot <jul...@ar...>
Date: Fri Mar 2 12:22:45 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 8f98e18f43373ef3ff65b429ae3067a79a3c4905
Author: Julien Boibessot <jul...@ar...>
Date: Fri Mar 2 12:22:22 2012 +0100
[BUILD] Makes Buildroot tarball download more error proof
commit 0a22ae592e731aae8e523cdf810db5f87bc441a1
Author: Julien Boibessot <jul...@ar...>
Date: Fri Mar 2 12:21:18 2012 +0100
[BUILDROOT] Move imx-lib package as BR patch
-----------------------------------------------------------------------
Summary of changes:
Makefile | 9 ++-
.../package/armadeus/freescale-tools/imx-lib.mk | 45 ------------
.../2011.05/174-imx-lib-add_package.patch | 73 ++++++++++++++++++++
.../2012.02/174-imx-lib-add_package.patch | 73 ++++++++++++++++++++
4 files changed, 152 insertions(+), 48 deletions(-)
delete mode 100644 buildroot/package/armadeus/freescale-tools/imx-lib.mk
create mode 100644 patches/buildroot/2011.05/174-imx-lib-add_package.patch
create mode 100644 patches/buildroot/2012.02/174-imx-lib-add_package.patch
diff --git a/Makefile b/Makefile
index 456b59c..42bdabd 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
+#BUILDROOT_VERSION:=2012.02
BUILDROOT_VERSION:=2011.05
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
@@ -38,13 +39,14 @@ BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
PATCH_DIR = patches
BUILDROOT_FILE_PATH:=downloads
TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore --strip-component=1 -xf
-ifeq ($(BUILDROOT_VERSION),2012.02-rc1)
+ifeq ($(BUILDROOT_VERSION),2012.02)
BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/support/scripts/apply-patches.sh
else
BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/toolchain/patch-kernel.sh
endif
ARMADEUS_ENV_FILE:=$(ARMADEUS_TOPDIR)/armadeus_env.sh
-
+WGET = wget --passive-ftp --tries=3
+ARMADEUS_FTP_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
@@ -100,7 +102,8 @@ help:
$(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE):
mkdir -p $(BUILDROOT_FILE_PATH)
- wget --passive-ftp --tries=3 -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE)
+ $(WGET) -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE) \
+ || $(WGET) -P $(BUILDROOT_FILE_PATH) $(ARMADEUS_FTP_SITE)/$(BUILDROOT_SOURCE)
buildroot-sources: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE)
diff --git a/buildroot/package/armadeus/freescale-tools/imx-lib.mk b/buildroot/package/armadeus/freescale-tools/imx-lib.mk
deleted file mode 100644
index 14f27fd..0000000
--- a/buildroot/package/armadeus/freescale-tools/imx-lib.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#############################################################
-#
-# imx-lib (helpers librairies from Freescale BSP)
-#
-#############################################################
-IMX_LIB_VERSION = 10.11.01
-IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
-IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
-IMX_LIB_INSTALL_STAGING = YES
-
-ifeq ($(BR2_CPU_NAME),imx27)
-BUILD_PLATFORM = IMX27
-else
-BUILD_PLATFORM = IMX51
-endif
-
-define IMX_LIB_BUILD_CMDS
- $(MAKE) CC="$(TARGET_CC)" \
- PLATFORM=$(BUILD_PLATFORM) \
- DIRS="sahara2 vpu" \
- CFLAGS="-fPIC -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
- -C $(@D)
-endef
-
-define IMX_LIB_INSTALL_STAGING_CMDS
- install -D -m 755 $(@D)/vpu/libvpu.so $(STAGING_DIR)/usr/lib
- install -D -m 755 $(@D)/vpu/vpu_io.h $(STAGING_DIR)/usr/include
- install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
- install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
-endef
-
-define IMX_LIB_INSTALL_TARGET_CMDS
- install -D -m 755 $(@D)/vpu/libvpu.so $(TARGET_DIR)/usr/lib
- install -D -m 755 $(@D)/sahara2/libsahara.so $(TARGET_DIR)/usr/lib
-endef
-
-define IMX_LIB_UNINSTALL_TARGET_CMDS
- rm -f $(TARGET_DIR)/usr/lib/libvpu.so
-endef
-
-define IMX_LIB_CLEAN_CMDS
- -$(MAKE) -C $(@D) clean
-endef
-
-$(eval $(call GENTARGETS,package,imx-lib))
diff --git a/patches/buildroot/2011.05/174-imx-lib-add_package.patch b/patches/buildroot/2011.05/174-imx-lib-add_package.patch
new file mode 100644
index 0000000..22c385c
--- /dev/null
+++ b/patches/buildroot/2011.05/174-imx-lib-add_package.patch
@@ -0,0 +1,73 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/imx-lib/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-lib/Config.in 2012-03-02 12:03:12.000000000 +0100
+@@ -0,0 +1,4 @@
++config BR2_PACKAGE_IMX_LIB
++ bool "imx-lib"
++ help
++ Freescale specific libraries for i.MX processors family.
+Index: buildroot/package/imx-lib/imx-lib.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-lib/imx-lib.mk 2012-03-02 12:03:35.000000000 +0100
+@@ -0,0 +1,45 @@
++#############################################################
++#
++# imx-lib (helpers librairies from Freescale BSP)
++#
++#############################################################
++IMX_LIB_VERSION = 10.11.01
++IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
++IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
++IMX_LIB_INSTALL_STAGING = YES
++
++ifeq ($(BR2_CPU_NAME),imx27)
++BUILD_PLATFORM = IMX27
++else
++BUILD_PLATFORM = IMX51
++endif
++
++define IMX_LIB_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" \
++ PLATFORM=$(BUILD_PLATFORM) \
++ DIRS="sahara2 vpu" \
++ CFLAGS="-fPIC -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
++ -C $(@D)
++endef
++
++define IMX_LIB_INSTALL_STAGING_CMDS
++ install -D -m 755 $(@D)/vpu/libvpu.so $(STAGING_DIR)/usr/lib
++ install -D -m 755 $(@D)/vpu/vpu_io.h $(STAGING_DIR)/usr/include
++ install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
++ install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
++endef
++
++define IMX_LIB_INSTALL_TARGET_CMDS
++ install -D -m 755 $(@D)/vpu/libvpu.so $(TARGET_DIR)/usr/lib
++ install -D -m 755 $(@D)/sahara2/libsahara.so $(TARGET_DIR)/usr/lib
++endef
++
++define IMX_LIB_UNINSTALL_TARGET_CMDS
++ rm -f $(TARGET_DIR)/usr/lib/libvpu.so
++endef
++
++define IMX_LIB_CLEAN_CMDS
++ -$(MAKE) -C $(@D) clean
++endef
++
++$(eval $(call GENTARGETS,package,imx-lib))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-03-02 12:06:29.000000000 +0100
++++ buildroot/package/Config.in 2012-03-02 12:07:27.000000000 +0100
+@@ -349,6 +349,7 @@
+ endmenu
+
+ menu "Hardware handling"
++source "package/imx-lib/Config.in"
+ source "package/libaio/Config.in"
+ source "package/libraw1394/Config.in"
+ source "package/tslib/Config.in"
diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
new file mode 100644
index 0000000..aa29e73
--- /dev/null
+++ b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
@@ -0,0 +1,73 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/imx-lib/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-lib/Config.in 2012-03-02 12:03:12.000000000 +0100
+@@ -0,0 +1,4 @@
++config BR2_PACKAGE_IMX_LIB
++ bool "imx-lib"
++ help
++ Freescale specific libraries for i.MX processors family.
+Index: buildroot/package/imx-lib/imx-lib.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-lib/imx-lib.mk 2012-03-02 12:13:24.000000000 +0100
+@@ -0,0 +1,45 @@
++#############################################################
++#
++# imx-lib (helpers librairies from Freescale BSP)
++#
++#############################################################
++IMX_LIB_VERSION = 10.11.01
++IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
++IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
++IMX_LIB_INSTALL_STAGING = YES
++
++ifeq ($(BR2_CPU_NAME),imx27)
++BUILD_PLATFORM = IMX27
++else
++BUILD_PLATFORM = IMX51
++endif
++
++define IMX_LIB_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" \
++ PLATFORM=$(BUILD_PLATFORM) \
++ DIRS="sahara2 vpu" \
++ CFLAGS="-fPIC -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
++ -C $(@D)
++endef
++
++define IMX_LIB_INSTALL_STAGING_CMDS
++ install -D -m 755 $(@D)/vpu/libvpu.so $(STAGING_DIR)/usr/lib
++ install -D -m 755 $(@D)/vpu/vpu_io.h $(STAGING_DIR)/usr/include
++ install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
++ install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
++endef
++
++define IMX_LIB_INSTALL_TARGET_CMDS
++ install -D -m 755 $(@D)/vpu/libvpu.so $(TARGET_DIR)/usr/lib
++ install -D -m 755 $(@D)/sahara2/libsahara.so $(TARGET_DIR)/usr/lib
++endef
++
++define IMX_LIB_UNINSTALL_TARGET_CMDS
++ rm -f $(TARGET_DIR)/usr/lib/libvpu.so
++endef
++
++define IMX_LIB_CLEAN_CMDS
++ -$(MAKE) -C $(@D) clean
++endef
++
++$(eval $(call GENTARGETS))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-03-02 12:06:29.000000000 +0100
++++ buildroot/package/Config.in 2012-03-02 12:07:27.000000000 +0100
+@@ -349,6 +349,7 @@
+ endmenu
+
+ menu "Hardware handling"
++source "package/imx-lib/Config.in"
+ source "package/libaio/Config.in"
+ source "package/libraw1394/Config.in"
+ source "package/tslib/Config.in"
hooks/post-receive
--
armadeus
|
