[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-751-ge24ce69
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-751-ge24ce69
|
From: Julien B a. A. <ar...@us...> - 2015-05-23 07:19:17
|
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 e24ce698c345c5469e4c3251ae87af8fff79f2a2 (commit)
from 5ed4bdc83acdb2b42c3586bdf19d902a8141e2e6 (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 e24ce698c345c5469e4c3251ae87af8fff79f2a2
Author: Julien Boibessot <jul...@ar...>
Date: Sat May 23 09:15:19 2015 +0200
[BUILDROOT] Updates demos package to (quite) BR state of the art.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27test_defconfig | 2 +-
buildroot/configs/apf28test_defconfig | 2 +-
buildroot/configs/apf51test_defconfig | 2 +-
buildroot/configs/apf6test_defconfig | 6 ++
buildroot/configs/apf9328test_defconfig | 2 +-
buildroot/package/armadeus/demos/Config.in | 5 +-
buildroot/package/armadeus/demos/demos.mk | 99 ++++++++++------------------
7 files changed, 48 insertions(+), 70 deletions(-)
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 07487c1..0278ec6 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -44,7 +44,7 @@ BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-BR2_PACKAGE_ARMADEUS_DEMOS=y
+BR2_PACKAGE_DEMOS=y
BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 00298f4..a97b457 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -45,7 +45,7 @@ BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-BR2_PACKAGE_ARMADEUS_DEMOS=y
+BR2_PACKAGE_DEMOS=y
BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index aab2d6c..ef41831 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -47,7 +47,7 @@ BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-BR2_PACKAGE_ARMADEUS_DEMOS=y
+BR2_PACKAGE_DEMOS=y
BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index 74358d2..2373c88 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -36,6 +36,12 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_DEMOS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_ALSA_UTILS=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index a3af665..fec19cc 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -46,7 +46,7 @@ BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-BR2_PACKAGE_ARMADEUS_DEMOS=y
+BR2_PACKAGE_DEMOS=y
BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index a607402..1b871bb 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -1,11 +1,10 @@
-config BR2_PACKAGE_ARMADEUS_DEMOS
+config BR2_PACKAGE_DEMOS
bool "Armadeus misc demos"
- default n
help
Install Armadeus miscallenous demos.
menu "Choose the demos to install"
- depends on BR2_PACKAGE_ARMADEUS_DEMOS
+ depends on BR2_PACKAGE_DEMOS
config BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID
bool "Armanoid"
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index e6d8b51..f8d5a36 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -4,131 +4,104 @@
#
#############################################################
-ARMADEUS-DEMOS_VER:=1.0
-ARMADEUS-DEMOS_SOURCE:=$(TOPDIR)/../target/demos
-ARMADEUS-DEMOS_DIR:=$(BUILD_DIR)/armadeus-demos-$(ARMADEUS-DEMOS_VER)
-ARMADEUS-DEMOS_TARGET_DIR:=$(TARGET_DIR)/usr/local/bin
-ARMADEUS-DEMOS_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share
-ARMADEUS-DEMOS_TARGET_INIT_DIR:=$(TARGET_DIR)/etc/init.d
+DEMOS_VERSION = 1.0
+DEMOS_SITE = $(TOPDIR)/../target/demos
+DEMOS_SITE_METHOD = local
+
+ARMADEUS-DEMOS_TARGET_DIR = $(TARGET_DIR)/usr/local/bin
+ARMADEUS-DEMOS_TARGET_DATA_DIR = $(TARGET_DIR)/usr/share
+ARMADEUS-DEMOS_TARGET_INIT_DIR = $(TARGET_DIR)/etc/init.d
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID),y)
-ARMADEUS-DEMOS_SUBDIRS+=armanoid
-ARMADEUS-DEMOS_DEPS=sdl
+ARMADEUS-DEMOS_SUBDIRS += armanoid
+DEMOS_DEPENDENCIES += sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT),y)
-ARMADEUS-DEMOS_SUBDIRS+=backlight_control
-ARMADEUS-DEMOS_DEPS=sdl
+ARMADEUS-DEMOS_SUBDIRS += backlight_control
+DEMOS_DEPENDENCIES += sdl sdl_image
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPIO),y)
-ARMADEUS-DEMOS_SUBDIRS+=gpio
+ARMADEUS-DEMOS_SUBDIRS += gpio
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE),y)
ARMADEUS-DEMOS_SUBDIRS += camera/capture
-ARMADEUS-DEMOS_DEPS = sdl
+DEMOS_DEPENDENCIES += sdl
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE_VPU),y)
ARMADEUS-DEMOS_PARAMS = "VPU=yes"
ifeq ($(BR2_CPU_NAME),"imx51")
- ARMADEUS-DEMOS_DEPS += imx-lib
+ DEMOS_DEPENDENCIES += imx-lib
endif
ifeq ($(BR2_CPU_NAME),"imx27")
- ARMADEUS-DEMOS_DEPS += freescale-tools
+ DEMOS_DEPENDENCIES += freescale-tools
endif
endif
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPS),y)
-ARMADEUS-DEMOS_SUBDIRS+=gps
+ARMADEUS-DEMOS_SUBDIRS += gps
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_INPUT),y)
-ARMADEUS-DEMOS_SUBDIRS+=input_test
-ARMADEUS-DEMOS_DEPS=sdl
+ARMADEUS-DEMOS_SUBDIRS += input_test
+DEMOS_DEPENDENCIES += sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
-ARMADEUS-DEMOS_SUBDIRS+=music_player
-ARMADEUS-DEMOS_DEPS=sdl
+ARMADEUS-DEMOS_SUBDIRS += music_player
+DEMOS_DEPENDENCIES += sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO),y)
-ARMADEUS-DEMOS_SUBDIRS+=oscillo
+ARMADEUS-DEMOS_SUBDIRS += oscillo
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
-ARMADEUS-DEMOS_SUBDIRS+=show_image
-ARMADEUS-DEMOS_DEPS=sdl
+ARMADEUS-DEMOS_SUBDIRS += show_image
+DEMOS_DEPENDENCIES += sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD),y)
-ARMADEUS-DEMOS_SUBDIRS+=test_lcd
-ARMADEUS-DEMOS_DEPS=sdl
+ARMADEUS-DEMOS_SUBDIRS += test_lcd
+DEMOS_DEPENDENCIES += sdl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
-ARMADEUS-DEMOS_DEPS+=sdl_ttf sdl_mixer
+ARMADEUS-DEMOS_DEPS += sdl_ttf sdl_mixer
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
-ARMADEUS-DEMOS_DEPS+=sdl_image
+ARMADEUS-DEMOS_DEPS += sdl_image
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020),y)
-ARMADEUS-DEMOS_SUBDIRS+=mcp25020_ctrl
+ARMADEUS-DEMOS_SUBDIRS += mcp25020_ctrl
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHM),y)
-ARMADEUS-DEMOS_SUBDIRS+=shm
+ARMADEUS-DEMOS_SUBDIRS += shm
endif
-$(ARMADEUS-DEMOS_DIR)/.unpacked:
- mkdir -p $(ARMADEUS-DEMOS_DIR)/
- cd $(ARMADEUS-DEMOS_SOURCE); tar ch --exclude=.svn --exclude=.git . | tar x -C $(ARMADEUS-DEMOS_DIR)/
- touch $@
-
-$(ARMADEUS-DEMOS_DIR)/.compiled: $(ARMADEUS-DEMOS_DIR)/.unpacked
+define DEMOS_BUILD_CMDS
@for dir in $(ARMADEUS-DEMOS_SUBDIRS) ; do \
echo -e "\n >>> Compiling $$dir demo <<<" ; \
- dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
+ dir=$(@D)/$$dir ; \
if [ -d "$$dir" ]; then \
(cd $$dir && $(MAKE) CC="$(TARGET_CC)" STAGING_DIR=$(STAGING_DIR) ARMADEUS_BOARD_NAME=$(BR2_BOARD_NAME) $(ARMADEUS-DEMOS_PARAMS)) || exit 1 ; \
fi \
done
- touch $@
+endef
-$(ARMADEUS-DEMOS_DIR)/.installed: $(ARMADEUS-DEMOS_DIR)/.compiled
+define DEMOS_INSTALL_TARGET_CMDS
@for dir in $(ARMADEUS-DEMOS_SUBDIRS) ; do \
echo -e "\n >>> Installing $$dir demo <<<" ; \
- dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
+ dir=$(@D)/$$dir ; \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE) install INSTALL_DIR=$(ARMADEUS-DEMOS_TARGET_DIR) \
INSTALL_DATA_DIR=$(ARMADEUS-DEMOS_TARGET_DATA_DIR) INIT_DIR=$(ARMADEUS-DEMOS_TARGET_INIT_DIR) STRIP=$(TARGET_STRIP)) || exit 1 ; \
fi \
done
- touch $@
-
-armadeus-demos: $(ARMADEUS-DEMOS_DEPS) $(ARMADEUS-DEMOS_DIR)/.installed
-
-armadeus-demos-clean:
- rm -rf $(ARMADEUS-DEMOS_TARGET_DIR)
- rm -f $(ARMADEUS-DEMOS_DIR)/.installed
- rm -f $(ARMADEUS-DEMOS_DIR)/.compiled
- @for dir in $(ARMADEUS-DEMOS_SUBDIRS) ; do \
- dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) clean) || exit 1 ; \
- fi \
- done
+endef
-armadeus-demos-dirclean:
- rm -rf $(ARMADEUS-DEMOS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_DEMOS)),y)
-TARGETS+=armadeus-demos
-endif
+$(eval $(generic-package))
hooks/post-receive
--
armadeus
|