From edb67a9cc7b98ce08fa09a7845fe17ceecea4cde Mon Sep 17 00:00:00 2001
From: Severin Lemaignan <severin.lemaignan@laas.fr>
Date: Thu, 30 Sep 2010 15:31:43 +0200
Subject: [PATCH] [wip/] Fixed several MASTER_REPOSITORY urls for WIP packages
---
coldman-genom/Makefile | 2 +-
coldman-libs/Makefile | 2 +-
gest-genom/Makefile | 2 +-
lwr-genom/Makefile | 2 +-
mhp-genom/Makefile | 2 +-
pqp-libs/Makefile | 2 +-
spark-genom/Makefile | 19 ++++++++++++++-----
7 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/coldman-genom/Makefile b/coldman-genom/Makefile
index 2215e79a..54d7d0e0 100644
--- a/coldman-genom/Makefile
+++ b/coldman-genom/Makefile
@@ -5,7 +5,7 @@
DISTNAME= coldman-genom-1.0
CATEGORIES= manipulation
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=coldman-genom/}
-MASTER_REPOSITORY= git ssh://trac/git/robots/coldman-genom
+MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/coldman-genom
MAINTAINER= xavier.broquere@laas.fr
diff --git a/coldman-libs/Makefile b/coldman-libs/Makefile
index 30916bd5..78ca5315 100644
--- a/coldman-libs/Makefile
+++ b/coldman-libs/Makefile
@@ -5,7 +5,7 @@
DISTNAME= coldman-libs-1.0
CATEGORIES= manipulation
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=coldman-libs/}
-MASTER_REPOSITORY= git ssh://trac/git/robots/coldman-libs
+MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/coldman-libs
MAINTAINER= xavier.broquere@laas.fr
diff --git a/gest-genom/Makefile b/gest-genom/Makefile
index c9d9aea6..42236f9c 100644
--- a/gest-genom/Makefile
+++ b/gest-genom/Makefile
@@ -5,7 +5,7 @@
DISTNAME= gest-genom-1.0
CATEGORIES= image
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=gest-genom/}
-MASTER_REPOSITORY= git ssh://softs/git/robots/gest-genom
+MASTER_REPOSITORY= git ssh://softs.laas.fr/git/robots/gest-genom
MAINTAINER= openrobots@laas.fr
COMMENT= GeNoM module for human posture recognition, based on skin patches detection
diff --git a/lwr-genom/Makefile b/lwr-genom/Makefile
index f6ed8951..62a953de 100644
--- a/lwr-genom/Makefile
+++ b/lwr-genom/Makefile
@@ -5,7 +5,7 @@
DISTNAME= lwr-genom-1.0
CATEGORIES= manipulation
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=lwr-genom/}
-MASTER_REPOSITORY= git ssh://trac/git/robots/lwr-genom
+MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/lwr-genom
MAINTAINER= xavier.broquere@laas.fr
COMMENT= Genom module for the KuKa arm
diff --git a/mhp-genom/Makefile b/mhp-genom/Makefile
index 67bda867..8c9b043f 100644
--- a/mhp-genom/Makefile
+++ b/mhp-genom/Makefile
@@ -5,7 +5,7 @@
DISTNAME= mhp-genom-2.5.1
CATEGORIES= path
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=mhp-genom/}
-MASTER_REPOSITORY= git ssh://softs/git/robots/mhp-genom
+MASTER_REPOSITORY= git ssh://softs.laas.fr/git/robots/mhp-genom
MAINTAINER= easisbot@laas.fr
COMMENT= Motion in Human Presence module
diff --git a/pqp-libs/Makefile b/pqp-libs/Makefile
index 5da0e564..decb1daf 100644
--- a/pqp-libs/Makefile
+++ b/pqp-libs/Makefile
@@ -7,7 +7,7 @@
DISTNAME= pqp-libs-1.1
CATEGORIES= manipulation
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=pqp-libs/}
-MASTER_REPOSITORY= git ssh://trac/git/robots/pqp-libs
+MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/pqp-libs
MAINTAINER= openrobots@laas.fr
HOMEPAGE= http://gamma.cs.unc.edu/SSV/
diff --git a/spark-genom/Makefile b/spark-genom/Makefile
index b5274bf7..f2216c3d 100644
--- a/spark-genom/Makefile
+++ b/spark-genom/Makefile
@@ -4,7 +4,7 @@
DISTNAME= spark-genom-1.0
CATEGORIES= knowledge
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=spark-genom/}
-MASTER_REPOSITORY= git ssh://softs/git/robots/spark-genom
+MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/spark-genom
MAINTAINER= easisbot@laas.fr
COMMENT= Spatial Reasoning and Knowledge module
@@ -20,13 +20,13 @@ USE_LANGUAGES+= c c++
#### SPARK OPTIONS ####
#######################
-PKG_OPTIONS_REQUIRED_GROUPS= robot
-PKG_OPTIONS_GROUP.robot= hrp2 jido simulation
+PKG_OPTIONS_NONEMPTY_SETS= robot
+PKG_OPTIONS_SET.robot= hrp2 pr2 jido simulation
##
## HRP2
##
-PKG_OPTION_DESCR.hrp2= Compile SPARK for HRP2
+PKG_OPTION_DESCR.hrp2= Compile SPARK with support for HRP2
define PKG_OPTION_SET.hrp2
GENOM_ARGS+= -DHRP2
@@ -34,10 +34,19 @@ define PKG_OPTION_SET.hrp2
include ../../image/viman-genom/depend.mk
endef
+##
+## PR2
+##
+PKG_OPTION_DESCR.pr2= Compile SPARK with support for PR2
+
+define PKG_OPTION_SET.pr2
+ GENOM_ARGS+= -DPR2
+endef
+
##
## Jido
##
-PKG_OPTION_DESCR.jido= Compile SPARK for Jido
+PKG_OPTION_DESCR.jido= Compile SPARK with support for Jido
define PKG_OPTION_SET.jido
GENOM_ARGS+= -DJIDO
--
GitLab