diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-10-28 18:16:34 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2022-12-12 07:03:28 +0100 |
commit | 8bf79fc2002bb83c6439d25bb63e4206894c2d10 (patch) | |
tree | 55b33b5f3848bc55061b29fb5cc3412948219cdb | |
parent | 1a8059f6b257ebe6fcae6416e499784d976afd24 (diff) | |
download | meta-java-8bf79fc2002bb83c6439d25bb63e4206894c2d10.tar.gz |
conf: layer: add free(1) to HOSTTOOLS_NONFATAL for icedtea7-native
icedtea7-native build uses free -m (from the procfs suite of tools) to
determine memory bound during compile. This always fails for us,
because free is not passed through from the host environment.
This results in a few warnings in the logs:
/bin/sh: line 1: free: command not found
[..snip..]/Sanity-Settings.gmk:195: WARNING: MB_OF_MEMORY should not
be empty [Sanity-Settings.gmk]
But otherwise this is handled gracefully. Problems arise when building
icedtea7-native on hosts with more modest RAM sizes: Build process
will consume so much RAM that the OOM killer is invoked. Let us avoid
this by passing through free from the host environment.
We use HOSTTOOLS_NONFATAL instead of HOSTTOOLS as to not break
currently working setups that have enough RAM but lack free(1).
This needs to be done globally due to the way HOSTTOOLS_NONFATAL is
evaluated, we thus stick it into the layer.conf.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
(cherry picked from commit 79df369e89ed72ebdfe84a4a520ed590751ae5d9)
-rw-r--r-- | conf/layer.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 2e2ce16..bd8f5ae 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -12,6 +12,8 @@ LAYERDEPENDS_meta-java += "openembedded-layer" | |||
12 | 12 | ||
13 | LICENSE_PATH += "${LAYERDIR}/licenses" | 13 | LICENSE_PATH += "${LAYERDIR}/licenses" |
14 | 14 | ||
15 | HOSTTOOLS_NONFATAL += "free" | ||
16 | |||
15 | SIGGEN_EXCLUDERECIPES_ABISAFE += "\ | 17 | SIGGEN_EXCLUDERECIPES_ABISAFE += "\ |
16 | ca-certificates-java \ | 18 | ca-certificates-java \ |
17 | " | 19 | " |