[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-64-g70121b2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-64-g70121b2
|
From: Fabien M <fa...@us...> - 2011-04-18 13:36:34
|
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 70121b2381083d23194405e967fdf39e2018376f (commit)
via cb1525a874d4bb7d4e3f54c4a578abdbac462037 (commit)
from 601d11b96700d0af4fe86c3dda62a7e59a150bea (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 70121b2381083d23194405e967fdf39e2018376f
Author: Kevin JOLY <jol...@gm...>
Date: Mon Apr 18 11:08:21 2011 +0200
[BUILDROOT]Update makefile of socketcan in GENTARGET format
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
commit cb1525a874d4bb7d4e3f54c4a578abdbac462037
Author: Kevin JOLY <jol...@gm...>
Date: Mon Apr 18 10:39:28 2011 +0200
[BUILDROOT]IPROUTE2 selected by default in config
Signed-off-by: Kevin JOLY <jol...@gm...>
Signed-off-by: Fabien Marteau <fab...@ar...>
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 6 +-
patches/buildroot/2010.11/042-socketcan.patch | 58 ++++++++-----------------
2 files changed, 21 insertions(+), 43 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index f9c9708..a9be4e6 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00004-ge0d9cff
-# Tue Mar 22 00:22:47 2011
+# Buildroot version: 2010.11-00056-g54a6154
+# Mon Apr 18 09:30:00 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -667,7 +667,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IPERF is not set
-# BR2_PACKAGE_IPROUTE2 is not set
+BR2_PACKAGE_IPROUTE2=y
# BR2_PACKAGE_IPSEC_TOOLS is not set
# BR2_PACKAGE_IPTABLES is not set
# BR2_PACKAGE_IW is not set
diff --git a/patches/buildroot/2010.11/042-socketcan.patch b/patches/buildroot/2010.11/042-socketcan.patch
index 710825b..797688b 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-14 11:00:01.037201002 +0200
-+++ buildroot/package/Config.in 2011-04-14 11:01:48.489201004 +0200
+--- 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"
@@ -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-14 11:00:01.061201003 +0200
++++ buildroot/package/socketcan/Config.in 2011-04-11 18:22:09.000000000 +0200
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_SOCKETCAN
+ bool "Socket CAN"
@@ -38,60 +38,38 @@ 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-14 11:02:47.957201006 +0200
-@@ -0,0 +1,55 @@
++++ buildroot/package/socketcan/socketcan.mk 2011-04-18 10:58:51.061201002 +0200
+@@ -0,0 +1,33 @@
+#############################################################
+#
+# Socket CAN
+#
+#############################################################
-+SOCKETCAN_TRUNK:=http://svn.berlios.de/svnroot/repos/socketcan/trunk
-+SOCKETCAN_REVISION:=1235
-+SOCKETCAN_NAME:=socketcan-svn-rev$(SOCKETCAN_REVISION)
-+SOCKETCAN_DIR:=$(BUILD_DIR)/$(SOCKETCAN_NAME)
-+SOCKETCAN_SOURCE:=$(SOCKETCAN_NAME).tar.bz2
-+SOCKETCAN_CAT:=$(BZCAT)
+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
+
-+$(DL_DIR)/$(SOCKETCAN_SOURCE):
-+ (cd $(BUILD_DIR); \
-+ svn co -r $(SOCKETCAN_REVISION) $(SOCKETCAN_TRUNK) $(SOCKETCAN_NAME); \
-+ tar -cjvf $(SOCKETCAN_SOURCE) --exclude=.svn $(SOCKETCAN_NAME); \
-+ rm -rf $(SOCKETCAN_DIR); \
-+ mv $(SOCKETCAN_SOURCE) $(DL_DIR)/$(SOCKETCAN_SOURCE); \
-+ )
-+
-+$(SOCKETCAN_DIR)/.unpacked: $(DL_DIR)/$(SOCKETCAN_SOURCE)
-+ $(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
++define SOCKETCAN_BUILD_CMDS
+ $(MAKE) -C $(SOCKETCAN_DIR)/can-utils CC="$(TARGET_CC)"
++endef
+
-+$(TARGET_DIR)/usr/local/bin/$(PROGRAMS): $(SOCKETCAN_DIR)/can-utils/$(PROGRAMS)
++define SOCKETCAN_INSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(SOCKETCAN_DIR)/can-utils install
+ $(TARGET_STRIP) $(TARGET_DIR)/usr/local/bin/$(PROGRAMS)
++endef
+
-+SOCKETCAN socketcan: $(TARGET_DIR)/usr/local/bin/$(PROGRAMS)
-+
-+socketcan-source: $(DL_DIR)/$(SOCKETCAN_SOURCE)
-+
-+socketcan-clean:
++define SOCKETCAN_CLEAN_CMDS
+ $(MAKE) -C $(SOCKETCAN_DIR)/can-utils clean
++endef
+
-+socketcan-dirclean:
++define SOCKETCAN_UNINSTALL_TARGET_CMDS
+ rm -rf $(SOCKETCAN_DIR)
++endef
+
-+############################################################
-+#
-+# Toplevel Makefile options
-+#
-+############################################################
-+ifeq ($(strip $(BR2_PACKAGE_SOCKETCAN)),y)
-+TARGETS+=socketcan
-+endif
++$(eval $(call GENTARGETS,package,socketcan))
hooks/post-receive
--
armadeus
|
