language-style=r2 node-inspector=r2 nodejs-module-webos-{dynaload=r5,…

…pmlog=r5,sysbus=r8} :Release Notes: nodejs modules was shipping the node-gyp and npm to user home directory changed to work directory of individual modules. :Detailed Notes: nodejs module was shipping the node-gyp and npm to home directory now it is moved to work directories of individual modules by explicitly exporting home and work directory. :Testing Performed: Testing done with Jackrabbit server & working fine results are posted in PLAT-52171 :QA Notes: :Issues Addressed: [PLAT-52171] nodejs-module-webos-* fail to build on jackrabbit-build.lgsvl.net [PLAT-52970] CCC: language-style=r2 node-inspector=r2 nodejs-module-webos-{dynaload=r5,pmlog=r5,sysbus=r8}
webosose · Apr 9, 2018 · c064061 · c064061
1 parent 3eafaab
commit c064061
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/meta-webos/recipes-upstreamable/node-inspector/node-inspector_0.7.5.bb b/meta-webos/recipes-upstreamable/node-inspector/node-inspector_0.7.5.bb
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2017 LG Electronics, Inc.
+# Copyright (c) 2013-2018 LG Electronics, Inc.
 
 SUMMARY = "node-inspector in order to support the remote debugging"
 AUTHOR = "Hyunsung Lee <hyunsung.lee@lge.com>"
@@ -7,7 +7,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=480ea7e44791280d20fa258a33030275"
 
 DEPENDS = "nodejs-native node-gyp-packages-native node-gyp-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://github.com/${BPN}/${BPN};protocol=https;branch=0.7.x \
            file://node-inspector"
@@ -17,7 +17,15 @@ SRCREV = "dcd3125aff325d439871b356fe71d779dc50e5c6"
 S = "${WORKDIR}/git"
 
 do_compile() {
+    export HOME=${WORKDIR}
+
     cd ${S}
+    # configure cache to be in working directory
+    ${STAGING_BINDIR_NATIVE}/npm set cache ${WORKDIR}/npm_cache
+
+    # clear local cache prior to each compile
+    ${STAGING_BINDIR_NATIVE}/npm cache clear
+
     ${STAGING_BINDIR_NATIVE}/npm install --production
     cd ${B}
 }

diff --git a/meta-webos/recipes-webos/nodejs-module-webos/nodejs-module-webos-dynaload.bb b/meta-webos/recipes-webos/nodejs-module-webos/nodejs-module-webos-dynaload.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 DEPENDS = "boost node-gyp-native"
 
 WEBOS_VERSION = "3.0.2-1_33cd720ceba4141a837bbb4e498e2de00695af42"
-PR = "r4"
+PR = "r5"
 
 inherit webos_component
 inherit webos_public_repo
@@ -21,12 +21,14 @@ SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE}"
 S = "${WORKDIR}/git"
 
 do_configure() {
+    export HOME=${WORKDIR}
     export LD="${CXX}"
     export GYP_DEFINES="sysroot=${STAGING_DIR_HOST}"
     node-gyp --arch ${TARGET_ARCH} configure
 }
 
 do_compile() {
+    export HOME=${WORKDIR}
     export LD="${CXX}"
     export GYP_DEFINES="sysroot=${STAGING_DIR_HOST}"
     node-gyp --arch ${TARGET_ARCH} build

diff --git a/meta-webos/recipes-webos/nodejs-module-webos/nodejs-module-webos-pmlog.bb b/meta-webos/recipes-webos/nodejs-module-webos/nodejs-module-webos-pmlog.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 DEPENDS = "pmloglib node-gyp-native"
 
 WEBOS_VERSION = "3.0.1-1_03fc1bc90518390eea0acd7639d6074c16c61195"
-PR = "r4"
+PR = "r5"
 
 inherit webos_component
 inherit webos_public_repo
@@ -21,6 +21,7 @@ SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE}"
 S = "${WORKDIR}/git"
 
 do_configure() {
+    export HOME=${WORKDIR}
     export LD="${CXX}"
     cd src
     sh -c "xxd -i pmloglib.js > pmloglib.js.h"
@@ -29,6 +30,7 @@ do_configure() {
 }
 
 do_compile() {
+    export HOME=${WORKDIR}
     export LD="${CXX}"
     node-gyp --arch ${TARGET_ARCH} build
 }

diff --git a/meta-webos/recipes-webos/nodejs-module-webos/nodejs-module-webos-sysbus.bb b/meta-webos/recipes-webos/nodejs-module-webos/nodejs-module-webos-sysbus.bb
@@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 DEPENDS = "glib-2.0 luna-service2 node-gyp-native"
 
 WEBOS_VERSION = "3.0.1-1_780a3a2ecd33b826d18f22b05bcc9f9dbf27be05"
-PR = "r7"
-
+PR = "r8"
 
 inherit webos_component
 inherit webos_public_repo
@@ -22,6 +21,7 @@ SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE}"
 S = "${WORKDIR}/git"
 
 do_configure() {
+    export HOME=${WORKDIR}
     export LD="${CXX}"
     export GYP_DEFINES="sysroot=${STAGING_DIR_HOST}"
     # used by binding.gyp
@@ -30,6 +30,7 @@ do_configure() {
 }
 
 do_compile() {
+    export HOME=${WORKDIR}
     export LD="${CXX}"
     export GYP_DEFINES="sysroot=${STAGING_DIR_HOST}"
     # used by binding.gyp