diff --git a/Makefile b/Makefile index 4475c650653c2c94744f33f29acb0a2111cdfa34..a8aed7db890fb8f4cd8ee4eeab945838615e8de7 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,7 @@ SUBDIR+= py-sot-talos-balance SUBDIR+= py-sot-tiago SUBDIR+= py-sot-tools-v3 SUBDIR+= py-sot-torque-control +SUBDIR+= py-talos-dev SUBDIR+= py-talos-rbprm SUBDIR+= py-talos-torque-control SUBDIR+= py-tsid @@ -158,7 +159,6 @@ SUBDIR+= sot-talos-balance SUBDIR+= sot-tools-v3 SUBDIR+= sot-torque-control SUBDIR+= talos-data -SUBDIR+= talos-dev SUBDIR+= talos-metapkg-ros-control-sot SUBDIR+= talos-moveit-config SUBDIR+= talos-robot diff --git a/talos-dev/DESCR b/py-talos-dev/DESCR similarity index 100% rename from talos-dev/DESCR rename to py-talos-dev/DESCR diff --git a/talos-dev/Makefile b/py-talos-dev/Makefile similarity index 84% rename from talos-dev/Makefile rename to py-talos-dev/Makefile index dba22e9fa86fe16b5d0c10669a8acebeaffc249b..7caad6b2098ee8c73a082cac4728256800a9f150 100644 --- a/talos-dev/Makefile +++ b/py-talos-dev/Makefile @@ -2,8 +2,9 @@ # Created: Guilhem Saurel on Mon, 9 Oct 2017 # -TALOS_DATE= 20171009 +TALOS_DATE= 20200325 DISTNAME= talos-dev-${TALOS_DATE} +PKGNAME= ${PKGTAG.python-}${DISTNAME} CATEGORIES= meta-pkgs COMMENT= Talos dev Software @@ -24,5 +25,7 @@ endif include ../../wip/talos-metapkg-ros-control-sot/depend.mk include ../../wip/talos-simulation/depend.mk include ../../wip/ros-image-pipeline/depend.mk +include ../../wip/py-talos-torque-control/depend.mk include ../../localization/ros-robot-state-publisher/depend.mk +include ../../mk/sysdep/python.mk include ../../mk/robotpkg.mk diff --git a/talos-dev/PLIST b/py-talos-dev/PLIST similarity index 100% rename from talos-dev/PLIST rename to py-talos-dev/PLIST