diff options
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rw-r--r-- | packaging/README.md | 2 | ||||
-rwxr-xr-x | packaging/rvi_core.spec | 6 | ||||
-rw-r--r-- | python/rvilib.py | 2 | ||||
-rw-r--r-- | rel/reltool.config | 2 | ||||
-rw-r--r-- | rpm/SPECS/rvi-0.4.0.spec | 72 | ||||
-rw-r--r-- | scripts/rvi.service.tizen | 10 | ||||
-rw-r--r-- | src/rvi_core.app.src | 2 |
10 files changed, 16 insertions, 87 deletions
@@ -93,6 +93,7 @@ rpm_tarball: rpmclean clean # Create an ubuntu 14.04 tarball ubuntu_package: clean ubuntu_clean install --mode=0755 -d ./ubuntu_build + # Pack up all relevant files, and debian/, necessary for a build. # Add rvi-$(VERSION) at the beginning of each file so # that theu get packed up into a correctly named subdirectory diff --git a/debian/changelog b/debian/changelog index cc4feb0..62e7b16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -rvi (0.4.0-1ubuntu1) trusty; urgency=low +rvi (0.5.0-1ubuntu1) trusty; urgency=low * Initial release diff --git a/debian/control b/debian/control index 80161cc..326c943 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: rvi Section: Network Priority: optional Maintainer: Magnus Feuer <mfeuer@jaguarlandrover.com> -Build-Depends: debhelper (>= 9), libbluetooth-dev, erlang-base (= 1:16.b.3-dfsg-1ubuntu2.1) +Build-Depends: debhelper (>= 9), libbluetooth-dev, erlang-base (>= 1:16.b.3-dfsg-1ubuntu2.1) Standards-Version: 3.9.5 Homepage: https://github.com/PDXostc/rvi_core Package: rvi Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends},bluez, erlang-base (= 1:16.b.3-dfsg-1ubuntu2.1), python-jsonrpclib (>= 0.1.3-1build1), python (>= 2.7.5-5ubuntu3) +Depends: ${shlibs:Depends}, ${misc:Depends},bluez, erlang-base (>= 1:16.b.3-dfsg-1ubuntu2.1), python-jsonrpclib (>= 0.1.3-1build1), python (>= 2.7.5-5ubuntu3) Description: Remote Vehicle Interaction GENIVI Remote Vehicle Interaction Transport diff --git a/packaging/README.md b/packaging/README.md index 798f0a7..ec3e8a1 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -72,7 +72,7 @@ Go to the top directory of RVI and execute: An RPM file will be generated at the end of the build which can be installed on a Tizen box. The RPM can be found at: - ~/GBS-ROOT/local/repos/tizen/i586/RPMS/rvi-0.4.0-1.i686.rpm + ~/GBS-ROOT/local/repos/tizen/i586/RPMS/rvi-0.5.0-1.i686.rpm # UPDATING REBAR DEPENDENCIES diff --git a/packaging/rvi_core.spec b/packaging/rvi_core.spec index eb37957..b692e8d 100755 --- a/packaging/rvi_core.spec +++ b/packaging/rvi_core.spec @@ -1,10 +1,10 @@ Summary: Remote Vehicle Interaction Node, running on top of Erlang, Name: rvi_core -Version: 0.4.0 +Version: 0.5.0 Release: 1 Group: App Framework/Application Communication License: Mozilla Public License 2.0 -Source: http://content.linuxfoundation.org/auto/downloads/rvi/rvi_core-0.4.0.tgz +Source: http://content.linuxfoundation.org/auto/downloads/rvi/rvi_core-0.5.0.tgz BuildRequires: make BuildRequires: glib2-devel @@ -50,4 +50,4 @@ rm -rf $RPM_BUILD_ROOT %attr(644,app,users) /home/app/content/Documents/vin /usr/lib/systemd/system/rvi.service /etc/systemd/system/multi-user.target.wants/rvi.service -/opt/rvi-0.4.0 +/opt/rvi-0.5.0 diff --git a/python/rvilib.py b/python/rvilib.py index d9f2388..b284c82 100644 --- a/python/rvilib.py +++ b/python/rvilib.py @@ -5,7 +5,7 @@ # Mozilla Public License, version 2.0. The full text of the # Mozilla Public License is at https://www.mozilla.org/MPL/2.0/ # -# rbilib.py 0.4.0 +# rbilib.py 0.5.0 # # This moduke from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer diff --git a/rel/reltool.config b/rel/reltool.config index 8c67965..bad8d3a 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -4,7 +4,7 @@ {lib_dirs, ["../deps/", "../components/"]}, {erts, [{mod_cond, derived}, {app_file, strip}]}, {app_file, strip}, - {rel, "rvi", "0.4.0", + {rel, "rvi", "0.5.0", [ kernel, stdlib, diff --git a/rpm/SPECS/rvi-0.4.0.spec b/rpm/SPECS/rvi-0.4.0.spec deleted file mode 100644 index 67b4854..0000000 --- a/rpm/SPECS/rvi-0.4.0.spec +++ /dev/null @@ -1,72 +0,0 @@ -Summary: Remote Vehicle Interaction Node -Name: rvi -Version: 0.4.0 -Release: 1 -# Copyright: Jaguar Land Rover - -License: Mozilla Public License v2 -Vendor: Jaguar Land Rover -Group: Applications/System -Source: http://content.linuxfoundation.org/auto/downloads/rvi/rvi-0.4.0.tgz -Buildroot: /var/tmp/%{name}-buildroot - -# Requires: - -%description -The RVI project sets up a P2P network allowing services on multiple -nodes to access each other through a number of different protocols -and data channels. The entire system is designed to be adapted -and rewritten to fullfil the requirements of the target production -environment. - -# -%prep -%setup -c rvi-$RPM_PACKAGE_VERSION - -%build -make deps -make compile -# Create a sample config. -./scripts/setup_rvi_node.sh -n rvi-$RPM_PACKAGE_VERSION -c rvi_sample.config - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION -cp -ar rel/rvi-$RPM_PACKAGE_VERSION $RPM_BUILD_ROOT/opt/ - -# Create a standard debian setup for start/stop. -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/etc/rc0.d -mkdir -p $RPM_BUILD_ROOT/etc/rc1.d -mkdir -p $RPM_BUILD_ROOT/etc/rc2.d -mkdir -p $RPM_BUILD_ROOT/etc/rc3.d -mkdir -p $RPM_BUILD_ROOT/etc/rc4.d -mkdir -p $RPM_BUILD_ROOT/etc/rc5.d -mkdir -p $RPM_BUILD_ROOT/etc/rc6.d -install ./scripts/rvi $RPM_BUILD_ROOT/etc/init.d -ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc0.d/K20-rvi -ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc1.d/K20-rvi -ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc2.d/S50-rvi -ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc3.d/S50-rvi -ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc4.d/S50-rvi -ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc5.d/S50-rvi -ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc6.d/K20-rvi - -# Make global config file easier to access. -ln -fsr $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION/releases/1/sys.config \ - $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION/sys.config -%post - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -/etc/init.d -/etc/rc0.d -/etc/rc1.d -/etc/rc2.d -/etc/rc3.d -/etc/rc4.d -/etc/rc5.d -/etc/rc6.d -/opt/rvi-0.4.0 diff --git a/scripts/rvi.service.tizen b/scripts/rvi.service.tizen index 1220eb9..14bb8cc 100644 --- a/scripts/rvi.service.tizen +++ b/scripts/rvi.service.tizen @@ -4,15 +4,15 @@ Description=Remote Vehicle Interaction Service Wants=network-online.target [Service] -Environment="HOME=/opt/rvi-0.4.0" +Environment="HOME=/opt/rvi-0.5.0" Type=forking StandardOutput=journal StandardError=journal ExecStartPre=/usr/bin/chsmack --access User /home/app/content/Documents/vin -ExecStartPre=/opt/rvi-0.4.0/erts-5.10.4/bin/epmd -daemon -ExecStart=/bin/sh /opt/rvi-0.4.0/bin/rvi start -ExecStop=/bin/sh /opt/rvi-0.4.0/bin/rvi stop -ExecStopPost=/opt/rvi-0.4.0/erts-5.10.4/bin/epmd -kill +ExecStartPre=/opt/rvi-0.5.0/erts-5.10.4/bin/epmd -daemon +ExecStart=/bin/sh /opt/rvi-0.5.0/bin/rvi start +ExecStop=/bin/sh /opt/rvi-0.5.0/bin/rvi stop +ExecStopPost=/opt/rvi-0.5.0/erts-5.10.4/bin/epmd -kill GuessMainPID=yes [Install] diff --git a/src/rvi_core.app.src b/src/rvi_core.app.src index 977e79e..93fa67a 100644 --- a/src/rvi_core.app.src +++ b/src/rvi_core.app.src @@ -12,7 +12,7 @@ {application, rvi_core, [ {description, ""}, - {vsn, "0.4.0"}, + {vsn, "0.5.0"}, {registered, []}, {applications, [ kernel, |