summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorJean-Marie LEMETAYER <jean-marie.lemetayer@savoirfairelinux.com>2020-01-24 18:07:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-27 16:48:09 +0000
commit1f3b0e2f8992da9321a73a5b8d026c3bf6fd1967 (patch)
tree6b4f3bdadc382964e336c1d4830f79192e37c0d0 /scripts/lib
parent3b0640c993c5e961c010a63bd2b340a28ca350c9 (diff)
downloadpoky-1f3b0e2f8992da9321a73a5b8d026c3bf6fd1967.tar.gz
devtool/standard: npm: update the append file
When creating a recipe using devtool, a workspace is created to store the new recipe, the recipe source and some append files. These append files are used by devtool to build the recipe using externalsrc (to use the source which are in the workspace). They can also have some additional actions according to the class of the recipe. This commit updates the append file for the npm recipes. The devtool / externalsrc files are removed in the npm package directory instead of the install directory. (From OE-Core rev: a213a76e56e9bc215a61399ae35a3602863f5850) Signed-off-by: Jean-Marie LEMETAYER <jean-marie.lemetayer@savoirfairelinux.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/devtool/standard.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index f33018de3f..52efeae938 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -260,14 +260,10 @@ def add(args, config, basepath, workspace):
260 f.write('}\n') 260 f.write('}\n')
261 261
262 if bb.data.inherits_class('npm', rd): 262 if bb.data.inherits_class('npm', rd):
263 f.write('do_install_append() {\n') 263 f.write('python do_configure_append() {\n')
264 f.write(' # Remove files added to source dir by devtool/externalsrc\n') 264 f.write(' pkgdir = d.getVar("NPM_PACKAGE")\n')
265 f.write(' rm -f ${NPM_INSTALLDIR}/singletask.lock\n') 265 f.write(' lockfile = os.path.join(pkgdir, "singletask.lock")\n')
266 f.write(' rm -rf ${NPM_INSTALLDIR}/.git\n') 266 f.write(' bb.utils.remove(lockfile)\n')
267 f.write(' rm -rf ${NPM_INSTALLDIR}/oe-local-files\n')
268 f.write(' for symlink in ${EXTERNALSRC_SYMLINKS} ; do\n')
269 f.write(' rm -f ${NPM_INSTALLDIR}/${symlink%%:*}\n')
270 f.write(' done\n')
271 f.write('}\n') 267 f.write('}\n')
272 268
273 # Check if the new layer provides recipes whose priorities have been 269 # Check if the new layer provides recipes whose priorities have been