[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-48-gb47f13d

[Fabien M <fa...@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  b47f13d5e124998907cb99d680a133c21058d99d (commit)
      from  e4e2a2df874bb3900fecf8b903a43a15ce662dd4 (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 b47f13d5e124998907cb99d680a133c21058d99d
Author: Kevin JOLY <jol...@gm...>
Date:   Tue Apr 12 14:21:57 2011 +0200

    [BUILDROOT][PACKAGE]Update makefile of the package socketCAN for linux-2.6.38.1
    
    Signed-off-by: Kevin JOLY <jol...@gm...>
    Signed-off-by: Fabien Marteau <fab...@ar...>

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

Summary of changes:
 patches/buildroot/2010.11/042-socketcan.patch |   27 +++++++++++-------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/patches/buildroot/2010.11/042-socketcan.patch b/patches/buildroot/2010.11/042-socketcan.patch
index f6c2b7d..59a016a 100644
--- a/patches/buildroot/2010.11/042-socketcan.patch
+++ b/patches/buildroot/2010.11/042-socketcan.patch
@@ -5,8 +5,8 @@ Signed-off-by: Kevin Joly <jol...@gm...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2011-04-11 17:20:44.237382997 +0200
-+++ buildroot/package/Config.in	2011-04-11 17:21:39.009383007 +0200
+--- buildroot.orig/package/Config.in	2011-04-12 14:13:34.037382997 +0200
++++ buildroot/package/Config.in	2011-04-12 14:14:25.261382995 +0200
 @@ -428,6 +428,7 @@
  source "package/samba/Config.in"
  source "package/ser2net/Config.in"
@@ -18,7 +18,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	2011-04-11 15:53:33.000000000 +0200
++++ buildroot/package/socketcan/Config.in	2011-04-12 14:13:34.057382996 +0200
 @@ -0,0 +1,15 @@
 +config BR2_PACKAGE_SOCKETCAN
 +	bool "Socket CAN"
@@ -38,8 +38,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	2011-04-11 17:06:23.000000000 +0200
-@@ -0,0 +1,57 @@
++++ buildroot/package/socketcan/socketcan.mk	2011-04-12 14:18:14.589382996 +0200
+@@ -0,0 +1,54 @@
 +#############################################################
 +#
 +# Socket CAN
@@ -51,8 +51,11 @@ Index: buildroot/package/socketcan/socketcan.mk
 +SOCKETCAN_DIR:=$(BUILD_DIR)/$(SOCKETCAN_NAME)
 +SOCKETCAN_SOURCE:=$(SOCKETCAN_NAME).tar.bz2
 +SOCKETCAN_CAT:=$(BZCAT)
-+PROGRAMS := can-calc-bit-timing candump cansniffer cansend canplayer cangen canbusload\
-+
++PROGRAMS_ISOTP = isotpdump,isotprecv,isotpsend,isotpsniffer,isotptun,isotpserver
++PROGRAMS_CANGW = cangw
++PROGRAMS_SLCAN = slcan_attach,slcand
++PROGRAMS_CAN_UTILS = can-calc-bit-timing,candump,cansniffer,cansend,canplayer,cangen,canbusload,log2long,log2asc,asc2log,canlogserver,bcmserver,slcanpty,canfdtest
++PROGRAMS = {$(PROGRAMS_ISOTP),$(PROGRAMS_CANGW),$(PROGRAMS_SLCAN),$(PROGRAMS_CAN_UTILS)}
 +
 +$(DL_DIR)/$(SOCKETCAN_SOURCE):
 +	(cd $(BUILD_DIR); \
@@ -63,31 +66,26 @@ Index: buildroot/package/socketcan/socketcan.mk
 +	)
 +
 +$(SOCKETCAN_DIR)/.unpacked: $(DL_DIR)/$(SOCKETCAN_SOURCE)
-+	$(SOCKETCAN_CAT) $($(SOCKETCAN_EXE)DL_DIR)/$(SOCKETCAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++	$(SOCKETCAN_CAT) $(DL_DIR)/$(SOCKETCAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 +	toolchain/patch-kernel.sh $(SOCKETCAN_DIR) package/socketcan $(SOCKETCAN_NAME)\*.patch
 +	touch $@
 +
-+
 +$(SOCKETCAN_DIR)/can-utils/$(PROGRAMS): $(SOCKETCAN_DIR)/.unpacked
 +	$(MAKE) -C $(SOCKETCAN_DIR)/can-utils CC="$(TARGET_CC)"
-+	touch $@
 +
 +$(TARGET_DIR)/usr/local/bin/$(PROGRAMS): $(SOCKETCAN_DIR)/can-utils/$(PROGRAMS)
 +	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(SOCKETCAN_DIR)/can-utils install
-+	touch $@
-+
++	
 +SOCKETCAN socketcan: $(TARGET_DIR)/usr/local/bin/$(PROGRAMS)
 +
 +socketcan-source: $(DL_DIR)/$(SOCKETCAN_SOURCE)
 +
 +socketcan-clean:
 +	$(MAKE) -C $(SOCKETCAN_DIR)/can-utils clean
-+	rm -rf $(TARGET_DIR)/local/bin/$(PROGRAMS)
 +
 +socketcan-dirclean:
 +	rm -rf $(SOCKETCAN_DIR)
 +
-+
 +############################################################
 +#
 +# Toplevel Makefile options
@@ -96,4 +94,3 @@ Index: buildroot/package/socketcan/socketcan.mk
 +ifeq ($(strip $(BR2_PACKAGE_SOCKETCAN)),y)
 +TARGETS+=socketcan
 +endif
-+


hooks/post-receive
-- 
armadeus