Fix build issue for meta-oe
cover Fix build issue for meta-oe
World builds failed for mvp. These two changes fix
Exception: PermissionError: [Errno 13] Permission denied: 'TOPDIR/tmp/work/core2-64-poky-linux/mpv/0.32.0-r0/git/waf'
https://errors.yoctoproject.org/Errors/Details/539929/
Issue introduced by https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-multimedia/mplayer?id=5af46f89fcef5c436786ed81978de60f26abe054
These fixes are in Gatesgarth.
Please concider these for Dunfell.
Joshua Watt (1):
classes/waf: Add build and install arguments
Ross Burton (1):
waf: don't assume the waf intepretter is good
meta/classes/waf.bbclass | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 classes/waf: Add build and install arguments
From: Joshua Watt <[email protected]>
Adds variables that can be used to allow a recipe to pass extra arguments to waf build and waf install. In most cases, you want to pass the same arguments to build and install (since install is a superset of build), so by default setting EXTRA_OEWAF_BUILD also affects waf install, but this can be overridded.
(From OE-Core rev: 493e17a2f5cbbbe3b1e435dadb281b007bca2cbf)
--- meta/classes/waf.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta/classes/waf.bbclass +7 -2
@@ -5,6 +5,11 @@ B = "${WORKDIR}/build" EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" +EXTRA_OEWAF_BUILD ??= "" +# In most cases, you want to pass the same arguments to `waf build` and `waf +# install`, but you can override it if necessary +EXTRA_OEWAF_INSTALL ??= "${EXTRA_OEWAF_BUILD}" + def waflock_hash(d): # Calculates the hash used for the waf lock file. This should include # all of the user controllable inputs passed to waf configure. Note
@@ -55,11 +60,11 @@ waf_do_configure() { do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+" waf_do_compile() { - (cd ${S} && ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}) + (cd ${S} && ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} ${EXTRA_OEWAF_BUILD}) } waf_do_install() { - (cd ${S} && ./waf install --destdir=${D}) + (cd ${S} && ./waf install --destdir=${D} ${EXTRA_OEWAF_INSTALL}) } EXPORT_FUNCTIONS do_configure do_compile do_install
Signature · 1 line
2.17.1
Re: [OE-core] [dunfell][PATCH 1/2] classes/waf: Add build and install arguments
Quoted 9 lines · akuster
From: Joshua Watt <[email protected]>
Adds variables that can be used to allow a recipe to pass extra arguments to
waf buildandwaf install. In most cases, you want to pass the same arguments tobuildandinstall(since install is a superset ofbuild), so by default settingEXTRA_OEWAF_BUILDalso affectswaf install, but this can be overridded.
Hi Armin,
Have no problem with this - most of my layers are compatible from dunfell up to master but from meta-musicians (musicians seem to like waf) I know that this can cause breakages for packages shipping (very) old waf. Nothing unsolvable but...
Just out of my curiosity: Why add this patch to dunfell? Cheers
Andreas
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [dunfell][PATCH 1/2] classes/waf: Add build and install arguments
Aargh just read cover letter - sorry
Quoted 24 lines · Andreas Müller via lists.openembedded.org
Quoted 9 lines · akuster
From: Joshua Watt <[email protected]>
Adds variables that can be used to allow a recipe to pass extra arguments to
waf buildandwaf install. In most cases, you want to pass the same arguments tobuildandinstall(since install is a superset ofbuild), so by default settingEXTRA_OEWAF_BUILDalso affectswaf install, but this can be overridded.Hi Armin,
Have no problem with this - most of my layers are compatible from dunfell up to master but from meta-musicians (musicians seem to like waf) I know that this can cause breakages for packages shipping (very) old waf. Nothing unsolvable but...
Just out of my curiosity: Why add this patch to dunfell? CheersAndreas
PATCH 2/2 waf: don't assume the waf intepretter is good
In reply to akusterFrom: Ross Burton <[email protected]>
Waf typically uses python as the intepretter but inside a task this does not exist. Typically this is solved by patching waf (see the glmark2 recipe) but not all versionf of Waf support Python 3 so we can't assume a specific interpretter.
Instead, create a new variable WAF_PYTHON for the correct interpretter, and default this to python3. If the user has a recipe that needs Python 2 then this can be changed in the recipe.
(From OE-Core rev: 802e80d35e6374b9b80f89068d00b84fe2d04ca1)
[Fixes build issue on Ubuntu 20 with mvp
https://github.com/openembedded/meta-openembedded/issues/304 ]
--- meta/classes/waf.bbclass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
meta/classes/waf.bbclass +9 -4
@@ -1,6 +1,10 @@ # avoids build breaks when using no-static-libs.inc DISABLE_STATIC = "" +# What Python interpretter to use. Defaults to Python 3 but can be +# overridden if required. +WAF_PYTHON ?= "python3" + B = "${WORKDIR}/build" EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
@@ -40,9 +44,10 @@ python waf_preconfigure() { import subprocess from distutils.version import StrictVersion subsrcdir = d.getVar('S') + python = d.getVar('WAF_PYTHON') wafbin = os.path.join(subsrcdir, 'waf') try: - result = subprocess.check_output([wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT) + result = subprocess.check_output([python, wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT) version = result.decode('utf-8').split()[1] if StrictVersion(version) >= StrictVersion("1.8.7"): d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
@@ -55,16 +60,16 @@ python waf_preconfigure() { do_configure[prefuncs] += "waf_preconfigure" waf_do_configure() { - (cd ${S} && ./waf configure -o ${B} --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}) + (cd ${S} && ${WAF_PYTHON} ./waf configure -o ${B} --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}) } do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+" waf_do_compile() { - (cd ${S} && ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} ${EXTRA_OEWAF_BUILD}) + (cd ${S} && ${WAF_PYTHON} ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} ${EXTRA_OEWAF_BUILD}) } waf_do_install() { - (cd ${S} && ./waf install --destdir=${D} ${EXTRA_OEWAF_INSTALL}) + (cd ${S} && ${WAF_PYTHON} ./waf install --destdir=${D} ${EXTRA_OEWAF_INSTALL}) } EXPORT_FUNCTIONS do_configure do_compile do_install
Signature · 1 line
2.17.1