Skip to content

Remove source alias #15970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dagar merged 3 commits into from
Oct 15, 2020
Merged

Remove source alias #15970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbe5bb8
ROMFS:Use . for (source) and ${R} for pathing
davids5 Oct 14, 2020
789ffe7
Tools:Use . for (source) and ${R} for pathing
davids5 Oct 14, 2020
12da1d8
px4-alias.sh_in:Remove source and add R=${pwd}
davids5 Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ROMFS/cannode/init.d/rcS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set +e
# NOTE: COMMENT LINES ARE REMOVED BEFORE STORED IN ROMFS.
#
#------------------------------------------------------------------------------

set R /
#
# Mount the procfs.
#
Expand Down Expand Up @@ -57,7 +57,7 @@ fi
#
# Optional board defaults: rc.board_defaults
#
set BOARD_RC_DEFAULTS /etc/init.d/rc.board_defaults
set BOARD_RC_DEFAULTS ${R}etc/init.d/rc.board_defaults
if [ -f $BOARD_RC_DEFAULTS ]
then
echo "Board defaults: ${BOARD_RC_DEFAULTS}"
Expand All @@ -83,7 +83,7 @@ fi
#
# board sensors: rc.sensors
#
set BOARD_RC_SENSORS /etc/init.d/rc.board_sensors
set BOARD_RC_SENSORS ${R}etc/init.d/rc.board_sensors
if [ -f $BOARD_RC_SENSORS ]
then
echo "Board sensors: ${BOARD_RC_SENSORS}"
Expand All @@ -95,7 +95,7 @@ unset BOARD_RC_SENSORS
# Start UART/Serial device drivers.
# Note: rc.serial is auto-generated from Tools/serial/generate_config.py
#
. /etc/init.d/rc.serial
. ${R}etc/init.d/rc.serial

# Check for flow sensor
if param compare SENS_EN_PX4FLOW 1
Expand All @@ -104,3 +104,4 @@ then
fi

uavcannode start
unset R
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/10016_iris
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
# @maintainer Julian Oes <julian@oes.ch>
#

sh /etc/init.d/rc.mc_defaults
. ${R}etc/init.d/rc.mc_defaults

set MIXER quad_w
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/10020_if750a
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# @type Quadrotor
#

sh /etc/init.d/rc.mc_defaults
. ${R}etc/init.d/rc.mc_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/10030_px4vision
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
# @type Quadrotor
#

sh /etc/init.d/airframes/4016_holybro_px4vision
. ${R}etc/init.d/airframes/4016_holybro_px4vision

set MIXER quad_x
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1010_iris_opt_flow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1011_iris_irlock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1012_iris_rplidar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1013_iris_vision
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1014_solo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor
#

sh /etc/init.d/rc.mc_defaults
. ${R}etc/init.d/rc.mc_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1015_iris_obs_avoid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1016_iris_rtps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1017_iris_opt_flow_mockup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1018_iris_vision_velocity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1019_iris_dual_gps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Quadrotor Wide
#

sh /etc/init.d-posix/airframes/10016_iris
. ${R}etc/init.d-posix/airframes/10016_iris

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1020_uuv_generic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name UUV
#

sh /etc/init.d/rc.uuv_defaults
. ${R}etc/init.d/rc.uuv_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1021_uuv_hippocampus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Hippocampus UUV
#

sh /etc/init.d/rc.uuv_defaults
. ${R}etc/init.d/rc.uuv_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1030_plane
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Plane SITL
#

sh /etc/init.d/rc.fw_defaults
. ${R}etc/init.d/rc.fw_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1031_plane_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Plane SITL with camera
#

sh /etc/init.d-posix/airframes/1030_plane
. ${R}etc/init.d-posix/airframes/1030_plane

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1032_plane_catapult
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Plane SITL with catapult
#

sh /etc/init.d-posix/airframes/1030_plane
. ${R}etc/init.d-posix/airframes/1030_plane

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1033_plane_lidar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Plane SITL with downward facing LIDAR.
#

sh /etc/init.d-posix/airframes/1030_plane
. ${R}etc/init.d-posix/airframes/1030_plane

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1033_rascal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Plane SITL
#

sh /etc/init.d/rc.fw_defaults
. ${R}etc/init.d/rc.fw_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1034_rascal-electric
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Plane SITL
#

sh /etc/init.d/rc.fw_defaults
. ${R}etc/init.d/rc.fw_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1035_techpod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Plane SITL
#

sh /etc/init.d/rc.fw_defaults
. ${R}etc/init.d/rc.fw_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1040_standard_vtol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Standard VTOL
#

sh /etc/init.d/rc.vtol_defaults
. ${R}etc/init.d/rc.vtol_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1041_tailsitter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type VTOL Quad Tailsitter
#

sh /etc/init.d/rc.vtol_defaults
. ${R}etc/init.d/rc.vtol_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1042_tiltrotor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type VTOL Tiltrotor
#

sh /etc/init.d/rc.vtol_defaults
. ${R}etc/init.d/rc.vtol_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1060_rover
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Rover
#

sh /etc/init.d/rc.rover_defaults
. ${R}etc/init.d/rc.rover_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1061_r1_rover
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# @type Rover
# @class Rover

sh /etc/init.d/rc.rover_defaults
. ${R}etc/init.d/rc.rover_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1062_tf-r1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# @maintainer ThunderFly s.r.o.
#

sh /etc/init.d/rc.rover_defaults
. ${R}etc/init.d/rc.rover_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/1070_boat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @name Boat
#

sh /etc/init.d/rc.boat_defaults
. ${R}etc/init.d/rc.boat_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/17001_tf-g1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
#

sh /etc/init.d/rc.fw_defaults
. ${R}etc/init.d/rc.fw_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/2507_cloudship
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# @output MAIN3 port thruster
# @output MAIN4 tail thruster

sh /etc/init.d/rc.airship_defaults
. ${R}etc/init.d/rc.airship_defaults

set MIXER cloudship
set PWM_OUT 1234
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/3010_quadrotor_x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
# @maintainer Jaeyoung Lim <jaeyoung@auterion.com>
#

sh /etc/init.d/rc.mc_defaults
. ${R}etc/init.d/rc.mc_defaults

set MIXER quad_w
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/3011_hexarotor_x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# @maintainer Jaeyoung Lim <jaeyoung@auterion.com>
#

sh /etc/init.d/rc.mc_defaults
. ${R}etc/init.d/rc.mc_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d-posix/airframes/6011_typhoon_h480
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @type Hexarotor x
#

sh /etc/init.d/rc.mc_defaults
. ${R}etc/init.d/rc.mc_defaults

if [ $AUTOCNF = yes ]
then
Expand Down
13 changes: 7 additions & 6 deletions ROMFS/px4fmu_common/init.d-posix/rcS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SCRIPT_DIR="$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)"
# shellcheck disable=SC2154
if [ "$replay_mode" = "ekf2" ]
then
sh etc/init.d-posix/rc.replay
. ${R}etc/init.d-posix/rc.replay
exit 0
fi

Expand Down Expand Up @@ -176,7 +176,8 @@ fi

# Autostart ID
autostart_file=''
for f in etc/init.d-posix/airframes/"$(param show -q SYS_AUTOSTART)"_*
# shellcheck disable=SC2231
for f in ${R}etc/init.d-posix/airframes/"$(param show -q SYS_AUTOSTART)"_*
do
filename=$(basename "$f")
case "$filename" in
Expand All @@ -193,7 +194,7 @@ if [ ! -e "$autostart_file" ]; then
exit 1
fi

sh "$autostart_file"
. "$autostart_file"

#
# If autoconfig parameter was set, reset it and save parameters.
Expand Down Expand Up @@ -232,7 +233,7 @@ fi
# Note: rc.vehicle_setup is the entry point for rc.interface,
# rc.fw_apps, rc.mc_apps, rc.rover_apps, and rc.vtol_apps.
#
sh etc/init.d/rc.vehicle_setup
. ${R}etc/init.d/rc.vehicle_setup

# GCS link
mavlink start -x -u $udp_gcs_port_local -r 4000000
Expand All @@ -253,7 +254,7 @@ mavlink start -x -u $udp_offboard_port_local -r 4000000 -m onboard -o $udp_offbo
mavlink start -x -u $udp_onboard_payload_port_local -r 4000 -f -m onboard -o $udp_onboard_payload_port_remote

# execute autostart post script if any
[ -e "$autostart_file".post ] && sh "$autostart_file".post
[ -e "$autostart_file".post ] && . "$autostart_file".post

# Run script to start logging
if param compare SYS_MC_EST_GROUP 2
Expand All @@ -262,7 +263,7 @@ then
else
set LOGGER_ARGS "-p vehicle_attitude"
fi
sh etc/init.d/rc.logging
. ${R}etc/init.d/rc.logging

mavlink boot_complete
replay trystart
Loading