diff options
-rw-r--r-- | meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc | 22 | ||||
-rw-r--r-- | meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.9.bb (renamed from meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.8.bb) | 8 |
2 files changed, 23 insertions, 7 deletions
diff --git a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc index 4ff6115..8978fa1 100644 --- a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc +++ b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc @@ -1,4 +1,4 @@ -#!/bin/sh +roo#!/bin/sh get_list() { return 1 } @@ -14,16 +14,23 @@ _run_1() { } run_1() { + systemctl start dlt-dbus + _p=`pidof NodeStateManager` + if [ "x${_p}" != "x" ]; then + kill -9 ${_p} >& /dev/null + fi + systemctl stop nsm-dummy + systemctl stop node-startup-controller + systemctl stop nsm-dummy + systemctl start node-startup-controller + systemctl start nsm-dummy if [ ! -d /tmp/PAS ]; then rm -f /tmp/PAS mkdir -p /tmp/PAS fi cp ${_run_dir}/resource*.tar.gz /tmp/PAS/ - systemctl restart dlt-dbus - systemctl restart dlt-example-user - systemctl restart pas-daemon - systemctl restart node-startup-controller + systemctl start pas-daemon if [ "x${1}" != "x" ]; then _run_1 > /tmp/t _c1=`cat /tmp/t | grep OK | wc -l` @@ -38,4 +45,9 @@ run_1() { else _run_1 fi + systemctl stop pas-daemon + systemctl stop nsm-dummy + systemctl stop node-startup-controller + systemctl stop nsm-dummy + systemctl stop dlt-dbus } diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.8.bb b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.9.bb index dd8b98a..88bb3d2 100644 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.8.bb +++ b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.9.bb @@ -4,9 +4,9 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -PR = "r1" +PR = "r0" -SRCREV = "47e5a424c8ef6e33565737f20d3bd81f69c8efc9" +SRCREV = "635b4843b5189d68c38abfa14c9cd61815b2152b" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https " S = "${WORKDIR}/git" @@ -21,6 +21,10 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "pas-daemon.service" SYSTEMD_AUTO_ENABLE = "disable" +do_configure_prepend() { + cp ${S}/README.md ${S}/README +} + do_install_append() { perl -pi -e 's/dbus-public-bus.service/dbus.service/' \ ${D}/lib/systemd/system/pas-daemon.service |