[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-220-g3158bde

[jorasse <jo...@us...>]

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  3158bde6608b426d320810245489431019001eb8 (commit)
      from  7aba0cfc01815f6eb644779ff239c3d4db005c3c (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 3158bde6608b426d320810245489431019001eb8
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Mar 29 02:33:21 2012 +0200

    [BUILROOT] update rxtx and use Buildroot AUTOTARGETS model

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

Summary of changes:
 ...patch => rxtx-2.1-7r2-001-remove-warning.patch} |    0
 ...a-1.6.patch => rxtx-2.1-7r2-fix-java-1.6.patch} |    0
 buildroot/package/armadeus/rxtx/rxtx.mk            |   59 ++------------------
 3 files changed, 6 insertions(+), 53 deletions(-)
 rename buildroot/package/armadeus/rxtx/{01-rxtx.patch => rxtx-2.1-7r2-001-remove-warning.patch} (100%)
 rename buildroot/package/armadeus/rxtx/{02-rxtx-2.1-7r2-fix-java-1.6.patch => rxtx-2.1-7r2-fix-java-1.6.patch} (100%)

diff --git a/buildroot/package/armadeus/rxtx/01-rxtx.patch b/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
similarity index 100%
rename from buildroot/package/armadeus/rxtx/01-rxtx.patch
rename to buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
diff --git a/buildroot/package/armadeus/rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch b/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
similarity index 100%
rename from buildroot/package/armadeus/rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch
rename to buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
diff --git a/buildroot/package/armadeus/rxtx/rxtx.mk b/buildroot/package/armadeus/rxtx/rxtx.mk
index 4d69e1a..4b87182 100644
--- a/buildroot/package/armadeus/rxtx/rxtx.mk
+++ b/buildroot/package/armadeus/rxtx/rxtx.mk
@@ -3,58 +3,11 @@
 # 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
+RXTX_VERSION = 2.1-7r2
+RXTX_SOURCE = rxtx-$(RXTX_VERSION).tgz
+RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
+RXTX_DEPENDENCIES = classpath
+RXTX_INSTALL_TARGET_OPT = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
 
-$(DL_DIR)/$(RXTX_LIB_SOURCE):
-	$(WGET) -P $(DL_DIR) $(RXTX_LIB_SITE)/$(RXTX_LIB_SOURCE)
+$(eval $(call AUTOTARGETS))
 
-$(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 classpath $(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