MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

devtool/standard: npm: update the append file

Browse Source 
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>
This commit is contained in:
Jean-Marie LEMETAYER 2020-01-24 18:07:40 +01:00 committed by Richard Purdie
parent 3b0640c993
commit 1f3b0e2f89
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/lib/devtool/standard.py
View File

@ -260,14 +260,10 @@ 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('python do_configure_append() {\n')
f.write(' pkgdir = d.getVar("NPM_PACKAGE")\n')
f.write(' lockfile = os.path.join(pkgdir, "singletask.lock")\n')
f.write(' bb.utils.remove(lockfile)\n')
f.write('}\n')
# Check if the new layer provides recipes whose priorities have been