Skip to content

Commit

Permalink
adding rosmon to all arch (#320)
Browse files Browse the repository at this point in the history
* adding rosmon to all arch

* Update vinca_linux_64.yaml

* Update vinca_linux_64.yaml

* patch rosmon-core to compile against old kernel headers

* Adding dependencies to vinca.yaml

* remove rosmon from all arch except linux64

Co-authored-by: Tobias Fischer <[email protected]>
  • Loading branch information
alaurenzi and Tobias-Fischer authored Dec 29, 2022
1 parent 8224ae4 commit 2b78a02
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 0 deletions.
24 changes: 24 additions & 0 deletions patch/ros-noetic-rosmon-core.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/src/monitor/shim.cpp b/src/monitor/shim.cpp
index 7dec1cc..da51913 100644
--- a/src/monitor/shim.cpp
+++ b/src/monitor/shim.cpp
@@ -15,6 +15,19 @@
#include <sys/resource.h>
#include <sys/prctl.h>

+// **NOTE: Adapted from https://reviews.llvm.org/D39717 **
+// Sufficiently old kernel headers don't provide this value, but we can still
+// call prctl with it. If the runtime kernel is new enough, the prctl call will
+// have the desired effect; if the kernel is too old, the call will error and we
+// can ignore said error.
+#ifndef PR_SET_PTRACER
+#define PR_SET_PTRACER 0x59616d61
+#endif
+
+#ifndef PR_SET_PTRACER_ANY
+#define PR_SET_PTRACER_ANY ((unsigned long)-1)
+#endif
+
static const struct option OPTIONS[] = {
{"help", no_argument, nullptr, 'h'},
{"namespace", required_argument, nullptr, 'n'},
5 changes: 5 additions & 0 deletions vinca_linux_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ packages_select_by_deps:
- handeye
- criutils
- baldor
- rosmon
- rosmon-msgs
- catch-ros
- rosfmt
- rqt-rosmon

# - desktop
# - amcl
Expand Down
1 change: 1 addition & 0 deletions vinca_osx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ packages_select_by_deps:
- gps-common
- rosbridge_suite


# ## Only limited number of packages to reduce maintainer burden
# - catkin
# - rviz
Expand Down
1 change: 1 addition & 0 deletions vinca_osx_arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ packages_select_by_deps:
- gps-common
- rosbridge_suite


# # For jackal
# - gazebo-dev
# - hector-gazebo-plugins
Expand Down
1 change: 1 addition & 0 deletions vinca_win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ packages_select_by_deps:
- tf2_tools
- gps-common


# # For jackal
# - gazebo-dev
# - gazebo-ros
Expand Down

0 comments on commit 2b78a02

Please sign in to comment.