[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-461-g9edf722
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-461-g9edf722
|
From: Julien B a. A. <ar...@us...> - 2012-07-21 17:42:57
|
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 9edf7227df6a58499574ee4f16f3742d0fb8fed5 (commit)
via 59e2520546d7e8a0cbb6c2e5dd7a98b731864eda (commit)
via 974891a0329acdad55e4aedc6c0b998838628341 (commit)
via 8e94f6482cfc943c73af8493796df2e191b13e6b (commit)
from ccc64b4fed59a7e2f456ab2627185107af2dd1cd (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 9edf7227df6a58499574ee4f16f3742d0fb8fed5
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jul 21 19:42:18 2012 +0200
[BUILDROOT] Fixes sdlquake build with BR 2012
commit 59e2520546d7e8a0cbb6c2e5dd7a98b731864eda
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jul 21 19:34:34 2012 +0200
[BUILD] Fixes quiltify.sh for APF28 Buildroot
commit 974891a0329acdad55e4aedc6c0b998838628341
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jul 21 16:37:15 2012 +0200
[BUILDROOT] Add some missing alsa tools to apf28test_defconfig
commit 8e94f6482cfc943c73af8493796df2e191b13e6b
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jul 21 16:36:10 2012 +0200
[TEST] Do some (trivial) tests fixes for APF28
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28test_defconfig | 3 +
.../buildroot/2012.02/081-adds_quake_package.patch | 51 +++++++-------------
scripts/quiltify.sh | 4 +-
target/test/test_backlight.sh | 3 +
target/test/test_fpga.sh | 6 ++-
target/test/test_gpio.sh | 1 +
target/test/test_pwm.sh | 3 +-
target/test/test_usb_device.sh | 1 +
target/test/test_usb_host.sh | 25 ++++++----
9 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 69d4e45..be4e6ee 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -49,6 +49,9 @@ BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
diff --git a/patches/buildroot/2012.02/081-adds_quake_package.patch b/patches/buildroot/2012.02/081-adds_quake_package.patch
index 46cc4b0..433406e 100644
--- a/patches/buildroot/2012.02/081-adds_quake_package.patch
+++ b/patches/buildroot/2012.02/081-adds_quake_package.patch
@@ -5,9 +5,6 @@ This patch adds Quake packages to buildroot:
It is inspired of OpenEmbedded work.
-sdlquake.mk could be simplier if a target FOO_HOOK_POST_INSTALL was
-existing in Makefile.autotools.in.
-
Still searching a way to apply sdlquake-1.0.9-no-x86-asm.patch on all arch
EXCEPT x86.
@@ -16,46 +13,34 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/sdlquake/sdlquake.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake.mk 2012-02-21 20:50:51.000000000 +0100
-@@ -0,0 +1,34 @@
++++ buildroot/package/games/sdlquake/sdlquake.mk 2012-07-21 19:23:16.000000000 +0200
+@@ -0,0 +1,22 @@
+#############################################################
+#
-+# Quake 1 (SDL_Port)
++# Quake 1 (SDL Port)
+#
+#############################################################
+
+SDLQUAKE_VERSION = 1.0.9
-+#SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
+SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
-+##SDLQUAKE_AUTORECONF = NO
++SDLQUAKE_AUTORECONF = YES
+
-+SDLQUAKE_CONF_OPT = \
-+ --target=$(GNU_TARGET_NAME) \
-+ --host=$(GNU_TARGET_NAME) \
-+ --build=$(GNU_HOST_NAME) \
-+ --with-sdl-prefix=$(STAGING_DIR)/usr \
-+ --prefix=/usr \
-+ --sysconfdir=/etc
++SDLQUAKE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr
+
+SDLQUAKE_DEPENDENCIES = sdl
+
-+$(eval $(call AUTOTARGETS))
++define SDLQUAKE_AUTOCONF_FIXES
++ (cd $(@D); touch INSTALL NEWS README AUTHORS ChangeLog; \
++ echo "AC_PROG_CC" >> configure.in;)
++endef
+
-+NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
-+$(SDLQUAKE_TARGET_PATCH):
-+ $(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
-+ support/scripts/apply-patches.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
-+ (cd $(SDLQUAKE_DIR); \
-+ touch INSTALL NEWS README AUTHORS ChangeLog; \
-+ echo "AC_PROG_CC" >> configure.in; \
-+ aclocal; \
-+ autoconf; \
-+ automake --add-missing;)
-+ touch $@
++SDLQUAKE_POST_PATCH_HOOKS += SDLQUAKE_AUTOCONF_FIXES
++
++$(eval $(call AUTOTARGETS))
Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2012-02-21 17:41:55.000000000 +0100
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2012-07-21 19:13:42.000000000 +0200
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-08-11 20:31:09. |
