[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2653-gd4438cc
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2653-gd4438cc
|
From: Julien B a. A. <ar...@us...> - 2012-01-04 09:01:30
|
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 d4438cc0d2181073bfee030009086df485137fe9 (commit)
via 88f3dd818d6667597de656412d468b78c012dea4 (commit)
via beb1de77ca9bd33299a572285d05f18de818f734 (commit)
from c5726e6540e23497a09314343936baba3d9d4e99 (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 d4438cc0d2181073bfee030009086df485137fe9
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 4 10:00:05 2012 +0100
[BUILD] scripts/quiltify.sh: check if quilt is installed before launching the beast
commit 88f3dd818d6667597de656412d468b78c012dea4
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 4 09:58:33 2012 +0100
[BUILDROOT] Add CanFestival package
commit beb1de77ca9bd33299a572285d05f18de818f734
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 4 09:55:34 2012 +0100
[BUILDROOT] Get mainlined mercurial download method for packages
-----------------------------------------------------------------------
Summary of changes:
...7-buildroot-add_mercurial_download_method.patch | 84 +++++++++++
.../2011.05/168-libcanfestival-add_package.patch | 149 ++++++++++++++++++++
patches/buildroot/2011.05/cleanup_buildroot.sh | 1 +
scripts/quiltify.sh | 6 +
4 files changed, 240 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2011.05/167-buildroot-add_mercurial_download_method.patch
create mode 100644 patches/buildroot/2011.05/168-libcanfestival-add_package.patch
diff --git a/patches/buildroot/2011.05/167-buildroot-add_mercurial_download_method.patch b/patches/buildroot/2011.05/167-buildroot-add_mercurial_download_method.patch
new file mode 100644
index 0000000..38c3182
--- /dev/null
+++ b/patches/buildroot/2011.05/167-buildroot-add_mercurial_download_method.patch
@@ -0,0 +1,84 @@
+From f694c0761d15901b74e972b08938fecfda3b510b Mon Sep 17 00:00:00 2001
+From: Thomas De Schampheleire <pat...@gm...>
+Date: Wed, 19 Oct 2011 07:25:47 +0000
+Subject: Add support for packages stored in Mercurial (hg) repositories
+
+Add support for packages stored in Mercurial (hg) repositories.
+
+Signed-off-by: Thomas De Schampheleire <tho...@gm...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+(limited to 'package/Makefile.package.in')
+
+Index: buildroot/package/Makefile.package.in
+===================================================================
+--- buildroot.orig/package/Makefile.package.in 2012-01-03 19:24:09.000000000 +0100
++++ buildroot/package/Makefile.package.in 2012-01-03 19:24:09.000000000 +0100
+@@ -73,6 +73,7 @@
+ SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET)
+ BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET)
+ GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
++HG:=$(call qstrip,$(BR2_HG)) $(QUIET)
+ COPY:=$(call qstrip,$(BR2_COPY)) $(QUIET)
+
+ # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
+@@ -158,6 +159,27 @@
+ endef
+
+
++define DOWNLOAD_HG
++ test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
++ (pushd $(DL_DIR) > /dev/null && \
++ $(HG) clone --noupdate --rev $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
++ $(HG) archive --repository $($(PKG)_BASE_NAME) --type tgz --prefix $($(PKG)_BASE_NAME)/ \
++ --rev $($(PKG)_DL_VERSION) $(DL_DIR)/$($(PKG)_SOURCE) && \
++ rm -rf $($(PKG)_DL_DIR) && \
++ popd > /dev/null)
++endef
++
++# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
++# repository
++define SOURCE_CHECK_HG
++ $(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null
++endef
++
++define SHOW_EXTERNAL_DEPS_HG
++ echo $($(PKG)_SOURCE)
++endef
++
++
+ define DOWNLOAD_WGET
+ test -e $(DL_DIR)/$(2) || \
+ $(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2)
+@@ -212,6 +234,7 @@
+ svn) $($(DL_MODE)_SVN) && exit ;; \
+ bzr) $($(DL_MODE)_BZR) && exit ;; \
+ copy) $($(DL_MODE)_COPY) && exit ;; \
++ hg) $($(DL_MODE)_HG) && exit ;; \
+ *) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
+ esac ; \
+ fi ; \
+@@ -535,6 +558,8 @@
+ DL_TOOLS_DEPENDENCIES += git
+ else ifeq ($$($(2)_SITE_METHOD),bzr)
+ DL_TOOLS_DEPENDENCIES += bzr
++else ifeq ($$($(2)_SITE_METHOD),hg)
++DL_TOOLS_DEPENDENCIES += hg
+ endif # SITE_METHOD
+
+ endif # BR2_PACKAGE_$(2)
+Index: buildroot/Config.in
+===================================================================
+--- buildroot.orig/Config.in 2012-01-03 19:38:35.000000000 +0100
++++ buildroot/Config.in 2012-01-03 19:39:07.000000000 +0100
+@@ -36,6 +36,10 @@
+ string "Git command"
+ default "git"
+
++config BR2_HG
++ string "Mercurial (hg) command"
++ default "hg"
++
+ config BR2_ZCAT
+ string "zcat command"
+ default "gzip -d -c"
diff --git a/patches/buildroot/2011.05/168-libcanfestival-add_package.patch b/patches/buildroot/2011.05/168-libcanfestival-add_package.patch
new file mode 100644
index 0000000..788254f
--- /dev/null
+++ b/patches/buildroot/2011.05/168-libcanfestival-add_package.patch
@@ -0,0 +1,149 @@
+Index: buildroot/package/libcanfestival/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcanfestival/Config.in 2012-01-04 09:39:30.000000000 +0100
+@@ -0,0 +1,83 @@
++config BR2_PACKAGE_LIBCANFESTIVAL
++ bool "CanFestival"
++ help
++ CanFestival is an OpenSource CANOpen framework, licensed with GPLv2
++ and LGPLv2.
++
++ http://www.canfestival.org
++
++if BR2_PACKAGE_LIBCANFESTIVAL
++menu "CanFestival configuration options"
++ config BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN
++ string "Number of can bus to use"
++ default "4"
++
++ choice
++ prompt "Driver to use"
++ default BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
++ bool "anagate_linux"
++ help
++ AnaGate CAN(duo) driver for linux
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
++ bool "peak_linux"
++ help
++ Linux build host installed Peak driver and library
++ http://www.peak-system.com/linux/
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
++ bool "virtual"
++ help
++ Unix pipe based virtual can driver
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
++ bool "virtual_kernel"
++ help
++ Kernel module virtual can driver
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++ bool "socket"
++ help
++ Socket-can
++ http://developer.berlios.de/projects/socketcan/
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
++ bool "lincan"
++ help
++ Lincan driver
++ http://www.ocera.org/download/components/WP7/lincan-0.3.3.html
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
++ bool "can4linux"
++ help
++ Can4linux driver
++ http://www.port.de/engl/canprod/hw_can4linux.html
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_LINUX
++ bool "copcican_linux"
++ help
++ User space driver interface for CO-PCICAN card
++ http://www.cosateq.com/
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
++ bool "copcican_comedi"
++ help
++ COMEDI driver interface for CO-PCICAN card
++ http://www.cosateq.com/
++ endchoice
++
++ config BR2_PACKAGE_LIBCANFESTIVAL_DRIVER
++ string
++ default "anagate_linux" if BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
++ default "peak_linux" if BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
++ default "virtual" if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
++ default "virtual_kernel" if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
++ default "socket" if BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++ default "lincan" if BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
++ default "can4linux" if BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
++ default "copcican_linux" if BR2_PACKAGE_LIBCANFESTIVAL_COCPICAN_LINUX
++ default "copcican_comedi" if BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
++endmenu
++endif
+Index: buildroot/package/libcanfestival/libcanfestival.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcanfestival/libcanfestival.mk 2012-01-04 09:41:43.000000000 +0100
+@@ -0,0 +1,44 @@
++#############################################################
++#
++# libcanfestival
++#
++#############################################################
++# Revision 705:
++LIBCANFESTIVAL_VERSION = 3bbc9aeba925
++LIBCANFESTIVAL_SITE_METHOD = hg
++LIBCANFESTIVAL_SITE = http://dev.automforge.net/CanFestival-3
++LIBCANFESTIVAL_INSTALL_STAGING = YES
++
++define LIBCANFESTIVAL_CONFIGURE_CMDS
++ cd $(@D) && \
++ ./configure --binutils=$(TARGET_CROSS) --cc="$(TARGET_CC)" \
++ --cxx="$(TARGET_CC)" --ld="$(TARGET_CC)" --prefix=$(TARGET_DIR)/usr \
++ --can=$(BR2_PACKAGE_LIBCANFESTIVAL_DRIVER) \
++ --MAX_CAN_BUS_ID=$(BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN)
++endef
++
++define LIBCANFESTIVAL_BUILD_CMDS
++ $(MAKE) -C $(@D) all
++endef
++
++define LIBCANFESTIVAL_INSTALL_TARGET_CMDS
++ $(MAKE) -C $(@D)/src install
++ $(MAKE) -C $(@D)/drivers install
++ $(MAKE) -C $(@D)/examples install
++endef
++
++define LIBCANFESTIVAL_INSTALL_STAGING_CMDS
++ $(MAKE) -C $(@D)/src install PREFIX=$(STAGING_DIR)
++ $(MAKE) -C $(@D)/drivers install PREFIX=$(STAGING_DIR)
++ $(MAKE) -C $(@D)/examples install PREFIX=$(STAGING_DIR)
++endef
++
++define LIBCANFESTIVAL_CLEAN_CMDS
++ $(MAKE) -C $(@D) mrproper
++endef
++
++define LIBCANFESTIVAL_UNINSTALL_TARGET_CMDS
++ $(MAKE) -C $(@D) uninstall
++endef
++
++$(eval $(call GENTARGETS,package,libcanfestival))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-01-04 09:12:44.000000000 +0100
++++ buildroot/package/Config.in 2012-01-04 09:14:15.000000000 +0100
+@@ -339,6 +339,7 @@
+ #endif
+
+ menu "Networking"
++source "package/libcanfestival/Config.in"
+ source "package/libcgi/Config.in"
+ source "package/libcgicc/Config.in"
+ source "package/libcurl/Config.in"
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index e1018c9..b0a8a7f 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -61,3 +61,4 @@ rm -rf buildroot/package/libmodbus
rm -rf buildroot/package/nanocom
rm -rf buildroot/package/elftosb
rm -rf buildroot/package/rt-tests
+rm -rf buildroot/package/libcanfestival
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index f46920b..2cf7e2d 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -41,6 +41,12 @@ ask_user_choice()
}
+QUILT=`which quilt`
+if [ "$QUILT" == "" ]; then
+ echo "Please install quilt before trying to use this script"
+ exit 1
+fi
+
# Get useful envt variables
make shell_env
. armadeus_env.sh
hooks/post-receive
--
armadeus
|
