[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-81-gd31f3c4
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-81-gd31f3c4
|
From: Fabien M <fa...@us...> - 2011-04-26 12:39:25
|
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 d31f3c40f41bf3e505a7989c483e7c1e6a22375a (commit)
from a79dec3f0bb613e8e61c81e0f354dc731a7a2496 (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 d31f3c40f41bf3e505a7989c483e7c1e6a22375a
Author: Fabien Marteau <fab...@ar...>
Date: Tue Apr 26 14:35:40 2011 +0200
[BUILDROOT] Backport can-utils from buildroot and delete socketcan patch
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2010.11/042-socketcan.patch | 75 --------------------
.../2010.11/148-Backport_buildroot_can-utils.patch | 48 +++++++++++++
2 files changed, 48 insertions(+), 75 deletions(-)
delete mode 100644 patches/buildroot/2010.11/042-socketcan.patch
create mode 100644 patches/buildroot/2010.11/148-Backport_buildroot_can-utils.patch
diff --git a/patches/buildroot/2010.11/042-socketcan.patch b/patches/buildroot/2010.11/042-socketcan.patch
deleted file mode 100644
index 797688b..0000000
--- a/patches/buildroot/2010.11/042-socketcan.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Add socketcan package to BR
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-Signed-off-by: Kevin Joly <jol...@gm...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2011-04-18 10:46:11.633201002 +0200
-+++ buildroot/package/Config.in 2011-04-18 11:00:38.517201003 +0200
-@@ -428,6 +428,7 @@
- source "package/samba/Config.in"
- source "package/ser2net/Config.in"
- source "package/socat/Config.in"
-+source "package/socketcan/Config.in"
- source "package/spawn-fcgi/Config.in"
- source "package/squid/Config.in"
- source "package/tcpdump/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 18:22:09.000000000 +0200
-@@ -0,0 +1,15 @@
-+config BR2_PACKAGE_SOCKETCAN
-+ bool "Socket CAN"
-+ help
-+ The socketcan package is an implementation of CAN protocols
-+ (Controller Area Network) for Linux. CAN is a networking technology
-+ which has wide-spread use in automation, embedded devices, and
-+ automotive fields.
-+
-+ While there have been other CAN implementations for Linux based on
-+ character devices, Socket CAN uses the Berkeley socket API,
-+ the Linux network stack and implements the CAN device drivers as
-+ network interfaces. The CAN socket API has been designed as similar
-+ as possible to the TCP/IP protocols to allow programmers, familiar
-+ with network programming, to easily learn how to use CAN sockets.
-+
-Index: buildroot/package/socketcan/socketcan.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan.mk 2011-04-18 10:58:51.061201002 +0200
-@@ -0,0 +1,33 @@
-+#############################################################
-+#
-+# Socket CAN
-+#
-+#############################################################
-+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)}
-+SOCKETCAN_VERSION = 1235
-+SOCKETCAN_SOURCE = socketcan-svn-rev$(SOCKETCAN_VERSION).tar.gz
-+SOCKETCAN_SITE = http://svn.berlios.de/svnroot/repos/socketcan/trunk/
-+SOCKETCAN_SITE_METHOD = svn
-+
-+define SOCKETCAN_BUILD_CMDS
-+ $(MAKE) -C $(SOCKETCAN_DIR)/can-utils CC="$(TARGET_CC)"
-+endef
-+
-+define SOCKETCAN_INSTALL_TARGET_CMDS
-+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(SOCKETCAN_DIR)/can-utils install
-+ $(TARGET_STRIP) $(TARGET_DIR)/usr/local/bin/$(PROGRAMS)
-+endef
-+
-+define SOCKETCAN_CLEAN_CMDS
-+ $(MAKE) -C $(SOCKETCAN_DIR)/can-utils clean
-+endef
-+
-+define SOCKETCAN_UNINSTALL_TARGET_CMDS
-+ rm -rf $(SOCKETCAN_DIR)
-+endef
-+
-+$(eval $(call GENTARGETS,package,socketcan))
diff --git a/patches/buildroot/2010.11/148-Backport_buildroot_can-utils.patch b/patches/buildroot/2010.11/148-Backport_buildroot_can-utils.patch
new file mode 100644
index 0000000..b4a0be2
--- /dev/null
+++ b/patches/buildroot/2010.11/148-Backport_buildroot_can-utils.patch
@@ -0,0 +1,48 @@
+Backport can-utils from buildroot.
+can-utils contains several tools from socketcan to test
+a Controller Area Network.
+This patch replace 042-socketcan.patch.
+
+Signed-off-by : Kevin JOLY <jol...@gm...>
+---
+Index: buildroot/package/can-utils/can-utils.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/can-utils/can-utils.mk 2011-04-26 14:29:55.000000000 +0200
+@@ -0,0 +1,11 @@
++#############################################################
++#
++# can-utils
++#
++#############################################################
++
++CAN_UTILS_VERSION = 1235
++CAN_UTILS_SITE = svn://svn.berlios.de/socketcan/trunk/can-utils
++CAN_UTILS_AUTORECONF = YES
++
++$(eval $(call AUTOTARGETS,package,can-utils))
+Index: buildroot/package/can-utils/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/can-utils/Config.in 2011-04-26 14:29:55.000000000 +0200
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_CAN_UTILS
++ bool "can-utils"
++ help
++ SocketCAN is a set of open source CAN drivers and a
++ networking stack.
++ This package provides various tools for this stack.
++
++ http://developer.berlios.de/projects/socketcan/
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2011-04-26 14:32:35.000000000 +0200
++++ buildroot/package/Config.in 2011-04-26 14:33:21.000000000 +0200
+@@ -392,6 +392,7 @@
+ source "package/bluez3/Config.in"
+ source "package/bmon/Config.in"
+ source "package/bridge-utils/Config.in"
++source "package/can-utils/Config.in"
+ source "package/ctorrent/Config.in"
+ source "package/cups/Config.in"
+ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
hooks/post-receive
--
armadeus
|
