[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-498-g69723ee
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2010-06-24 07:47:15
|
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 69723ee95bbd2bfbd559a8fc179746ec4e0eb031 (commit)
via 566890ba5bfa5a9d1e445490e46877890b99f541 (commit)
from 422fa54856442ff19721f529256b0658062e0b3b (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 69723ee95bbd2bfbd559a8fc179746ec4e0eb031
Merge: 566890ba5bfa5a9d1e445490e46877890b99f541 422fa54856442ff19721f529256b0658062e0b3b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 24 09:46:41 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 566890ba5bfa5a9d1e445490e46877890b99f541
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 24 09:40:09 2010 +0200
[BUILDROOT] Add Hokuyo's URG series sensor control library/tools
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/122-urg-add_package.patch | 56 ++++++++++++++++++++
.../buildroot/2010.05/122-urg-add_package.patch | 56 ++++++++++++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 1 +
patches/buildroot/cleanup_buildroot.sh | 1 +
4 files changed, 114 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/122-urg-add_package.patch
create mode 100644 patches/buildroot/2010.05/122-urg-add_package.patch
diff --git a/patches/buildroot/122-urg-add_package.patch b/patches/buildroot/122-urg-add_package.patch
new file mode 100644
index 0000000..43328db
--- /dev/null
+++ b/patches/buildroot/122-urg-add_package.patch
@@ -0,0 +1,56 @@
+Add URG sensors control library to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-24 09:27:20.000000000 +0200
++++ buildroot/package/Config.in 2010-06-24 09:27:55.000000000 +0200
+@@ -292,6 +292,7 @@
+ # mdev
+ source "package/udev/Config.in"
+ endif
++source "package/urg/Config.in"
+ source "package/usbmount/Config.in"
+ source "package/usbutils/Config.in"
+ source "package/wipe/Config.in"
+Index: buildroot/package/urg/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/urg/Config.in 2010-06-24 09:32:29.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_URG
++ bool "urg library"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_NET
++ help
++ Library to control Hokuyo's URG series sensors.
++ Requires SDL & SDL_net.
++
++ http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+Index: buildroot/package/urg/urg.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/urg/urg.mk 2010-06-24 09:29:11.000000000 +0200
+@@ -0,0 +1,21 @@
++#############################################################
++#
++# urg library
++#
++#############################################################
++URG_VERSION:=0.8.11
++URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
++URG_SOURCE = urg-$(URG_VERSION).tar.gz
++URG_LIBTOOL_PATCH = NO
++URG_INSTALL_STAGING = YES
++URG_INSTALL_TARGET = YES
++
++URG_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
++ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
++
++$(eval $(call AUTOTARGETS,package,urg))
++
++$(URG_HOOK_POST_EXTRACT):
++ @$(call MESSAGE,"Post extracting")
++ chmod a+x $(URG_DIR)/configure
++
diff --git a/patches/buildroot/2010.05/122-urg-add_package.patch b/patches/buildroot/2010.05/122-urg-add_package.patch
new file mode 100644
index 0000000..d56ead4
--- /dev/null
+++ b/patches/buildroot/2010.05/122-urg-add_package.patch
@@ -0,0 +1,56 @@
+Add URG sensors control library to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-24 09:27:20.000000000 +0200
++++ buildroot/package/Config.in 2010-06-24 09:27:55.000000000 +0200
+@@ -196,6 +196,7 @@
+ # mdev
+ source "package/udev/Config.in"
+ endif
++source "package/urg/Config.in"
+ source "package/usb_modeswitch/Config.in"
+ source "package/usbmount/Config.in"
+ source "package/usbutils/Config.in"
+Index: buildroot/package/urg/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/urg/Config.in 2010-06-24 09:32:29.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_URG
++ bool "urg library"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_NET
++ help
++ Library to control Hokuyo's URG series sensors.
++ Requires SDL & SDL_net.
++
++ http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+Index: buildroot/package/urg/urg.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/urg/urg.mk 2010-06-24 09:29:11.000000000 +0200
+@@ -0,0 +1,21 @@
++#############################################################
++#
++# urg library
++#
++#############################################################
++URG_VERSION:=0.8.11
++URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
++URG_SOURCE = urg-$(URG_VERSION).tar.gz
++URG_LIBTOOL_PATCH = NO
++URG_INSTALL_STAGING = YES
++URG_INSTALL_TARGET = YES
++
++URG_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
++ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
++
++$(eval $(call AUTOTARGETS,package,urg))
++
++$(URG_HOOK_POST_EXTRACT):
++ @$(call MESSAGE,"Post extracting")
++ chmod a+x $(URG_DIR)/configure
++
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index c873a68..d84d381 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -40,3 +40,4 @@ rm -rf buildroot/package/fbgrab/
rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
rm -rf buildroot/package/cwiid/
+rm -rf buildroot/package/urg/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 3883cf5..75d5faa 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -44,3 +44,4 @@ rm -rf buildroot/package/fbgrab/
rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
rm -rf buildroot/package/cwiid/
+rm -rf buildroot/package/urg/
hooks/post-receive
--
armadeus
|