[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-528-g5d7f48a

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  5d7f48a9346eabf5bf67655a42e960c8055a731f (commit)
       via  19b841c1ed40b1926b18af0cc77fb48adabe43a3 (commit)
      from  dfcdff1e9c7eb46a3b532cd3564ce21fb2f16db9 (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 5d7f48a9346eabf5bf67655a42e960c8055a731f
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jul 13 11:03:28 2010 +0200

    [buildroot] Cleaning pickit2 package

commit 19b841c1ed40b1926b18af0cc77fb48adabe43a3
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jul 13 09:47:45 2010 +0200

    [buildroot] patch 123 and 124 in the right order

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

Summary of changes:
 ...est-add_joystick_testing_programs_package.patch |  130 ++++++++++----------
 ...ickit2-add_pickit2_programer_command_line.patch |   65 +++--------
 2 files changed, 80 insertions(+), 115 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 e6b0a19..84fda47 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -2,15 +2,6 @@ Adding jstest and jscal joystick testing programs
 
 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 11:52:54.000000000 +0200
-@@ -0,0 +1,4 @@
-+config BR2_PACKAGE_JOYSTICKTEST
-+        bool "joysticktest"
-+        help
-+            jstest and jscal joystick testing programs.
 Index: buildroot/package/Config.in
 ===================================================================
 --- buildroot.orig/package/Config.in	2010-07-07 11:52:54.000000000 +0200
@@ -22,6 +13,71 @@ Index: buildroot/package/Config.in
 +source "package/joysticktest/Config.in"
  
  endmenu
+Index: buildroot/package/joysticktest/Config.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/joysticktest/Config.in	2010-07-07 11:52:54.000000000 +0200
+@@ -0,0 +1,4 @@
++config BR2_PACKAGE_JOYSTICKTEST
++        bool "joysticktest"
++        help
++            jstest and jscal joystick testing programs.
+Index: buildroot/package/joysticktest/joysticktest.mk
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ 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_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
++
++joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
++
++joysticktest-source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
++
++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
++
 Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -231,59 +287,3 @@ Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_p
 + #include <sys/ioctl.h>
 + #include <sys/time.h>
 + #include <fcntl.h>
-Index: buildroot/package/joysticktest/joysticktest.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ 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_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
-+
-+joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
-+
-+joysticktest-source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
-+
-+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)
-+TARGETS+=joysticktest
-+endif
-+
diff --git a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
index 359c4f9..bcad84c 100644
--- a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
+++ b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
@@ -1,41 +1,11 @@
-Index: buildroot/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch	2010-07-12 18:17:35.000000000 +0200
-@@ -0,0 +1,29 @@
-+Index: pk2cmdv1.20LinuxMacSource/Makefile
-+===================================================================
-+--- pk2cmdv1.20LinuxMacSource.orig/Makefile	2010-07-12 17:33:48.000000000 +0200
-++++ pk2cmdv1.20LinuxMacSource/Makefile	2010-07-12 17:33:56.000000000 +0200
-+@@ -12,9 +12,13 @@
-+ # or

-+ #    make mac

-+ #

-++ifeq ($(ARMADEUS_BASE_DIR),)

-++	ARMADEUS_BASE_DIR=../../../

-++endif

-++include $(ARMADEUS_BASE_DIR)/Makefile.in

-+ 

-+ APP=pk2cmd

-+-CC=g++

-++CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++

-+ # Uncomment this for debugging with gdb

-+ #DBG=-ggdb -O0

-+ # Uncomment this for no debugging (default)

-+@@ -24,7 +28,8 @@
-+ 

-+ # Grab the version of libusb in /usr/local if possible:

-+ LIBUSB=/usr/local

-+-LDFLAGS=-L$(LIBUSB)/lib -lusb

-++LDFLAGS=-L$(ARMADEUS_STAGING_DIR)/usr/lib/ -lusb

-++#LDFLAGS=-L$(LIBUSB)/lib -lusb

-+ 

-+ # CHOOSE A TARGET BEFORE COMPILING

-+ #

+Adding PICKit 2 programmer command line
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2010-07-12 17:59:53.000000000 +0200
-+++ buildroot/package/Config.in	2010-07-12 18:17:35.000000000 +0200
+--- buildroot.orig/package/Config.in	2010-07-13 10:10:50.000000000 +0200
++++ buildroot/package/Config.in	2010-07-13 10:10:50.000000000 +0200
 @@ -268,6 +268,7 @@
  source "package/i2c-tools/Config.in"
  source "package/input-tools/Config.in"
@@ -47,7 +17,7 @@ Index: buildroot/package/Config.in
 Index: buildroot/package/pickit2/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/Config.in	2010-07-12 18:17:35.000000000 +0200
++++ buildroot/package/pickit2/Config.in	2010-07-13 10:10:50.000000000 +0200
 @@ -0,0 +1,5 @@
 +config BR2_PACKAGE_PICKIT2
 +        bool "pickit2"
@@ -57,8 +27,8 @@ Index: buildroot/package/pickit2/Config.in
 Index: buildroot/package/pickit2/pickit2.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/pickit2.mk	2010-07-12 18:48:52.000000000 +0200
-@@ -0,0 +1,54 @@
++++ buildroot/package/pickit2/pickit2.mk	2010-07-13 11:01:08.000000000 +0200
+@@ -0,0 +1,49 @@
 +#############################################################
 +#
 +# PICkit2
@@ -67,8 +37,8 @@ Index: buildroot/package/pickit2/pickit2.mk
 +PICKIT2_VERSION:=1.20
 +PICKIT2_BINARY:=pk2cmd
 +PICKIT2_SOURCE:=$(PICKIT2_BINARY)v$(PICKIT2_VERSION)LinuxMacSource.tar.gz
-+PICKIT2_SITE =http://ww1.microchip.com/downloads/en/DeviceDoc/
-+PICKIT2_DIR:=$(BUILD_DIR)/pickit2-$(PICKIT2_VERSION)
++PICKIT2_SITE:=http://ww1.microchip.com/downloads/en/DeviceDoc/
++PICKIT2_DIR:=$(BUILD_DIR)/pickit2-$(PICKIT2_VERSION)/
 +PICKIT2_TARGET_BINARY:=usr/bin/pk2cmd
 +
 +$(DL_DIR)/$(PICKIT2_SOURCE):
@@ -76,7 +46,6 @@ Index: buildroot/package/pickit2/pickit2.mk
 +
 +$(PICKIT2_DIR)/.source: $(DL_DIR)/$(PICKIT2_SOURCE)
 +	$(ZCAT) $(DL_DIR)/$(PICKIT2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+	cd $(BUILD_DIR);patch -p0 < $(BASE_DIR)/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch
 +	mv $(BUILD_DIR)/$(PICKIT2_BINARY)v$(PICKIT2_VERSION)LinuxMacSource $(PICKIT2_DIR)
 +	touch $@
 +
@@ -84,21 +53,17 @@ Index: buildroot/package/pickit2/pickit2.mk
 +	touch $@
 +
 +$(PICKIT2_DIR)/$(PICKIT2_BINARY): $(PICKIT2_DIR)/.configured
-+	$(MAKE) -C $(PICKIT2_DIR) linux
++	$(MAKE) -C $(PICKIT2_DIR) CC=$(TARGET_CXX) LIBUSB=$(STAGING_DIR)/usr/lib/ TARGET=linux
 +
 +$(TARGET_DIR)/$(PICKIT2_TARGET_BINARY): $(PICKIT2_DIR)/$(PICKIT2_BINARY)
-+	install -D $(PICKIT2_DIR)/PK2DeviceFile.dat $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
-+	install -D $(PICKIT2_DIR)/pk2cmd $(TARGET_DIR)/usr/bin/pk2cmd
-+	chmod 755 $(TARGET_DIR)/usr/bin/pk2cmd
-+	chmod 755 $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
-+	rm -Rf $(TARGET_DIR)/usr/man
++	$(INSTALL) -D $(PICKIT2_DIR)/PK2DeviceFile.dat $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
++	$(INSTALL) -D $(PICKIT2_DIR)/pk2cmd $(TARGET_DIR)/usr/bin/pk2cmd
 +
-+pickit2: uclibc libusb $(TARGET_DIR)/$(PICKIT2_TARGET_BINARY)
++pickit2: libusb $(TARGET_DIR)/$(PICKIT2_TARGET_BINARY)
 +
 +pickit2-source: $(DL_DIR)/$(PICKIT2_SOURCE)
 +
 +pickit2-clean:
-+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(PICKIT2_DIR) uninstall
 +	-$(MAKE) -C $(PICKIT2_DIR) clean
 +
 +pickit2-dirclean:


hooks/post-receive
-- 
armadeus


