summaryrefslogtreecommitdiff
path: root/meta/classes/npm.bbclass
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-03-21 18:14:04 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 14:24:25 +0000
commit766845e06db9d7d595e836ea1364c16fa132a413 (patch)
tree497b4e25e8cc68e88d48d9b5b444b8f006b69b61 /meta/classes/npm.bbclass
parentb2677a4448dbc42e523c731b953b44006749252c (diff)
downloadopenembedded-core-766845e06db9d7d595e836ea1364c16fa132a413.tar.gz
openembedded-core-766845e06db9d7d595e836ea1364c16fa132a413.tar.bz2
openembedded-core-766845e06db9d7d595e836ea1364c16fa132a413.zip
devtool: add: delete externalsrc files on npm recipe do_install
The npm class just installs whatever is in ${S}; if you're using externalsrc in conjunction with it the symlinks (oe-workdir and oe-logs by default) plus singletask.lock will end up in the final package, which isn't really right. Introduce a variable so we know the path the files will be installed into within npm.bbclass, and append to do_install within the workspace bbappend to delete the files. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/npm.bbclass')
-rw-r--r--meta/classes/npm.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index b5db99d2b9..33ff5e3f45 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -1,6 +1,8 @@
DEPENDS_prepend = "nodejs-native "
S = "${WORKDIR}/npmpkg"
+NPM_INSTALLDIR = "${D}${libdir}/node_modules/${PN}"
+
npm_do_compile() {
# changing the home directory to the working directory, the .npmrc will
# be created in this directory
@@ -14,8 +16,8 @@ npm_do_compile() {
}
npm_do_install() {
- mkdir -p ${D}${libdir}/node_modules/${PN}/
- cp -a ${S}/* ${D}${libdir}/node_modules/${PN}/ --no-preserve=ownership
+ mkdir -p ${NPM_INSTALLDIR}/
+ cp -a ${S}/* ${NPM_INSTALLDIR}/ --no-preserve=ownership
}
python populate_packages_prepend () {