[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-26-g9134e4b

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  9134e4b50311a1a933383372790353b465034102 (commit)
      from  2a09bac599c41786434078c17c1ecd5585227183 (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 9134e4b50311a1a933383372790353b465034102
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Oct 30 13:51:20 2012 +0100

    [BUILROOT] fix armadeus package .mk files to support new and legacy BR version

-----------------------------------------------------------------------

Summary of changes:
 .../package/armadeus/anybus-tools/anybus-tools.mk  |    9 +++++++--
 .../package/armadeus/as_devices/as_devices.mk      |    9 +++++++--
 .../imx28-usb-downloader/imx28-usb-downloader.mk   |    4 ++--
 buildroot/package/armadeus/imxregs/imxregs.mk      |    6 +++---
 buildroot/package/armadeus/rxtx/rxtx.mk            |    2 +-
 buildroot/package/armadeus/straton/straton.mk      |    8 ++++++--
 .../package/armadeus/straton_ios/straton_ios.mk    |    8 ++++++--
 7 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
index b533861..817c051 100644
--- a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
+++ b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
@@ -6,7 +6,11 @@
 ANYBUS_TOOLS_VERSION = 0.1
 ANYBUS_TOOLS_BIN_NAME = anybus-tools
 ANYBUS_TOOLS_SITE=$(TOPDIR)/../target/packages/anybus-tools/
+ifeq ($(generic-package), )
 ANYBUS_TOOLS_SITE_METHOD=copy
+else
+ANYBUS_TOOLS_SITE_METHOD=local
+endif
 LINUX_DIR=$(BUILD_DIR)/linux-$(KERNEL_VERSION)/
 
 define ANYBUS_TOOLS_BUILD_CMDS
@@ -18,8 +22,9 @@ define ANYBUS_TOOLS_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(ANYBUS_TOOLS_DIR)/$(ANYBUS_TOOLS_BIN_NAME) $(TARGET_DIR)/usr/bin/$(ANYBUS_TOOLS_BIN_NAME)
 endef
 
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package,anybus-tools))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
 else
 $(eval $(generic-package))
 endif
+
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 1330ca7..e619955 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -6,7 +6,11 @@
 
 AS_DEVICES_VERSION = 0.16
 AS_DEVICES_SITE = $(TOPDIR)/../target/packages/as_devices
+ifeq ($(generic-package), )
 AS_DEVICES_SITE_METHOD = copy
+else
+AS_DEVICES_SITE_METHOD = local
+endif
 AS_DEVICES_INSTALL_STAGING = YES
 
 AS_DEVICES_BUILD_TARGET = c_target
@@ -74,8 +78,9 @@ define AS_DEVICES_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package/armadeus,as_devices))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
 else
 $(eval $(generic-package))
 endif
+
diff --git a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
index e1224ac..177c0d6 100644
--- a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
+++ b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
@@ -6,7 +6,7 @@
 IMX28_USB_DOWNLOADER_VERSION = 0.1
 IMX28_USB_DOWNLOADER_BIN_NAME = gnet-imx28-usb-downloader
 IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader/
-ifeq ($(BUILDROOT_VERSION),2012.02)
+ifeq ($(generic-package), )
 IMX28_USB_DOWNLOADER_SITE_METHOD = copy
 else
 HOST_IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader/
@@ -38,7 +38,7 @@ define IMX28_USB_DOWNLOADER_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
 endef
 
-ifeq ($(BUILDROOT_VERSION),2012.02)
+ifeq ($(generic-package), )
 $(eval $(call GENTARGETS,))
 $(eval $(call GENTARGETS,host))
 else
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index a6f4637..51aa11f 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -6,7 +6,7 @@
 
 IMXREGS_VERSION = 1.3
 IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs/
-ifeq ($(BUILDROOT_VERSION),2012.02)
+ifeq ($(generic-package), )
 IMXREGS_SITE_METHOD = copy
 else
 IMXREGS_SITE_METHOD = local
@@ -30,8 +30,8 @@ define IMXREGS_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package/armadeus,imxregs))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
 else
 $(eval $(generic-package))
 endif
diff --git a/buildroot/package/armadeus/rxtx/rxtx.mk b/buildroot/package/armadeus/rxtx/rxtx.mk
index a334e54..881cb32 100644
--- a/buildroot/package/armadeus/rxtx/rxtx.mk
+++ b/buildroot/package/armadeus/rxtx/rxtx.mk
@@ -9,7 +9,7 @@ RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
 RXTX_DEPENDENCIES = classpath
 RXTX_INSTALL_TARGET_OPT = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
 
-ifeq ($(BUILDROOT_VERSION),2012.02)
+ifeq ($(autotools-package), )
 $(eval $(call AUTOTARGETS))
 else
 $(eval $(autotools-package))
diff --git a/buildroot/package/armadeus/straton/straton.mk b/buildroot/package/armadeus/straton/straton.mk
index df40915..e999850 100644
--- a/buildroot/package/armadeus/straton/straton.mk
+++ b/buildroot/package/armadeus/straton/straton.mk
@@ -10,7 +10,11 @@ STRATON_BIN_NAME = straton
 # STRATON DEV
 ifeq ($(BR2_PACKAGE_STRATON_DEV),y)
 STRATON_SITE=$(BR2_PACKAGE_STRATON_DEV_DIR)
+ifeq ($(generic-package), )
 STRATON_SITE_METHOD=copy
+else
+STRATON_SITE_METHOD=local
+endif
 
 define STRATON_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STAGING_DIR="$(STAGING_DIR)" \
@@ -45,8 +49,8 @@ endef
 
 endif # STRATON_BIN
 
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package,straton))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
 else
 $(eval $(generic-package))
 endif
diff --git a/buildroot/package/armadeus/straton_ios/straton_ios.mk b/buildroot/package/armadeus/straton_ios/straton_ios.mk
index 11f084b..34f1fb1 100644
--- a/buildroot/package/armadeus/straton_ios/straton_ios.mk
+++ b/buildroot/package/armadeus/straton_ios/straton_ios.mk
@@ -7,7 +7,11 @@
 STRATON_IOS_VERSION = 0.1
 STRATON_IOS_DEPENDENCIES = as_devices
 STRATON_IOS_BINARY:=libstraton_ios.so
+ifeq ($(generic-package), )
 STRATON_IOS_SITE_METHOD=copy
+else
+STRATON_IOS_SITE_METHOD=local
+endif
 STRATON_IOS_INSTALL_STAGING=YES
 STRATON_IOS_SITE=$(TOPDIR)/../target/packages/straton_ios
 
@@ -26,8 +30,8 @@ define STRATON_IOS_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(STRATON_IOS_DIR)/$(STRATON_IOS_BINARY)* $(TARGET_DIR)/usr/lib/
 endef
 
-ifeq ($(BUILDROOT_VERSION),2012.02)
-$(eval $(call GENTARGETS,package,straton_ios))
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
 else
 $(eval $(generic-package))
 endif


hooks/post-receive
-- 
armadeus


