summaryrefslogtreecommitdiffstats
path: root/recipes-demo
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-demo')
-rw-r--r--recipes-demo/html5-background/files/webapps-html5-background.desktop2
-rw-r--r--recipes-demo/html5-background/html5-background_git.bb4
-rw-r--r--recipes-demo/html5-homescreen/files/homescreen.service4
-rw-r--r--recipes-demo/html5-homescreen/html5-homescreen_git.bb4
-rw-r--r--recipes-demo/html5-hvac/files/webapps-hvac.desktop2
-rw-r--r--recipes-demo/html5-hvac/html5-hvac_git.bb4
-rw-r--r--recipes-demo/html5-launcher/files/launcher.desktop2
-rw-r--r--recipes-demo/html5-launcher/html5-launcher_git.bb4
8 files changed, 12 insertions, 14 deletions
diff --git a/recipes-demo/html5-background/files/webapps-html5-background.desktop b/recipes-demo/html5-background/files/webapps-html5-background.desktop
index d53a76739..be474705d 100644
--- a/recipes-demo/html5-background/files/webapps-html5-background.desktop
+++ b/recipes-demo/html5-background/files/webapps-html5-background.desktop
@@ -3,7 +3,7 @@ Version=1.0
Name=HTML5 Background
Comment=Background
GenericName=Background
-Exec=env AFM_ID=webapps-html5-background AFM_APP_INSTALL_DIR=/usr/lib/wam_apps/html5-background/ /usr/bin/WebAppMgr
+Exec=/usr/bin/WebAppMgr --appid=webapps-html5-background --app-install-dir=/usr/lib/wam_apps/html5-background/
Icon=settings
Terminal=false
Type=Application
diff --git a/recipes-demo/html5-background/html5-background_git.bb b/recipes-demo/html5-background/html5-background_git.bb
index c06ece09e..792b04a85 100644
--- a/recipes-demo/html5-background/html5-background_git.bb
+++ b/recipes-demo/html5-background/html5-background_git.bb
@@ -9,10 +9,10 @@ S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
SRC_URI = " \
- git://github.com/AGL-web-applications/background.git;protocol=https;branch=master \
+ git://gerrit.automotivelinux.org/gerrit/apps/html5-background;protocol=https;branch=master \
file://webapps-html5-background.desktop \
"
-SRCREV = "3b8dae349d428c0230b9885f86d421d43cda5638"
+SRCREV = "7b796408f4ee1ca1b92a02445513d939079af46e"
DEPENDS = "nodejs-native"
diff --git a/recipes-demo/html5-homescreen/files/homescreen.service b/recipes-demo/html5-homescreen/files/homescreen.service
index 80bc44ee6..b142c4efe 100644
--- a/recipes-demo/html5-homescreen/files/homescreen.service
+++ b/recipes-demo/html5-homescreen/files/homescreen.service
@@ -5,10 +5,8 @@ After=WebAppMgr.service dbus.service
[Service]
Type=simple
-Environment=AFM_ID=homescreen
-Environment=AFM_APP_INSTALL_DIR=/usr/lib/wam_apps/html5-homescreen/
ExecStartPre=sleep 5
-ExecStart=/usr/bin/WebAppMgr
+ExecStart=/usr/bin/WebAppMgr --appid=homescreen --app-install-dir=/usr/lib/wam_apps/html5-homescreen/
Restart=on-failure
[Install]
diff --git a/recipes-demo/html5-homescreen/html5-homescreen_git.bb b/recipes-demo/html5-homescreen/html5-homescreen_git.bb
index 6958d7b33..058e921e2 100644
--- a/recipes-demo/html5-homescreen/html5-homescreen_git.bb
+++ b/recipes-demo/html5-homescreen/html5-homescreen_git.bb
@@ -9,10 +9,10 @@ S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
SRC_URI = " \
- git://gerrit.automotivelinux.org/gerrit/apps/html5-homescreen;protocol=https;branch=${AGL_BRANCH} \
+ git://gerrit.automotivelinux.org/gerrit/apps/html5-homescreen;protocol=https;branch=master \
file://homescreen.service \
"
-SRCREV = "21bd1dcdffeafa82948b969062f5221f6e8d480c"
+SRCREV = "5c9e060c508ab5ea49241d3a88f86075d6dc39cf"
DEPENDS = "nodejs-native"
diff --git a/recipes-demo/html5-hvac/files/webapps-hvac.desktop b/recipes-demo/html5-hvac/files/webapps-hvac.desktop
index 88b139385..3e7f0dc8e 100644
--- a/recipes-demo/html5-hvac/files/webapps-hvac.desktop
+++ b/recipes-demo/html5-hvac/files/webapps-hvac.desktop
@@ -3,7 +3,7 @@ Version=1.0
Name=HTML5 HVAC
Comment=HVAC
GenericName=HVAC
-Exec=env AFM_ID=webapps-hvac AFM_APP_INSTALL_DIR=/usr/lib/wam_apps/html5-hvac/ /usr/bin/WebAppMgr
+Exec=/usr/bin/WebAppMgr --appid=webapps-hvac --app-install-dir=/usr/lib/wam_apps/html5-hvac/
Icon=settings
Terminal=false
Type=Application
diff --git a/recipes-demo/html5-hvac/html5-hvac_git.bb b/recipes-demo/html5-hvac/html5-hvac_git.bb
index 9cf570976..f0106dbac 100644
--- a/recipes-demo/html5-hvac/html5-hvac_git.bb
+++ b/recipes-demo/html5-hvac/html5-hvac_git.bb
@@ -9,10 +9,10 @@ S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
SRC_URI = " \
- git://gerrit.automotivelinux.org/gerrit/apps/html5-hvac;protocol=https;branch=${AGL_BRANCH} \
+ git://gerrit.automotivelinux.org/gerrit/apps/html5-hvac;protocol=https;branch=master \
file://webapps-hvac.desktop \
"
-SRCREV = "45641bf053eade93cd3590b2286377869bb799cf"
+SRCREV = "e64d69bdad0bb302900ec631b54ad6b6d6dcbacd"
DEPENDS = "nodejs-native"
diff --git a/recipes-demo/html5-launcher/files/launcher.desktop b/recipes-demo/html5-launcher/files/launcher.desktop
index 17eb563c5..b3e8e4390 100644
--- a/recipes-demo/html5-launcher/files/launcher.desktop
+++ b/recipes-demo/html5-launcher/files/launcher.desktop
@@ -3,7 +3,7 @@ Version=1.0
Name=HTML5 Launcher
Comment=Launcher
GenericName=Launcher
-Exec=env AFM_ID=launcher AFM_APP_INSTALL_DIR=/usr/lib/wam_apps/html5-launcher/ /usr/bin/WebAppMgr
+Exec=/usr/bin/WebAppMgr --appid=launcher --app-install-dir=/usr/lib/wam_apps/html5-launcher/
Icon=settings
Terminal=false
Type=Application
diff --git a/recipes-demo/html5-launcher/html5-launcher_git.bb b/recipes-demo/html5-launcher/html5-launcher_git.bb
index ecafd19e9..52d7077d6 100644
--- a/recipes-demo/html5-launcher/html5-launcher_git.bb
+++ b/recipes-demo/html5-launcher/html5-launcher_git.bb
@@ -9,10 +9,10 @@ S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
SRC_URI = " \
- git://gerrit.automotivelinux.org/gerrit/apps/html5-launcher;protocol=https;branch=${AGL_BRANCH} \
+ git://gerrit.automotivelinux.org/gerrit/apps/html5-launcher;protocol=https;branch=master \
file://launcher.desktop \
"
-SRCREV = "b37179742fac1053ba621cfa12938ec6536cf1f7"
+SRCREV = "cb6b66c3bd94a6ab18cad3ad87c827d4f7e623e9"
DEPENDS = "nodejs-native"