[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-19-ge397987

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  e3979878b7fee096a11d2326a7cc8becd8521148 (commit)
       via  b2c86ad0b8f9b95ca4370e2d0b8e1e7e202ebb3d (commit)
       via  cb719e1be8078a42c91a7e58e62d283eb381428a (commit)
      from  e0c45be25be609d641dd78ca40fbe907dc20b11a (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 e3979878b7fee096a11d2326a7cc8becd8521148
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 25 16:06:56 2010 +0200

    Updates /etc/armadeus-version following 3.3 release

commit b2c86ad0b8f9b95ca4370e2d0b8e1e7e202ebb3d
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 25 16:02:11 2010 +0200

    Update Changelog with 3.3 release date

commit cb719e1be8078a42c91a7e58e62d283eb381428a
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 25 15:47:55 2010 +0200

    [BUILDROOT] Some minor changes when generating socketcan archive

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

Summary of changes:
 ChangeLog                                          |    2 +-
 .../rootfs/target_skeleton/etc/armadeus-version    |    2 +-
 patches/buildroot/042-socketcan.patch              |   19 +++++++++----------
 patches/buildroot/2010.05/042-socketcan.patch      |    5 ++---
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0ecae0..aa3dd8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@
 
 ----
 
-Changes in release 3.3 (no due date yet)
+Changes in release 3.3 (released on July 30th 2010)
 
 * Wiki dump available here: http://www.armadeus.com/assos_downloads/wiki/armadeus-3.3_wiki_dump.tar.gz
 
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index eb39e53..519cec1 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-3.3
+3.3-git
diff --git a/patches/buildroot/042-socketcan.patch b/patches/buildroot/042-socketcan.patch
index 1ce66c8..ceb783c 100644
--- a/patches/buildroot/042-socketcan.patch
+++ b/patches/buildroot/042-socketcan.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2010-06-18 16:55:30.000000000 +0200
-+++ buildroot/package/Config.in	2010-06-18 16:56:50.000000000 +0200
-@@ -207,6 +207,7 @@
+--- buildroot.orig/package/Config.in	2010-08-25 15:29:37.000000000 +0200
++++ buildroot/package/Config.in	2010-08-25 15:31:44.000000000 +0200
+@@ -209,6 +209,7 @@
  source "package/rsync/Config.in"
  source "package/samba/Config.in"
  source "package/socat/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
 Index: buildroot/package/socketcan/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/Config.in	2010-06-18 16:59:38.000000000 +0200
++++ buildroot/package/socketcan/Config.in	2010-08-25 15:29:37.000000000 +0200
 @@ -0,0 +1,21 @@
 +config BR2_PACKAGE_SOCKETCAN
 +	bool "Socket CAN"
@@ -43,8 +43,8 @@ Index: buildroot/package/socketcan/Config.in
 Index: buildroot/package/socketcan/socketcan.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan.mk	2010-06-18 17:03:14.000000000 +0200
-@@ -0,0 +1,69 @@
++++ buildroot/package/socketcan/socketcan.mk	2010-08-25 15:33:14.000000000 +0200
+@@ -0,0 +1,68 @@
 +#############################################################
 +#
 +# Socket CAN
@@ -61,8 +61,7 @@ Index: buildroot/package/socketcan/socketcan.mk
 +$(DL_DIR)/$(SOCKETCAN_SOURCE):
 +	(cd $(BUILD_DIR); \
 +		$(SVN_CO) -r $(SOCKETCAN_REVISION) $(SOCKETCAN_TRUNK) $(SOCKETCAN_NAME); \
-+		tar -cvf $(SOCKETCAN_NAME).tar $(SOCKETCAN_NAME); \
-+		bzip2 $(SOCKETCAN_NAME).tar; \
++		tar -cjvf $(SOCKETCAN_SOURCE) --exclude=.svn $(SOCKETCAN_NAME); \
 +		rm -rf $(SOCKETCAN_DIR); \
 +		mv $(SOCKETCAN_SOURCE) $(DL_DIR)/$(SOCKETCAN_SOURCE); \
 +	)
@@ -117,7 +116,7 @@ Index: buildroot/package/socketcan/socketcan.mk
 Index: buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch	2010-06-18 17:03:41.000000000 +0200
++++ buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch	2010-08-25 15:29:37.000000000 +0200
 @@ -0,0 +1,33 @@
 +diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
 +--- socketcan-svn-rev810.org/can-utils/Makefile	2008-07-16 10:52:02.000000000 +0200
@@ -155,7 +154,7 @@ Index: buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
 Index: buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch	2010-06-18 17:04:29.000000000 +0200
++++ buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch	2010-08-25 15:29:37.000000000 +0200
 @@ -0,0 +1,63 @@
 +diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
 +--- socketcan-svn-rev874.org/can-utils/Makefile	2008-07-16 10:52:02.000000000 +0200
diff --git a/patches/buildroot/2010.05/042-socketcan.patch b/patches/buildroot/2010.05/042-socketcan.patch
index e14d1c3..e733d0d 100644
--- a/patches/buildroot/2010.05/042-socketcan.patch
+++ b/patches/buildroot/2010.05/042-socketcan.patch
@@ -44,7 +44,7 @@ Index: buildroot/package/socketcan/socketcan.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ buildroot/package/socketcan/socketcan.mk	2010-06-23 14:10:36.000000000 +0200
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,68 @@
 +#############################################################
 +#
 +# Socket CAN
@@ -61,8 +61,7 @@ Index: buildroot/package/socketcan/socketcan.mk
 +$(DL_DIR)/$(SOCKETCAN_SOURCE):
 +	(cd $(BUILD_DIR); \
 +		$(SVN_CO) -r $(SOCKETCAN_REVISION) $(SOCKETCAN_TRUNK) $(SOCKETCAN_NAME); \
-+		tar -cvf $(SOCKETCAN_NAME).tar $(SOCKETCAN_NAME); \
-+		bzip2 $(SOCKETCAN_NAME).tar; \
++		tar -cjvf $(SOCKETCAN_SOURCE) --exclude=.svn $(SOCKETCAN_NAME); \
 +		rm -rf $(SOCKETCAN_DIR); \
 +		mv $(SOCKETCAN_SOURCE) $(DL_DIR)/$(SOCKETCAN_SOURCE); \
 +	)


hooks/post-receive
-- 
armadeus


