[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-379-gbb2a90c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-379-gbb2a90c
|
From: jorasse <jo...@us...> - 2011-02-27 20:51:00
|
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 bb2a90c3bd6e3a74e33148d02f067b8c0658fba8 (commit)
from 6536e5bda91040600c0f51d1193af5f2d65fa908 (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 bb2a90c3bd6e3a74e33148d02f067b8c0658fba8
Author: jorasse <jo...@ar...>
Date: Sun Feb 27 21:50:09 2011 +0100
[BUILDROOT] Add rxtx lib for java
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 1 +
buildroot/package/armadeus/rxtx/01-rxtx.patch | 90 ++++++++++++++++++++
.../rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch | 38 ++++++++
buildroot/package/armadeus/rxtx/Config.in | 12 +++
buildroot/package/armadeus/rxtx/rxtx.mk | 60 +++++++++++++
5 files changed, 201 insertions(+), 0 deletions(-)
create mode 100644 buildroot/package/armadeus/rxtx/01-rxtx.patch
create mode 100644 buildroot/package/armadeus/rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch
create mode 100644 buildroot/package/armadeus/rxtx/Config.in
create mode 100644 buildroot/package/armadeus/rxtx/rxtx.mk
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index e407932..642cf5a 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -9,6 +9,7 @@ source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
source package/armadeus/max5821ctrl/Config.in
source package/armadeus/pps/Config.in
+source package/armadeus/rxtx/Config.in
source package/armadeus/testsuite/Config.in
source package/armadeus/tfp410ctrl/Config.in
diff --git a/buildroot/package/armadeus/rxtx/01-rxtx.patch b/buildroot/package/armadeus/rxtx/01-rxtx.patch
new file mode 100644
index 0000000..bd8afb5
--- /dev/null
+++ b/buildroot/package/armadeus/rxtx/01-rxtx.patch
@@ -0,0 +1,90 @@
+--- rxtx-2.1-7r2/src/I2CImp.c.orig 2004-10-17 16:23:02.000000000 +0200
++++ rxtx-2.1-7r2/src/I2CImp.c 2006-10-26 21:25:32.000000000 +0200
+@@ -87,6 +87,7 @@
+ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__)
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -98,6 +99,7 @@
+ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ getchar();
+ }
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- rxtx-2.1-7r2/src/RawImp.c.orig 2004-10-16 18:20:35.000000000 +0200
++++ rxtx-2.1-7r2/src/RawImp.c 2006-10-26 21:25:59.000000000 +0200
+@@ -231,6 +231,7 @@
+ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__)
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -242,6 +243,7 @@
+ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ getchar();
+ }
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- rxtx-2.1-7r2/src/RS485Imp.c.orig 2004-10-16 18:20:35.000000000 +0200
++++ rxtx-2.1-7r2/src/RS485Imp.c 2006-10-26 21:26:23.000000000 +0200
+@@ -87,6 +87,7 @@
+ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__)
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -98,6 +99,7 @@
+ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ getchar();
+ }
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- rxtx-2.1-7r2/src/SerialImp.c.orig 2006-01-29 23:19:04.000000000 +0100
++++ rxtx-2.1-7r2/src/SerialImp.c 2006-10-26 21:26:59.000000000 +0200
+@@ -280,6 +280,7 @@
+ gettimeofday(&seloop, NULL);
+ #endif /* DEBUG_TIMING */
+ #if defined(DEBUG) && defined(__linux__)
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -295,6 +296,7 @@
+ getchar();
+ }
+ LEAVE( "RXTXPort:Initialize" );
++#endif
+ #endif /* DEBUG && __linux__ */
+ }
+
+--- rxtx-2.1-7r2/src/SerialImp.cpp.orig 2004-10-12 10:59:27.000000000 +0200
++++ rxtx-2.1-7r2/src/SerialImp.cpp 2006-10-26 21:27:44.000000000 +0200
+@@ -102,6 +102,7 @@
+ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #ifdef DEBUG
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -114,6 +115,7 @@
+ name.release);
+ getchar();
+ }
++#endif
+ #endif /* DEBUG */
+ #endif /* __BEOS__ */
+ #endif /* WIN32 */
diff --git a/buildroot/package/armadeus/rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch b/buildroot/package/armadeus/rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch
new file mode 100644
index 0000000..49c12cb
--- /dev/null
+++ b/buildroot/package/armadeus/rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch
@@ -0,0 +1,38 @@
+--- rxtx-2.1-7r2/configure.ori 2006-01-30 05:37:40.000000000 +0100
++++ rxtx-2.1-7r2/configure 2011-02-27 00:15:04.000000000 +0100
+@@ -21541,7 +21541,7 @@ Linux)
+ CFLAGS=$CFLAGS" -D__need_timespec"
+ case $JAVA_VERSION in
+
+- 1.2*|1.3*|1.4*|1.5*)
++ 1.2*|1.3*|1.4*|1.5*|1.6*)
+ #fix_parameters $JPATH/jre/lib/javax.comm.properties
+ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
+ JHOME=$JPATH"/jre/lib/ext"
+@@ -21611,7 +21611,7 @@ Linux)
+ TARGETLIB="\$(target_triplet)/librxtxSerial.la \
+ \$(target_triplet)/librxtxParallel.la"
+ case $JAVA_VERSION in
+- 1.2*|1.3*|1.4*|1.5*)
++ 1.2*|1.3*|1.4*|1.5*|1.6*)
+ #fix_parameters $JPATH/jre/lib/javax.comm.properties
+ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
+ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+@@ -21747,7 +21747,7 @@ BeOS)
+
+ WIN32)
+ case $JAVA_VERSION in
+- 1.2*|1.3*|1.4*|1.5*)
++ 1.2*|1.3*|1.4*|1.5*|1.6*)
+ CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
+ JHOME=$JPATH"/jre/lib/ext"
+ ;;
+@@ -21799,7 +21799,7 @@ Solaris*)
+ CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
+
+ case $JAVA_VERSION in
+- 1.2*|1.3*|1.4*|1.5*)
++ 1.2*|1.3*|1.4*|1.5*|1.6*)
+ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+ ;;
+ 1.1*)
diff --git a/buildroot/package/armadeus/rxtx/Config.in b/buildroot/package/armadeus/rxtx/Config.in
new file mode 100644
index 0000000..78f4369
--- /dev/null
+++ b/buildroot/package/armadeus/rxtx/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_RXTX
+ bool "rxtx"
+ depends on BR2_PACKAGE_CLASSPATH
+ help
+ RXTX is a Java library, providing serial and parallel communication.
+
+ RXTX is a Java library, using a native implementation (via JNI),
+ providing serial and parallel communication for the Java Development
+ Toolkit (JDK).
+
+
+ http://rxtx.qbang.org
diff --git a/buildroot/package/armadeus/rxtx/rxtx.mk b/buildroot/package/armadeus/rxtx/rxtx.mk
new file mode 100644
index 0000000..9826ff6
--- /dev/null
+++ b/buildroot/package/armadeus/rxtx/rxtx.mk
@@ -0,0 +1,60 @@
+#############################################################
+#
+# rxtx lib for java
+#
+#############################################################
+RXTX_LIB_VERSION:=2.1-7r2
+RXTX_LIB_SOURCE:=rxtx-$(RXTX_LIB_VERSION).zip
+RXTX_LIB_SITE:=http://rxtx.qbang.org/pub/rxtx/
+RXTX_LIB_DIR:=$(BUILD_DIR)/rxtx-$(RXTX_LIB_VERSION)
+RXTX_LIB_BINARY:=RXTXcomm.jar
+RXTX_LIB_TARGET_BINARY:=usr/lib/classpath
+
+$(DL_DIR)/$(RXTX_LIB_SOURCE):
+ $(WGET) -P $(DL_DIR) $(RXTX_LIB_SITE)/$(RXTX_LIB_SOURCE)
+
+$(RXTX_LIB_DIR)/.unpacked: $(DL_DIR)/$(RXTX_LIB_SOURCE)
+ unzip $(DL_DIR)/$(RXTX_LIB_SOURCE) -d $(BUILD_DIR)
+ toolchain/patch-kernel.sh $(RXTX_LIB_DIR) package/armadeus/rxtx *.patch
+ touch $@
+
+$(RXTX_LIB_DIR)/.configured: $(RXTX_LIB_DIR)/.unpacked
+ (cd $(RXTX_LIB_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ )
+ touch $@
+
+$(RXTX_LIB_DIR)/$(RXTX_LIB_BINARY): $(RXTX_LIB_DIR)/.configured
+ $(MAKE) -C $(RXTX_LIB_DIR)
+
+$(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY): $(RXTX_LIB_DIR)/$(RXTX_LIB_BINARY)
+ cp -rdpf $(RXTX_LIB_DIR)/arm-unknown-linux-gnu/.libs/librxtx*.so* $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY)
+ cp -rdpf $(RXTX_LIB_DIR)/RXTXcomm.jar $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY)/librxtx*.so*
+
+rxtx: uclibc $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY)
+
+rxtx-source: $(DL_DIR)/$(RXTX_LIB_SOURCE)
+
+rxtx-clean:
+ rm -f $(addprefix $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY),librxtx*.so* RXTXcomm.jar)
+ -$(MAKE) -C $(RXTX_LIB_DIR) clean
+
+rxtx-dirclean:
+ rm -rf $(RXTX_LIB_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_RXTX)),y)
+TARGETS+=rxtx
+endif
hooks/post-receive
--
armadeus
|
