Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

npm-base: Move cache dir to persistent location #70

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+40 −31
Open

npm-base: Move cache dir to persistent location #70

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e68570
npm-base: Move cache dir to persistent location
May 6, 2017
5b8592a
2017-08-01, Version 6.11.2 'Boron' (LTS)
Aug 31, 2017
4aa24f7
2017-07-11, Version 7.10.1 (Current)
Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
npm-base: Move cache dir to persistent location
Michael Davis committed May 6, 2017
commit 1e68570079ca7b3d34e781a3fd5daa0a04e0fc3b
18 changes: 14 additions & 4 deletions classes/npm-base.bbclass
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ NPM_REGISTRY ?= "https://registry.npmjs.org/"
NPM_IGNORE = "${WORKDIR}/.npmignore"

NPM ?= "npm"
NPM_CACHE_DIR = "${TMPDIR}/npm_cache/${PF}"
NPM_HOME_DIR = "${TMPDIR}/npm_home/${PF}"
NPM_ARCH ?= "${@nodejs_map_dest_cpu(d.getVar('TARGET_ARCH', True), d)}"
NPM_LD ?= "${CXX}"
@@ -40,7 +39,13 @@ oe_runnpm() {

mkdir -p "${NPM_HOME_DIR}"

export NPM_CONFIG_CACHE="${NPM_CACHE_DIR}"
if [ "${NPM_CACHE_DIR}" == "" ]; then
NPM_VERSION=`${NPM} -v`
export NPM_CONFIG_CACHE="${DL_DIR}/npm_v${NPM_VERSION}_${TARGET_ARCH}_cache/${PF}"
else
export NPM_CONFIG_CACHE=${NPM_CACHE_DIR}
fi

export NPM_CONFIG_DEV="false"

bbnote NPM target architecture: ${NPM_ARCH}
@@ -68,7 +73,6 @@ oe_runnpm() {
# Native npm

NPM_NATIVE ?= "npm"
NPM_CACHE_DIR_NATIVE = "${TMPDIR}/npm_cache_native/${PF}"
NPM_HOME_DIR_NATIVE = "${TMPDIR}/npm_home_native/${PF}"
NPM_ARCH_NATIVE ?= "${@nodejs_map_dest_cpu(d.getVar('BUILD_ARCH', True), d)}"
NPM_LD_NATIVE ?= "${BUILD_CXX}"
@@ -95,7 +99,13 @@ oe_runnpm_native() {

mkdir -p "${NPM_HOME_DIR_NATIVE}"

export NPM_CONFIG_CACHE="${NPM_CACHE_DIR_NATIVE}"
if [ "${NPM_CACHE_DIR_NATIVE}" == "" ]; then
NPM_VERSION=`${NPM} -v`
export NPM_CONFIG_CACHE="${DL_DIR}/npm_v${NPM_VERSION}_${TARGET_ARCH}_native/${PF}"
else
export NPM_CONFIG_CACHE=${NPM_CACHE_DIR_NATIVE}
fi

export NPM_CONFIG_DEV="false"

bbnote NPM native architecture: ${NPM_ARCH_NATIVE}