diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 1 | ||||
| -rwxr-xr-x | debian/rules | 14 | ||||
| -rwxr-xr-x | scripts/rvi.init.ubuntu | 7 |
5 files changed, 26 insertions, 14 deletions
@@ -28,8 +28,8 @@ SRC_LIST=BUILD.md \ RELEASE.md \ scripts/setup_gen \ scripts/rvi.service \ - scripts/rvi_ctl \ - scripts/rvi_install.sh \ + scripts/rvi_ctl.template \ + scripts/rvi_install \ python/*.py \ components \ priv \ @@ -104,10 +104,11 @@ ubuntu_package: clean ubuntu_clean escript --exclude-vcs --transform="s|^|./rvi-$(VERSION)/|" \ $(SRC_LIST) \ debian \ - rvi_ubuntu.config \ scripts/rvi.init.ubuntu + rm -rf debian/missing-sources # Unpack the created tar file (cd ./ubuntu_build; tar xf rvi_$(VERSION).orig.tar.gz) + install -d -m 0755 ./ubuntu_build/rvi-$(VERSION)/debian/missing-sources # Descend into the unpacked directory and build. (cd ./ubuntu_build/rvi-$(VERSION); debuild -uc -us) @@ -115,6 +116,11 @@ rpm: rpmclean rpm_tarball rpmbuild --define "_topdir $$PWD/rpm" -ba rpm/SPECS/rvi-$(VERSION).spec install: deps compile - ./scripts/rvi_install.sh $(DESTDIR)/opt/rvi_core $(DESTDIR)/opt/rvi_core $(DESTDIR)/var/opt/log/rvi + ./scripts/rvi_install \ + -k priv/keys/insecure_device_key.pem \ + -r priv/certificates/insecure_root_cert.crt \ + -d priv/certificates/insecure_device_cert.crt \ + -c priv/credentials/insecure_credential.jwt $(DESTDIR)/opt/rvi_core + install -m 0755 -d $(DESTDIR)/etc/opt/rvi/ install -m 0644 priv/config/rvi_sample.config $(DESTDIR)/etc/opt/rvi/rvi_sample.config diff --git a/debian/control b/debian/control index 1e5bb15..9465e15 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: rvi -Section: Network +Section: net Priority: optional Maintainer: Magnus Feuer <mfeuer@jaguarlandrover.com> Build-Depends: debhelper (>= 9), libbluetooth-dev, esl-erlang (>= 1:18.2) @@ -10,4 +10,4 @@ Package: rvi Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends},bluez, esl-erlang (>= 1:18.2), python-jsonrpclib (>= 0.1.3-1build1), python (>= 2.7.5-5ubuntu3) Description: Remote Vehicle Interaction - GENIVI Remote Vehicle Interaction Transport + GENIVI Remote Vehicle Interaction Core diff --git a/debian/copyright b/debian/copyright index 8b4b34b..89597cf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,6 @@ Source: http://github.com/PDXostc/rvi_core Files: * Copyright: Copyright 2014,2015,2016 Jaguar Land Rover - License: MPL-2.0 This program is licensed under the terms and conditions of the Mozilla Public License, version 2.0. The full text of the diff --git a/debian/rules b/debian/rules index 346b70b..0d2cf19 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,16 @@ export DH_VERBOSE=1 dh $@ override_dh_auto_install: - ./scripts/rvi_install.sh ./debian/rvi/usr/bin ./debian/rvi/usr/lib/rvi ./debian/rvi/var/log/rvi ./debian/rvi + ./scripts/rvi_install \ + -s ./debian/rvi \ + -k priv/keys/insecure_device_key.pem \ + -r priv/certificates/insecure_root_cert.crt \ + -d priv/certificates/insecure_device_cert.crt \ + -c priv/credentials/insecure_credential.jwt \ + -l ./debian/rvi/var/log/rvi ./debian/rvi/usr/lib/rvi_core +# Copy out rvi_ctl to /usr/bin + install -D -m 0755 ./debian/rvi/usr/lib/rvi_core/rvi_ctl ./debian/rvi/usr/bin/rvi_ctl # Install default config - install -D --mode=0644 ./rvi_ubuntu.config ./debian/rvi/etc/rvi/rvi.config + install -D -m 0644 ./priv/config/rvi_ubuntu.config ./debian/rvi/etc/rvi/rvi.config # Install start/stop scripts - install -D --mode=0755 ./scripts/rvi.init.ubuntu ./debian/rvi/etc/init.d/rvi + install -D -m 0755 ./scripts/rvi.init.ubuntu ./debian/rvi/etc/init.d/rvi diff --git a/scripts/rvi.init.ubuntu b/scripts/rvi.init.ubuntu index a4b62e8..9cd4e59 100755 --- a/scripts/rvi.init.ubuntu +++ b/scripts/rvi.init.ubuntu @@ -12,8 +12,8 @@ # ### BEGIN INIT INFO # Provides: rvi -# Required-Start: $networking $syslog -# Required-Stop: $networking $syslog +# Required-Start: $network $syslog $remote_fs +# Required-Stop: $network $syslog $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start/Stop RVI node at boot time @@ -21,8 +21,7 @@ ### END INIT INFO export PATH="/bin/:/usr/bin:/sbin:/usr/sbin" -export HOME=/tmp/rvi -install -d -D --mode=0755 ${HOME} +export HOME=/usr/lib/rvi_core . /lib/lsb/init-functions set -e |