[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-519-ge721753
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-519-ge721753
|
From: Fabien M <fa...@us...> - 2010-07-07 14:27:36
|
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 e721753edf82bc833207bd6314e0dd7ea1ebaa6c (commit)
from cfcd5af421528a5af9cc0f26c9737ddd48a5927a (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 e721753edf82bc833207bd6314e0dd7ea1ebaa6c
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jul 7 16:27:04 2010 +0200
[package][joysticktest] armadeus buildroot is too old for GENTARGETS makefile, use manual makefile instead
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 71 +++++++++++++------
1 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index 68f5fe0..eed2817 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -5,7 +5,7 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/joysticktest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/Config.in 2010-07-07 09:46:38.000000000 +0200
++++ buildroot/package/joysticktest/Config.in 2010-07-07 11:52:54.000000000 +0200
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_JOYSTICKTEST
+ bool "joysticktest"
@@ -13,8 +13,8 @@ Index: buildroot/package/joysticktest/Config.in
+ jstest and jscal joystick testing programs.
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-07 09:42:49.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-07 09:57:48.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-07-07 11:52:54.000000000 +0200
++++ buildroot/package/Config.in 2010-07-07 11:52:54.000000000 +0200
@@ -499,5 +499,6 @@
# various games packages
@@ -25,7 +25,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-07 09:26:04.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-07 11:52:54.000000000 +0200
@@ -0,0 +1,204 @@
+Index: joystick-1.2.15/Makefile
+===================================================================
@@ -234,31 +234,56 @@ Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_p
Index: buildroot/package/joysticktest/joysticktest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest.mk 2010-07-07 10:14:49.000000000 +0200
-@@ -0,0 +1,26 @@
-+############################################################
++++ buildroot/package/joysticktest/joysticktest.mk 2010-07-07 16:24:31.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
+#
+# Joysticktest
+#
-+############################################################
++#############################################################
+JOYSTICKTEST_VERSION:=1.2.15
+JOYSTICKTEST_SOURCE:=joystick-$(JOYSTICKTEST_VERSION).tar.gz
-+JOYSTICKTEST_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/
-+JOYSTICKTEST_INSTALL_STAGING=YES
-+JOYSTICKTEST_DEPENDENCIES =
++JOYSTICKTEST_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/
++JOYSTICKTEST_DIR:=$(BUILD_DIR)/joystick-$(JOYSTICKTEST_VERSION)
++JOYSTICKTEST_JSTEST_BINARY:=jstest
++JOYSTICKTEST_TARGET_JSTEST_BINARY:=usr/bin/jstest
++
++$(DL_DIR)/$(JOYSTICKTEST_SOURCE):
++ $(call DOWNLOAD,$(JOYSTICKTEST_SITE),$(JOYSTICKTEST_SOURCE))
++
++$(JOYSTICKTEST_DIR)/.source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
++ $(ZCAT) $(DL_DIR)/$(JOYSTICKTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ cd $(BUILD_DIR);patch -p0 < $(BASE_DIR)/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
++ touch $@
++
++$(JOYSTICKTEST_DIR)/.configured: $(JOYSTICKTEST_DIR)/.source
++ touch $@
++
++$(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY): $(JOYSTICKTEST_DIR)/.configured
++ $(MAKE) CC=$(TARGET_CC) -C $(JOYSTICKTEST_DIR)
++
++$(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY): $(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY)
++ install -D $(JOYSTICKTEST_DIR)/jstest $(TARGET_DIR)/usr/bin/
++ install -D $(JOYSTICKTEST_DIR)/jscal $(TARGET_DIR)/usr/bin/
++ rm -Rf $(TARGET_DIR)/usr/man
+
-+define JOYSTICKTEST_BUILD_CMDS
-+ $(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) -C $(@D) all
-+endef
++joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
+
-+define JOYSTICKTEST_INSTALL_STAGING_CMDS
-+ $(INSTALL) -D $(@D)/jstest $(STAGING_DIR)/usr/bin/jstest
-+ $(INSTALL) -D $(@D)/jscal $(STAGING_DIR)/usr/bin/jscal
-+endef
++joysticktest-source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
+
-+define JOYSTICKTEST_INSTALL_TARGET_CMDS
-+ cp -dpf $(@D)/jstest $(TARGET_DIR)/usr/bin/jstest
-+ cp -dpf $(@D)/jscal $(TARGET_DIR)/usr/bin/jscal
-+endef
++joysticktest-clean:
++ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(JOYSTICKTEST_DIR) uninstall
++ -$(MAKE) -C $(JOYSTICKTEST_DIR) clean
++
++joysticktest-dirclean:
++ rm -rf $(JOYSTICKTEST_DIR)
++
++############################################################
++#
++# Toplevel Makefile options
++#
++############################################################
++ifeq ($(BR2_PACKAGE_JOYSTICKTEST),y)
++ARGETS+=joysticktest
++endif
+
-+$(eval $(call GENTARGETS,package,joysticktest,target))
hooks/post-receive
--
armadeus
|
