[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-28-g23b7e0a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-28-g23b7e0a
|
From: Julien B a. A. <ar...@us...> - 2009-12-08 21:08:38
|
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 23b7e0a290b47f92332f62db66ec982ea24ebe27 (commit)
via 7b395711f69e61f76039c4685358bf8c42f116e2 (commit)
via 9abc287ce11941ac311bec66d00e04c57a783341 (commit)
via b439b23d324aabeb68cea0df8d4bb233eed68c25 (commit)
via 183b456a9153e04606d7bf5af7b373227317292c (commit)
via 8f849a6f95c194d9886f15a10e174b2a4882b98c (commit)
from 465f0e9138bebdd7fa5eb14cd4d86db784571d1a (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 23b7e0a290b47f92332f62db66ec982ea24ebe27
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 8 17:35:46 2009 +0100
[BUILDROOT] Add an armadeus/ dir in package/ to store all Armadeus specific utilities/tools building. Add it demos stuff to start.
commit 7b395711f69e61f76039c4685358bf8c42f116e2
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 8 15:38:09 2009 +0100
[BUILD] Updates some more .gitignore files
commit 9abc287ce11941ac311bec66d00e04c57a783341
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 8 15:37:34 2009 +0100
[DEMOS] Homogenize demos build & install
commit b439b23d324aabeb68cea0df8d4bb233eed68c25
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 8 15:23:32 2009 +0100
[DEMOS] input_test now looks up in /usr/share/images/ too to load its image file
commit 183b456a9153e04606d7bf5af7b373227317292c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 21:37:36 2009 +0100
[BUILD] Add some more .gitignore files
commit 8f849a6f95c194d9886f15a10e174b2a4882b98c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 7 21:36:33 2009 +0100
[BUILDROOT] Makes Mesa compile again and be better installed (Thanks CimCim)
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/apf27_test.config | 19 ++++-
buildroot/local/apf9328_test/apf9328_test.config | 19 ++++-
buildroot/package/.gitignore | 43 +++++++++
buildroot/package/armadeus/Config.in | 5 +
buildroot/package/armadeus/armadeus.mk | 1 +
buildroot/package/armadeus/demos/Config.in | 56 ++++++++++++
buildroot/package/armadeus/demos/demos.mk | 96 ++++++++++++++++++++
buildroot/package/audio/.gitignore | 3 +
buildroot/package/mesa/mesa.mk | 12 ++-
buildroot/package/mesa/mesa.patch | 4 +-
buildroot/package/mplayer/.gitignore | 4 +
buildroot/package/mtd/.gitignore | 4 +
buildroot/package/openssh/.gitignore | 5 +
buildroot/package/sdl/.gitignore | 2 +
buildroot/package/tslib/.gitignore | 8 ++
.../target/device/armadeus/apf27/apf27_defconfig | 7 ++-
.../device/armadeus/apf9328/apf9328_defconfig | 7 ++-
target/demos/armanoid/.gitignore | 1 +
target/demos/armanoid/Makefile | 48 ++++++-----
target/demos/backlight_control/Makefile | 50 ++++++-----
target/demos/gpio/Makefile | 16 ++--
target/demos/gps/Makefile | 14 ++-
target/demos/input_test/.gitignore | 1 +
target/demos/input_test/Makefile | 43 +++++----
target/demos/input_test/README | 2 +-
target/demos/input_test/main.c | 9 ++-
target/demos/music_player/Makefile | 39 +++++---
target/demos/show_image/Makefile | 48 +++++-----
28 files changed, 442 insertions(+), 124 deletions(-)
create mode 100644 buildroot/package/.gitignore
create mode 100644 buildroot/package/armadeus/Config.in
create mode 100644 buildroot/package/armadeus/armadeus.mk
create mode 100644 buildroot/package/armadeus/demos/Config.in
create mode 100644 buildroot/package/armadeus/demos/demos.mk
create mode 100644 buildroot/package/audio/.gitignore
create mode 100644 buildroot/package/mplayer/.gitignore
create mode 100644 buildroot/package/mtd/.gitignore
create mode 100644 buildroot/package/openssh/.gitignore
create mode 100644 buildroot/package/sdl/.gitignore
create mode 100644 buildroot/package/tslib/.gitignore
create mode 100644 target/demos/armanoid/.gitignore
create mode 100644 target/demos/input_test/.gitignore
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 9be20af..6ccb600 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Dec 1 10:24:20 2009
+# Tue Dec 8 17:28:51 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -342,6 +342,23 @@ BR2_PACKAGE_FBTEST=y
# BR2_PACKAGE_AS_DEVICES is not set
#
+# Armadeus specific tools/utilities
+#
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+
+#
+# Choose the demos to install
+#
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index e4a5008..cb827a1 100644
--- a/buildroot/local/apf9328_test/apf9328_test.config
+++ b/buildroot/local/apf9328_test/apf9328_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 27 09:47:37 2009
+# Tue Dec 8 17:28:51 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -339,6 +339,23 @@ BR2_PACKAGE_FBTEST=y
# BR2_PACKAGE_AS_DEVICES is not set
#
+# Armadeus specific tools/utilities
+#
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+
+#
+# Choose the demos to install
+#
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
new file mode 100644
index 0000000..aedc788
--- /dev/null
+++ b/buildroot/package/.gitignore
@@ -0,0 +1,43 @@
+# All subdirs:
+/*/
+
+/Config.in
+/Config.in.bak
+/Makefile.autotools.in
+/Makefile.in
+/buildroot-libtool.patch
+
+# except:
+!/ad9889ctrl/
+!/allegro/
+!/armadeus/
+!/armadeus-drivers-helpers/
+!/armadeus-testsuite/
+!/as_devices/
+!/audio/
+!/bluez/
+!/ch7024ctrl/
+!/fbgrab/
+!/fbtest/
+!/fpgaregs/
+!/freescale-tools/
+!/imxregs/
+!/imxssi/
+!/lcd4linux/
+!/libcurl/
+!/lmbench/
+!/max5821ctrl/
+!/mesa/
+!/mplayer/
+!/mtd/
+!/openssh/
+!/pymysql/
+!/pyserial/
+!/sdl/
+!/sdlwater/
+!/slideshow/
+!/snes9x/
+!/socketcan/
+!/tslib/
+!/xenomai/
+!/mesa/
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
new file mode 100644
index 0000000..ebd0c28
--- /dev/null
+++ b/buildroot/package/armadeus/Config.in
@@ -0,0 +1,5 @@
+menu "Armadeus specific tools/utilities"
+
+source package/armadeus/demos/Config.in
+
+endmenu
diff --git a/buildroot/package/armadeus/armadeus.mk b/buildroot/package/armadeus/armadeus.mk
new file mode 100644
index 0000000..c833654
--- /dev/null
+++ b/buildroot/package/armadeus/armadeus.mk
@@ -0,0 +1 @@
+include package/armadeus/*/*.mk
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
new file mode 100644
index 0000000..8d9d9d2
--- /dev/null
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -0,0 +1,56 @@
+
+config BR2_PACKAGE_ARMADEUS_DEMOS
+ bool "Armadeus misc demos"
+ default n
+ help
+ Install Armadeus miscallenous demos.
+
+menu "Choose the demos to install"
+ depends on BR2_PACKAGE_ARMADEUS_DEMOS
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID
+ bool "Armanoid"
+ select BR2_PACKAGE_SDL
+ help
+ Small game to show SDL usage.
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT
+ bool "Backlight control"
+ select BR2_PACKAGE_SDL
+ help
+ SDL tool to graphically adjust LCD backlight.
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_GPIO
+ bool "GPIO test"
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_GPS
+ bool "GPS frame decoding"
+ help
+ Small tool to show how to read and decode NMEA frames
+ coming from a serial GPS.
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_INPUT
+ bool "Input test"
+ select BR2_PACKAGE_SDL
+ help
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER
+ bool "Music player"
+ select BR2_PACKAGE_SDL
+ select CONFIG_BR2_PACKAGE_SDL_TTF
+ select CONFIG_BR2_PACKAGE_SDL_MIXER
+ help
+ SDL based music player.
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO
+ bool "Oscilloscope"
+ help
+ MAX1027 data viewer "Ã la" oscilloscope. (Work in progress).
+
+config BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE
+ bool "Image viewer"
+ select CONFIG_BR2_PACKAGE_SDL_IMAGE
+ help
+ SDL based image viewer.
+
+endmenu
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
new file mode 100644
index 0000000..b95d938
--- /dev/null
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -0,0 +1,96 @@
+#############################################################
+#
+# Armadeus Demos
+#
+#############################################################
+
+ARMADEUS-DEMOS_VER:=1.0
+ARMADEUS-DEMOS_SOURCE:=$(BUILD_DIR)/../../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
+
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID),y)
+ARMADEUS-DEMOS_SUBDIRS+=armanoid
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT),y)
+ARMADEUS-DEMOS_SUBDIRS+=backlight_control
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPIO),y)
+ARMADEUS-DEMOS_SUBDIRS+=gpio
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPS),y)
+ARMADEUS-DEMOS_SUBDIRS+=gps
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_INPUT),y)
+ARMADEUS-DEMOS_SUBDIRS+=input_test
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
+ARMADEUS-DEMOS_SUBDIRS+=music_player
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO),y)
+ARMADEUS-DEMOS_SUBDIRS+=oscillo
+endif
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
+ARMADEUS-DEMOS_SUBDIRS+=show_image
+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
+ @for dir in $(ARMADEUS-DEMOS_SUBDIRS) ; do \
+ echo -e "\n >>> Compiling $$dir demo <<<" ; \
+ dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
+ if [ -d "$$dir" ]; then \
+ (cd $$dir && $(MAKE) CC=$(TARGET_CC) SDL_DIR=$(SDL_DIR) STAGING_DIR=$(STAGING_DIR) ARMADEUS_BOARD_NAME=$(BR2_BOARD_NAME)) || exit 1 ; \
+ fi \
+ done
+ touch $@
+
+$(ARMADEUS-DEMOS_DIR)/.installed: $(ARMADEUS-DEMOS_DIR)/.compiled
+ @for dir in $(ARMADEUS-DEMOS_SUBDIRS) ; do \
+ echo -e "\n >>> Installing $$dir demo <<<" ; \
+ dir=$(ARMADEUS-DEMOS_DIR)/$$dir ; \
+ if [ -d $$dir ] ; then \
+ (cd $$dir && $(MAKE) install INSTALL_DIR=$(ARMADEUS-DEMOS_TARGET_DIR) \
+ INSTALL_DATA_DIR=$(ARMADEUS-DEMOS_TARGET_DATA_DIR) STRIP=$(TARGET_STRIP)) || exit 1 ; \
+ fi \
+ done
+ touch $@
+
+armadeus-demos: $(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
+
+armadeus-demos-dirclean:
+ rm -rf $(ARMADEUS-DEMOS_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_DEMOS)),y)
+TARGETS+=armadeus-demos
+endif
diff --git a/buildroot/package/audio/.gitignore b/buildroot/package/audio/.gitignore
new file mode 100644
index 0000000..764b172
--- /dev/null
+++ b/buildroot/package/audio/.gitignore
@@ -0,0 +1,3 @@
+/*/
+/Config.in
+/audio.mk
diff --git a/buildroot/package/mesa/mesa.mk b/buildroot/package/mesa/mesa.mk
index 2996fbd..9931f21 100644
--- a/buildroot/package/mesa/mesa.mk
+++ b/buildroot/package/mesa/mesa.mk
@@ -46,12 +46,16 @@ $(MESALIB_DIR)/.compiled: $(MESALIB_DIR)/.configured
#arm-linux-osmesa
touch $@
-MESA mesa: uclibc gpm $(MESALIB_DIR)/.compiled
+$(TARGET_DIR)/usr/lib/libGL.so.7.1.0: $(MESALIB_DIR)/.compiled
+ mkdir -p $(TARGET_DIR)/usr/lib/
+ cp -a $(MESALIB_DIR)/lib/* $(TARGET_DIR)/usr/lib/
+ touch $@
+
+
+MESA mesa: gpm $(TARGET_DIR)/usr/lib/libGL.so.7.1.0
mesa-clean:
- (cd $(MESALIB_DIR); \
- $(MAKE) CC=$(TARGET_CC) clean \
- );
+ $(MAKE) CC=$(TARGET_CC) clean -C $(MESALIB_DIR)
mesa-dirclean:
rm -rf $(MESALIB_DIR)
diff --git a/buildroot/package/mesa/mesa.patch b/buildroot/package/mesa/mesa.patch
index 2abcd74..aea2fc8 100644
--- a/buildroot/package/mesa/mesa.patch
+++ b/buildroot/package/mesa/mesa.patch
@@ -172,7 +172,7 @@ diff -bruN Mesa-7.0.orig/src/mesa/Makefile Mesa-7.0/src/mesa/Makefile
CONFIG_NAME = linux-fbdev
-CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
-+CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER -I$(TOP)/../staging_dir/usr/include -I$(TOP)/../staging_dir/include -Wl,-rpath-link,$(TOP)/../staging_dir/usr/lib
++CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER -I$(TOP)/../staging_dir/usr/include -I$(TOP)/../staging_dir/include
SRC_DIRS = mesa glu glut/fbdev
DRIVER_DIRS = fbdev osmesa
@@ -184,5 +184,5 @@ diff -bruN Mesa-7.0.orig/src/mesa/Makefile Mesa-7.0/src/mesa/Makefile
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
+OSMESA_LIB_DEPS = -lm -lpthread -L$(TOP)/../staging_dir/usr/lib
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
-+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) -l$(GLUT_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) -l$(GLUT_LIB) $(EXTRA_LIB_PATH) -lgpm -lm -lstdc++
diff --git a/buildroot/package/mplayer/.gitignore b/buildroot/package/mplayer/.gitignore
new file mode 100644
index 0000000..422d0d5
--- /dev/null
+++ b/buildroot/package/mplayer/.gitignore
@@ -0,0 +1,4 @@
+/Config.in
+/mplayer-1.0rc1-atmel.3.patch
+/mplayer-1.0rc1-index.patch
+/mplayer.mk
diff --git a/buildroot/package/mtd/.gitignore b/buildroot/package/mtd/.gitignore
new file mode 100644
index 0000000..ef6fcc6
--- /dev/null
+++ b/buildroot/package/mtd/.gitignore
@@ -0,0 +1,4 @@
+/*/
+/Config.in
+/mtd.mk
+
diff --git a/buildroot/package/openssh/.gitignore b/buildroot/package/openssh/.gitignore
new file mode 100644
index 0000000..cbd6fce
--- /dev/null
+++ b/buildroot/package/openssh/.gitignore
@@ -0,0 +1,5 @@
+/Config.in
+/S50sshd
+/openssh.002-SUSv-legacy.patch
+/openssh.mk
+/openssh.patch
diff --git a/buildroot/package/sdl/.gitignore b/buildroot/package/sdl/.gitignore
new file mode 100644
index 0000000..2d6cc8b
--- /dev/null
+++ b/buildroot/package/sdl/.gitignore
@@ -0,0 +1,2 @@
+/Config.in
+/sdl.mk
diff --git a/buildroot/package/tslib/.gitignore b/buildroot/package/tslib/.gitignore
new file mode 100644
index 0000000..54b9a42
--- /dev/null
+++ b/buildroot/package/tslib/.gitignore
@@ -0,0 +1,8 @@
+/Config.in
+/ts.conf
+/tslib-1.0-absbit.patch
+/tslib-1.0-remove-bzero.patch
+/tslib-1.0-remove-return-on-error-from-check-df.patch
+/tslib.mk
+/tslib_add_finddef_and_inputattach_utils.patch
+
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 19fd7ec..8a9b562 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Oct 23 18:15:23 2009
+# Tue Dec 8 17:26:00 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -341,6 +341,11 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_AS_DEVICES is not set
#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 9393379..29eec07 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 27 09:47:37 2009
+# Tue Dec 8 17:26:00 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -337,6 +337,11 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_AS_DEVICES is not set
#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
diff --git a/target/demos/armanoid/.gitignore b/target/demos/armanoid/.gitignore
new file mode 100644
index 0000000..d025921
--- /dev/null
+++ b/target/demos/armanoid/.gitignore
@@ -0,0 +1 @@
+/armanoid
diff --git a/target/demos/armanoid/Makefile b/target/demos/armanoid/Makefile
index ecf6935..c459442 100644
--- a/target/demos/armanoid/Makefile
+++ b/target/demos/armanoid/Makefile
@@ -1,35 +1,32 @@
+# Default values for local compiling:
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+SDL_DIR:=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
+STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
+INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+
+DEFINES=TARGET
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
ifeq ($(TARGET),x86)
INSTALL_DIR="/usr/games/"
- INSTALL_DATA_DIR="/usr/share/games/armanoid/"
+ INSTALL_DATA_DIR="/usr/share/"
CFLAGS=`/usr/bin/sdl-config --cflags`
LIBS=`/usr/bin/sdl-config --libs`
CC=gcc
- DEFINES="HOST"
-else
- BUILDROOT_DIR:=../../../buildroot/
- BUILD_DIR_EXT:=$(shell ls $(BUILDROOT_DIR) | grep -e "^build_arm*")
- BUILD_DIR:=$(BUILDROOT_DIR)/$(BUILD_DIR_EXT)
-
- SDL_DIR:=$(BUILD_DIR)/SDL-1.2.11/
- STAGING_DIR:=$(BUILD_DIR)/staging_dir/
- ROOT_DIR:=$(BUILDROOT_DIR)/project_$(BUILD_DIR_EXT)/armadeus/root/
- INSTALL_DIR:=$(ROOT_DIR)/usr/games/
- INSTALL_DATA_DIR:=$(ROOT_DIR)/usr/share/games/armanoid/
-
- CC:=$(STAGING_DIR)/bin/arm-linux-gcc
- DEFINES="TARGET"
- CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags)
- LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
+ DEFINES=HOST
endif
-CFLAGS+="-g"
default: armanoid
all: armanoid
-
armanoid.o: armanoid.c
$(CC) $(CFLAGS) -c -o $@ $^
@@ -40,15 +37,22 @@ buzzer.o: buzzer.c
$(CC) $(CFLAGS) -D$(DEFINES) -c -o $@ $^
armanoid: armanoid.o collide.o buzzer.o
- $(CC) $(LIBS) -o $@ $^
+ $(CC) $(LIBS) -o $@ $^
install: armanoid data/ball.bmp data/block.bmp data/bar.bmp
mkdir -p $(INSTALL_DIR)
- mkdir -p $(INSTALL_DATA_DIR)/data/
- cp data/*.bmp $(INSTALL_DATA_DIR)/data/
+ mkdir -p $(INSTALL_DATA_DIR)/games/armanoid/data/
+ cp data/*.bmp $(INSTALL_DATA_DIR)/games/armanoid/data/
cp armanoid $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/armanoid
+
+uninstall:
+ rm -f $(INSTALL_DIR)/armanoid
+ rm -rf $(INSTALL_DATA_DIR)/games/armanoid/data/
clean:
rm -rf armanoid
rm -rf *.o
+.PHONY: clean install uninstall
+
diff --git a/target/demos/backlight_control/Makefile b/target/demos/backlight_control/Makefile
index ea0e4b4..506f817 100644
--- a/target/demos/backlight_control/Makefile
+++ b/target/demos/backlight_control/Makefile
@@ -1,30 +1,32 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-ifeq ($(TARGET),)
- ROOT_DIR:=$(ARMADEUS_ROOTFS_DIR)
- CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
- DEFINES="-DTARGET"
- CFLAGS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags)
- LIBS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs) -lSDL_image
-else
- ROOT_DIR:="/"
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+# Default values for local compiling:
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
+INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+DEFINES=-DTARGET
+STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
+SDL_DIR:=$(ARMADEUS_SDL_DIR)
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_image
+
+ifeq ($(TARGET),x86)
+ INSTALL_DIR:=/usr/local/bin
+ INSTALL_DATA_DIR:=/usr/share
CFLAGS=`/usr/bin/sdl-config --cflags`
- LIBS=`/usr/bin/sdl-config --libs` -lSDL_Image
+ LDFLAGS=`/usr/bin/sdl-config --libs` -lSDL_Image
CC=gcc
- DEFINES="-DHOST"
+ STRIP=strip
+ DEFINES=-DHOST
endif
-INSTALL_DIR:=$(ROOT_DIR)/usr/bin/
-INSTALL_DIR_DATA:=$(ROOT_DIR)/usr/share/apps/backlight/data
-
-CFLAGS+="-g"
default: backlight
all: backlight
-
backlight.o: backlight.c
$(CC) $(CFLAGS) -c -o $@ $^
@@ -32,20 +34,26 @@ backlight_sysctl.o: backlight_sysctl.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
backlight: backlight.o backlight_sysctl.o
- $(CC) $(LIBS) -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^
install: install_tool install_data
install_tool: backlight
mkdir -p $(INSTALL_DIR)
cp $^ $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/$^
install_data: data/cursor.bmp data/empty.bmp data/empty_end.bmp data/full.bmp data/full_end.bmp
- mkdir -p $(INSTALL_DIR_DATA)
- cp $^ $(INSTALL_DIR_DATA)
+ mkdir -p $(INSTALL_DATA_DIR)/apps/backlight/data
+ cp $^ $(INSTALL_DATA_DIR)/apps/backlight/data/
-clean:
+uninstall:
+ rm -f $(INSTALL_DIR)/backlight
+
+clean:
rm -rf backlight
rm -rf *.o
rm -rf active backlight.dat
+.PHONY: clean install uninstall
+
diff --git a/target/demos/gpio/Makefile b/target/demos/gpio/Makefile
index 0e11c39..14a8723 100644
--- a/target/demos/gpio/Makefile
+++ b/target/demos/gpio/Makefile
@@ -1,13 +1,12 @@
-
-ifneq ($(CC),)
-# Locally compiled:
+# Default values for local compiling:
ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
-INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
DEFINES=-D$(ARMADEUS_BOARD_NAME)
-endif
+
EXEC_NAME = blink_led
@@ -22,8 +21,9 @@ clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-install:
+install: $(EXEC_NAME)
cp $(EXEC_NAME) $(INSTALL_DIR)/
+ $(STRIP) $(INSTALL_DIR)/$(EXEC_NAME)
uninstall:
rm -f $(INSTALL_DIR)/$(EXEC_NAME)
diff --git a/target/demos/gps/Makefile b/target/demos/gps/Makefile
index 4ca5477..58223b4 100644
--- a/target/demos/gps/Makefile
+++ b/target/demos/gps/Makefile
@@ -1,7 +1,10 @@
-INSTALL_DIR="../../../buildroot/project_build_arm/armadeus/root/usr/bin/"
-CC="../../../buildroot/build_arm/staging_dir/bin/arm-linux-gcc"
-#CFLAGS+="-g"
-CFLAGS+="-Wall"
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CFLAGS+=-Wall -g
+
default: nmea_decode
@@ -11,7 +14,8 @@ nmea_decode: nmea_decoder.c
$(CC) $(CFLAGS) -o $@ $^
install: nmea_decode
- cp nmea_decode $(INSTALL_DIR)
+ cp nmea_decode $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/nmea_decode
clean:
rm -f nmea_decode
diff --git a/target/demos/input_test/.gitignore b/target/demos/input_test/.gitignore
new file mode 100644
index 0000000..db9aaa5
--- /dev/null
+++ b/target/demos/input_test/.gitignore
@@ -0,0 +1 @@
+/input_test
diff --git a/target/demos/input_test/Makefile b/target/demos/input_test/Makefile
index 1c405b3..0513ecb 100644
--- a/target/demos/input_test/Makefile
+++ b/target/demos/input_test/Makefile
@@ -1,31 +1,34 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-ifeq ($(TARGET),)
- STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
- INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
-
- CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
- DEFINES="-DAPF"
- CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags)
- LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs)
-else
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+# Default values for local compiling:
+STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
+INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+SDL_DIR:=$(ARMADEUS_SDL_DIR)
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
+DEFINES=-DAPF
+
+ifeq ($(TARGET),x86)
INSTALL_DIR=./install
+ INSTALL_DATA_DIR=./install/images
CFLAGS=`/usr/bin/sdl-config --cflags`
LIBS=`/usr/bin/sdl-config --libs`
CC=gcc
- DEFINES="-DHOST"
+ STRIP=strip
+ DEFINES=-DHOST
endif
-CFLAGS+="-g"
-EXEC_NAME=input_test
+EXEC_NAME=input_test
default: $(EXEC_NAME)
all: $(EXEC_NAME)
-
main.o: main.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
@@ -34,13 +37,17 @@ $(EXEC_NAME): main.o
install: $(EXEC_NAME)
mkdir -p $(INSTALL_DIR)
- cp $^ $(INSTALL_DIR)
+ cp $(EXEC_NAME) $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/$(EXEC_NAME)
+ mkdir -p $(INSTALL_DATA_DIR)/images
+ cp sdl.bmp $(INSTALL_DATA_DIR)/images/
uninstall:
- rm -f $(INSTALL_DIR)/input_test
+ rm -f $(INSTALL_DIR)/$(EXEC_NAME)
+
clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-.PHONY: clean uninstall
+.PHONY: clean install uninstall
diff --git a/target/demos/input_test/README b/target/demos/input_test/README
index 5e2358c..6376899 100644
--- a/target/demos/input_test/README
+++ b/target/demos/input_test/README
@@ -2,5 +2,5 @@
* ARM compiling:
$ make clean; make install
* x86 compiling (SDL devt package should be installed on your system)
- $ make TARGET=x86 clean; make TARGET=x86
+ $ make clean; make TARGET=x86
diff --git a/target/demos/input_test/main.c b/target/demos/input_test/main.c
index 82b71b2..f27e064 100644
--- a/target/demos/input_test/main.c
+++ b/target/demos/input_test/main.c
@@ -244,8 +244,12 @@ int main(int argc, char * argv[])
/* Sprite's image loading */
tmp = SDL_LoadBMP("sdl.bmp");
if (!tmp) {
- printf("Unable to load image for test\n");
- exit(1);
+ /* 2nd chance: */
+ tmp = SDL_LoadBMP("/usr/share/images/sdl.bmp");
+ if (!tmp) {
+ printf("Unable to load image for test\n");
+ exit(1);
+ }
}
sprite = SDL_DisplayFormat(tmp);
SDL_FreeSurface(tmp);
@@ -282,3 +286,4 @@ int main(int argc, char * argv[])
printf("\nBye !\n");
return 0;
}
+
diff --git a/target/demos/music_player/Makefile b/target/demos/music_player/Makefile
index 514dfbd..134ba82 100755
--- a/target/demos/music_player/Makefile
+++ b/target/demos/music_player/Makefile
@@ -1,39 +1,50 @@
# Compil ARM
-ifeq ($(TARGET),arm)
ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-DEFINES="-DAPF"
-CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags) -g
-LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs) -lSDL_ttf -lSDL_mixer
-
-else
+STRIP=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+DEFINES=-DAPF
+SDL_DIR:=$(ARMADEUS_SDL_DIR)
+STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_ttf -lSDL_mixer
+
+ifeq ($(TARGET),x86)
# Compil HOST
CC=gcc
+STRIP=strip
CFLAGS=`/usr/bin/sdl-config --cflags`
-LIBS=`/usr/bin/sdl-config --libs` -lSDL_ttf -lSDL_mixer
-DEFINES="-DHOST"
-
+LDFLAGS=`/usr/bin/sdl-config --libs` -lSDL_ttf -lSDL_mixer
+DEFINES=-DHOST
endif
EXEC_NAME=aplayer
+
default: $(EXEC_NAME)
all: $(EXEC_NAME)
-
main.o: player.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
$(EXEC_NAME): player.o
- $(CC) $(LIBS) -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^
+
+install:
+ mkdir -p $(INSTALL_DIR)
+ cp -f $(EXEC_NAME) $(INSTALL_DIR)/
+ $(STRIP) $(INSTALL_DIR)/$(EXEC_NAME)
+
+uninstall:
+ rm -f $(INSTALL_DIR)/$(EXEC_NAME)
-clean:
+clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-.PHONY: clean uninstall
+.PHONY: clean install uninstall
diff --git a/target/demos/show_image/Makefile b/target/demos/show_image/Makefile
index e1c6d0c..d7e7fa1 100644
--- a/target/demos/show_image/Makefile
+++ b/target/demos/show_image/Makefile
@@ -1,23 +1,23 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-ifeq ($(TARGET),)
- ROOT_DIR:=$(ARMADEUS_ROOTFS_DIR)
- CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
- DEFINES="-DTARGET"
- CFLAGS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags)
- LIBS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs) -lSDL_image
-else
- ROOT_DIR:="/"
- CFLAGS=`/usr/bin/sdl-config --cflags`
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
+SDL_DIR:=$(ARMADEUS_SDL_DIR)
+
+DEFINES=-DTARGET
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+LDFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs) -lSDL_image
+
+ifeq ($(TARGET),x86)
+ INSTALL_DIR:=/usr/local/bin/
+ CFLAGS=`/usr/bin/sdl-config --cflags` -g
LIBS=`/usr/bin/sdl-config --libs` -lSDL_Image
CC=gcc
- DEFINES="-DHOST"
-endif
-
-INSTALL_DIR:=$(ROOT_DIR)/usr/bin/
-ifneq ($(DEBUG),)
-CFLAGS+="-g"
+ STRIP=strip
+ DEFINES=-DHOST
endif
@@ -27,21 +27,23 @@ default: $(EXEC_NAME)
all: $(EXEC_NAME)
-
image.o: image.c
$(CC) $(CFLAGS) -c -o $@ $^
$(EXEC_NAME): image.o
- $(CC) $(LIBS) -o $@ $^
-
+ $(CC) $(LDFLAGS) -o $@ $^
install: $(EXEC_NAME)
mkdir -p $(INSTALL_DIR)
- cp $^ $(INSTALL_DIR)
+ cp $^ $(INSTALL_DIR)
+ $(STRIP) $(INSTALL_DIR)/$^
-clean:
+clean:
rm -rf $(EXEC_NAME)
rm -rf *.o
-.PHONY: clean install
+uninstall:
+ rm -f $(INSTALL_DIR)/$(EXEC_NAME)
+
+.PHONY: clean install uninstall
hooks/post-receive
--
armadeus
|
