diff options
author | Ross Burton <ross.burton@arm.com> | 2023-02-20 15:46:11 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-02-22 01:07:43 -0800 |
commit | 1ed7324c575ee7e346bbf8dd344b69646a5af24a (patch) | |
tree | 78af477dc664ff1b8fef0c2f695e079eb32b2865 | |
parent | 69439ee7bd1d5da7b53ee7573f75e8e1b7ef0e43 (diff) | |
download | meta-openembedded-1ed7324c575ee7e346bbf8dd344b69646a5af24a.tar.gz |
nodejs: use a postfunc to prune source tree
Instead of overriding do_unpack entirely and calling into base_do_unpack,
use a postfunc. This keeps the prune logic separated neatly.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index 3a0b2fd861..1811e975cd 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | |||
@@ -89,10 +89,9 @@ EXTRA_OEMAKE = "\ | |||
89 | builddir_name=./ \ | 89 | builddir_name=./ \ |
90 | " | 90 | " |
91 | 91 | ||
92 | python do_unpack() { | 92 | python prune_sources() { |
93 | import shutil | 93 | import shutil |
94 | 94 | ||
95 | bb.build.exec_func('base_do_unpack', d) | ||
96 | shutil.rmtree(d.getVar('S') + '/deps/openssl') | 95 | shutil.rmtree(d.getVar('S') + '/deps/openssl') |
97 | if 'ares' in d.getVar('PACKAGECONFIG'): | 96 | if 'ares' in d.getVar('PACKAGECONFIG'): |
98 | shutil.rmtree(d.getVar('S') + '/deps/cares') | 97 | shutil.rmtree(d.getVar('S') + '/deps/cares') |
@@ -105,6 +104,7 @@ python do_unpack() { | |||
105 | if 'zlib' in d.getVar('PACKAGECONFIG'): | 104 | if 'zlib' in d.getVar('PACKAGECONFIG'): |
106 | shutil.rmtree(d.getVar('S') + '/deps/zlib') | 105 | shutil.rmtree(d.getVar('S') + '/deps/zlib') |
107 | } | 106 | } |
107 | do_unpack[postfuncs] += "prune_sources" | ||
108 | 108 | ||
109 | # V8's JIT infrastructure requires binaries such as mksnapshot and | 109 | # V8's JIT infrastructure requires binaries such as mksnapshot and |
110 | # mkpeephole to be run in the host during the build. However, these | 110 | # mkpeephole to be run in the host during the build. However, these |