Skip to content
This repository was archived by the owner on Nov 2, 2021. It is now read-only.

Commit ff36d7c

Browse files
author
Gunnar Andersson
committed
Change all paths from /opt to /usr/share
/opt can't be used in an normal OS-tree compatible layout - program files should now reside under /usr. /etc/opt/<rvi config files> changed to remove opt which looks odd there anyway: --> /etc/rvi/<config files>. Signed-off-by: Gunnar Andersson <gandersson@genivi.org>
1 parent d63dd1c commit ff36d7c

File tree

10 files changed

+28
-28
lines changed

10 files changed

+28
-28
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,16 @@ ifndef STRIPPATH
172172
-r priv/certificates/insecure_root_cert.crt \
173173
-d priv/certificates/insecure_device_cert.crt \
174174
-c priv/credentials/insecure_credential.jwt \
175-
$(DESTDIR)/opt/rvi_core
175+
$(DESTDIR)/usr/share/rvi_core
176176
else
177177
./scripts/rvi_install \
178178
-k priv/keys/insecure_device_key.pem \
179179
-r priv/certificates/insecure_root_cert.crt \
180180
-d priv/certificates/insecure_device_cert.crt \
181181
-c priv/credentials/insecure_credential.jwt \
182182
-s $(STRIPPATH) \
183-
$(DESTDIR)/opt/rvi_core
183+
$(DESTDIR)/usr/share/rvi_core
184184
endif
185185

186-
install -m 0755 -d $(DESTDIR)/etc/opt/rvi/
187-
install -m 0644 priv/config/rvi_sample.config $(DESTDIR)/etc/opt/rvi/rvi_sample.config
186+
install -m 0755 -d $(DESTDIR)/etc/rvi/
187+
install -m 0644 priv/config/rvi_sample.config $(DESTDIR)/etc/rvi/rvi_sample.config

‎debian_template/README.Debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ rvi for Debian
33

44
Will rely on existing Erlang installation to work.
55

6-
We will copy out the Erlang VM BEAM files to /opt/rvi and the configuration files to /etc/opt/rvi
6+
We will copy out the Erlang VM BEAM files to /usr/share/rvi and the configuration files to /etc/rvi
77

8-
/opt/rvi/rvi.sh is the main control program.
8+
/usr/share/rvi/rvi.sh is the main control program.
99

1010
-- Magnus Feuer <mfeuer@jaguarlandrover.com> Fri, 27 Nov 2015 15:34:39 -0800

‎packaging/rvi_core.spec‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ make compile
2828
./scripts/setup_rvi_node.sh -n rvi_tizen -c ./packaging/tizen.config
2929
%install
3030
rm -rf $RPM_BUILD_ROOT
31-
mkdir -p $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION
32-
cp -ar rel/rvi_tizen $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION
33-
cp -ar python $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION
31+
mkdir -p $RPM_BUILD_ROOT/usr/share/rvi-$RPM_PACKAGE_VERSION
32+
cp -ar rel/rvi_tizen $RPM_BUILD_ROOT/usr/share/rvi-$RPM_PACKAGE_VERSION
33+
cp -ar python $RPM_BUILD_ROOT/usr/share/rvi-$RPM_PACKAGE_VERSION
3434
mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system/
3535
mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/multi-user.target.wants/
3636
install ./scripts/rvi.service $RPM_BUILD_ROOT/usr/lib/systemd/system/rvi.service
3737
ln -fsr $RPM_BUILD_ROOT/usr/lib/systemd/system/rvi.service \
3838
$RPM_BUILD_ROOT/etc/systemd/system/multi-user.target.wants/rvi.service
39-
ln -fsr $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION/releases/$RPM_PACKAGE_VERSION/sys.config \
40-
$RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION/sys.config
39+
ln -fsr $RPM_BUILD_ROOT/usr/share/rvi-$RPM_PACKAGE_VERSION/releases/$RPM_PACKAGE_VERSION/sys.config \
40+
$RPM_BUILD_ROOT/usr/share/rvi-$RPM_PACKAGE_VERSION/sys.config
4141
mkdir -p $RPM_BUILD_ROOT/home/app/content/Documents
4242
echo "default_vin" > $RPM_BUILD_ROOT/home/app/content/Documents/vin
4343

@@ -50,4 +50,4 @@ rm -rf $RPM_BUILD_ROOT
5050
%attr(644,app,users) /home/app/content/Documents/vin
5151
/usr/lib/systemd/system/rvi.service
5252
/etc/systemd/system/multi-user.target.wants/rvi.service
53-
/opt/rvi-0.5.1
53+
/usr/share/rvi-0.5.1

‎priv/config/rvi_yocto.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice).
144144
%% value unless all services add a system-wide unique name
145145
%% to it.
146146
%%
147-
{ node_service_prefix, "$rvi_file(/etc/opt/rvi/device_id,genivi.org/node/default_id)/"},
147+
{ node_service_prefix, "$rvi_file(/etc/rvi/device_id,genivi.org/node/default_id)/"},
148148

149149
%% Routing rules determine how to get a message targeting a specific
150150
%% service to its destination.

‎raspbian_template/README.Debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ rvi for Debian
33

44
Will rely on existing Erlang installation to work.
55

6-
We will copy out the Erlang VM BEAM files to /opt/rvi and the configuration files to /etc/opt/rvi
6+
We will copy out the Erlang VM BEAM files to /usr/share/rvi and the configuration files to /etc/rvi
77

8-
/opt/rvi/rvi.sh is the main control program.
8+
/usr/share/rvi/rvi.sh is the main control program.
99

1010
-- Magnus Feuer <mfeuer@jaguarlandrover.com> Fri, 27 Nov 2015 15:34:39 -0800

‎rpm/SPECS/rvi-0.5.1.spec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ make compile
3030

3131
%install
3232
rm -rf $RPM_BUILD_ROOT
33-
mkdir -p $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION
33+
mkdir -p $RPM_BUILD_ROOT/usr/share/rvi-$RPM_PACKAGE_VERSION
3434
cp -ar rel/rvi-$RPM_PACKAGE_VERSION $RPM_BUILD_ROOT/opt/
3535

3636
# Create a standard debian setup for start/stop.
@@ -52,8 +52,8 @@ ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc5.d/S50-rvi
5252
ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc6.d/K20-rvi
5353

5454
# Make global config file easier to access.
55-
ln -fsr $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION/releases/1/sys.config \
56-
$RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION/sys.config
55+
ln -fsr $RPM_BUILD_ROOT/usr/share/rvi-$RPM_PACKAGE_VERSION/releases/1/sys.config \
56+
$RPM_BUILD_ROOT/usr/share/rvi-$RPM_PACKAGE_VERSION/sys.config
5757
%post
5858

5959
%clean
@@ -69,4 +69,4 @@ rm -rf $RPM_BUILD_ROOT
6969
/etc/rc4.d
7070
/etc/rc5.d
7171
/etc/rc6.d
72-
/opt/rvi-0.5.1
72+
/usr/share/rvi-0.5.1

‎scripts/rvi_install‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ $0 -r root_cert -d device_cert -c credentials \\
6363
Install a built RVI system into a target directory
6464
6565
NOTE: The last component of 'taget_dir' must be named 'rvi_core'
66-
Example: /opt/rvi_core
66+
Example: /usr/share/rvi_core
6767
6868
-l log_dir - Log directory. Default: ${target_dir}/log.
6969
@@ -178,7 +178,7 @@ EXAMPLE INSTALLATION
178178
-r priv/certificates/insecure_root_cert.crt \\
179179
-d priv/certificates/insecure_device_cert.crt \\
180180
-c priv/credentials/insecure_credential.jwt \\
181-
/opt/rvi_core
181+
/usr/share/rvi_core
182182
183183
184184
WARNING: This example installation will provide no protection

‎ubuntu_template/README.Debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ rvi for Debian
33

44
Will rely on existing Erlang installation to work.
55

6-
We will copy out the Erlang VM BEAM files to /opt/rvi and the configuration files to /etc/opt/rvi
6+
We will copy out the Erlang VM BEAM files to /usr/share/rvi and the configuration files to /etc/rvi
77

8-
/opt/rvi/rvi.sh is the main control program.
8+
/usr/share/rvi/rvi.sh is the main control program.
99

1010
-- Magnus Feuer <mfeuer@jaguarlandrover.com> Fri, 27 Nov 2015 15:34:39 -0800

‎yocto_template/rvi.init‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ export PATH="/bin/:/usr/bin:/sbin:/usr/sbin"
2323

2424
set -e
2525

26-
DAEMON_PATH="/opt/rvi_core"
26+
DAEMON_PATH="/usr/share/rvi_core"
2727
DAEMON_NAME="rvi"
2828

2929
case "$1" in
3030
start)
3131
echo -n "Starting $DAEMON_NAME: "
32-
$DAEMON_PATH/rvi_ctl -c /etc/opt/rvi/rvi.config start
32+
$DAEMON_PATH/rvi_ctl -c /etc/rvi/rvi.config start
3333
RETVAL=$?
3434
if [ $RETVAL -eq 0 ] ; then
3535
echo "OK"

‎yocto_template/rvi.service‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ Description=Remote Vehicle Interaction Service
44
Wants=network-online.target
55

66
[Service]
7-
Environment="HOME=/opt/rvi_core"
7+
Environment="HOME=/usr/share/rvi_core"
88
Type=forking
99
StandardOutput=journal
1010
StandardError=journal
11-
ExecStart=/opt/rvi_core/rvi_ctl -c /etc/opt/rvi/rvi.config start
12-
ExecStop=/opt/rvi_core/rvi_ctl stop
11+
ExecStart=/usr/share/rvi_core/rvi_ctl -c /etc/rvi/rvi.config start
12+
ExecStop=/usr/share/rvi_core/rvi_ctl stop
1313
GuessMainPID=yes
1414
RemainAfterExit=yes
1515

0 commit comments

Comments
 (0)