From d10bba5a6acebe22681a950b613fa8f1d4967980 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 2 Jun 2020 12:49:23 -0400 Subject: [PATCH] Update html5 widget recipes Remove aglwgt task over-rides so that autobuild scripts will be used, and clean up DEPENDS definitions to match OE style recommendation. Bug-AGL: SPEC-2049, SPEC-3397 Signed-off-by: Scott Murray Change-Id: I4cc54aa272060ec8130ea253164a99cd00ad5c44 --- recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb | 12 +----------- recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb | 12 +----------- recipes-demo-hmi/html5-hvac/html5-hvac_git.bb | 12 +----------- recipes-demo-hmi/html5-launcher/html5-launcher_git.bb | 12 +----------- recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb | 12 +----------- recipes-demo-hmi/html5-mixer/html5-mixer_git.bb | 2 +- recipes-demo-hmi/html5-settings/html5-settings_git.bb | 12 +----------- 7 files changed, 7 insertions(+), 67 deletions(-) diff --git a/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb b/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb index 534bd2d38..ac874755e 100644 --- a/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb +++ b/recipes-demo-hmi/html5-dashboard/html5-dashboard_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-dashboard;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb b/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb index 68956263f..37ca70737 100644 --- a/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb +++ b/recipes-demo-hmi/html5-homescreen/html5-homescreen_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-homescreen;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb b/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb index d45dc80df..7fc89aed9 100644 --- a/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb +++ b/recipes-demo-hmi/html5-hvac/html5-hvac_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-hvac;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb b/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb index ce8a1d113..47760f676 100644 --- a/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb +++ b/recipes-demo-hmi/html5-launcher/html5-launcher_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-launcher;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb b/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb index 2b1437669..a87b9bcf4 100644 --- a/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb +++ b/recipes-demo-hmi/html5-mediaplayer/html5-mediaplayer_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-mediaplayer;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} diff --git a/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb b/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb index 09fa249b7..97b1195c8 100644 --- a/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb +++ b/recipes-demo-hmi/html5-mixer/html5-mixer_git.bb @@ -10,6 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-mixer;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt diff --git a/recipes-demo-hmi/html5-settings/html5-settings_git.bb b/recipes-demo-hmi/html5-settings/html5-settings_git.bb index dea1ec35b..a167b1428 100644 --- a/recipes-demo-hmi/html5-settings/html5-settings_git.bb +++ b/recipes-demo-hmi/html5-settings/html5-settings_git.bb @@ -10,16 +10,6 @@ S = "${WORKDIR}/git/" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-settings;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -DEPENDS += " nodejs-native" +DEPENDS = "nodejs-native" inherit aglwgt - -do_configure() { - cd ${B} - npm install -} - -do_aglwgt_package() { - cd ${B} - npm run build -} -- 2.16.6