[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-23-g0d0073e

[jorasse <jo...@us...>]

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  0d0073e3de929d150a3586dbf054a5a9ba3ba68c (commit)
      from  ff2812af57c2ddde1458512f2fe0a752fef04adb (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 0d0073e3de929d150a3586dbf054a5a9ba3ba68c
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Oct 29 17:08:50 2012 +0100

    [BUILROOT] prepare migration to the next BR release

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

Summary of changes:
 Makefile                                           |   19 ++++++-------------
 Makefile.in                                        |    4 ----
 .../package/armadeus/anybus-tools/anybus-tools.mk  |    4 ++++
 .../package/armadeus/as_devices/as_devices.mk      |    4 ++++
 .../imx28-usb-downloader/imx28-usb-downloader.mk   |   10 ++++++++++
 buildroot/package/armadeus/imxregs/imxregs.mk      |   10 ++++++++++
 buildroot/package/armadeus/pps/pps.mk              |    2 +-
 buildroot/package/armadeus/rxtx/rxtx.mk            |    4 ++++
 buildroot/package/armadeus/straton/straton.mk      |    5 +++++
 .../package/armadeus/straton_ios/straton_ios.mk    |    5 +++++
 10 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index d49487e..7f28d5b 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,15 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_VERSION:=2012.02
+#BUILDROOT_VERSION:=20121025
 include ./Makefile.in
+ifeq ($(BUILDROOT_VERSION),2012.02)
 BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
 BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
+else
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2012.11
+endif
 ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
 #--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
 
@@ -38,11 +44,7 @@ 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)
 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/
@@ -135,19 +137,10 @@ buildauto: $(BUILDROOT_DIR)/.patched
 	$(MAKE) -C $(BUILDROOT_DIR)
 
 linux26 linux: $(BUILDROOT_DIR)/.configured
-ifeq ($(BUILDROOT_VERSION),2011.05)
-	@-touch $(ARMADEUS_LINUX_DIR)/.config
-	@$(MAKE) -C $(BUILDROOT_DIR) $@
-else
 	@$(MAKE) -C $(BUILDROOT_DIR) linux-rebuild
-endif
 
 linux26-clean linux-clean: $(BUILDROOT_DIR)/.configured
-ifneq (,$(filter $(BUILDROOT_VERSION),20081103 2010.05))
 	@$(MAKE) -C $(BUILDROOT_DIR) linux26clean
-else
-	@$(MAKE) -C $(BUILDROOT_DIR) $@
-endif
 
 %_defconfig: $(BUILDROOT_DIR)/.patched
 	@if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ]; then \
diff --git a/Makefile.in b/Makefile.in
index 34cb796..a93db1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,11 +63,7 @@ ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
 
 ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
 ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
-ifeq ($(BUILDROOT_VERSION),2011.05)
-ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
-else
 ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
-endif
 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
diff --git a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
index 301fe6f..b533861 100644
--- a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
+++ b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
@@ -18,4 +18,8 @@ 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))
+el