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 build directory instead of the install directory. Signed-off-by: Jean-Marie LEMETAYER <[email protected]> --- scripts/lib/devtool/standard.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 7068a02a01..2604b79be3 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -262,14 +262,11 @@ def add(args, config, basepath, workspace): f.write('}\n') if bb.data.inherits_class('npm', rd): - f.write('do_install_append() {\n') - f.write(' # Remove files added to source dir by devtool/externalsrc\n') - f.write(' rm -f ${NPM_INSTALLDIR}/singletask.lock\n') - f.write(' rm -rf ${NPM_INSTALLDIR}/.git\n') - f.write(' rm -rf ${NPM_INSTALLDIR}/oe-local-files\n') - f.write(' for symlink in ${EXTERNALSRC_SYMLINKS} ; do\n') - f.write(' rm -f ${NPM_INSTALLDIR}/${symlink%%:*}\n') - f.write(' done\n') + f.write('do_compile_append() {\n') + f.write(' rm -rf ${B}/lib/node_modules/*/.git\n') + f.write(' rm -rf ${B}/lib/node_modules/@*/*/.git\n') + f.write(' rm -f ${B}/lib/node_modules/*/singletask.lock\n') + f.write(' rm -f ${B}/lib/node_modules/@*/*/singletask.lock\n') f.write('}\n') # Check if the new layer provides recipes whose priorities have been -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
