diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/insane.bbclass | 13 | ||||
| -rw-r--r-- | meta/classes/utils.bbclass | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 53942365ab..09d9fc1508 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1047,6 +1047,19 @@ python () { # Check various variables ########################################################################### + # Checking ${FILESEXTRAPATHS} + extrapaths = (d.getVar("FILESEXTRAPATHS", True) or "") + if '__default' not in extrapaths.split(":"): + msg = "FILESEXTRAPATHS-variable, must always use _prepend (or _append)\n" + msg += "type of assignment, and don't forget the colon.\n" + msg += "Please assign it with the format of:\n" + msg += " FILESEXTRAPATHS_append := \":${THISDIR}/Your_Files_Path\" or\n" + msg += " FILESEXTRAPATHS_prepend := \"${THISDIR}/Your_Files_Path:\"\n" + msg += "in your bbappend file\n\n" + msg += "Your incorrect assignment is:\n" + msg += "%s\n" % extrapaths + bb.fatal(msg) + if d.getVar('do_stage', True) is not None: bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with OE-core" % d.getVar("FILE", True)) diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 0ee13e04d7..0f2a484091 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -312,6 +312,8 @@ def explode_deps(s): def base_set_filespath(path, d): filespath = [] extrapaths = (d.getVar("FILESEXTRAPATHS", True) or "") + # Remove default flag which was used for checking + extrapaths = extrapaths.replace("__default:", "") # Don't prepend empty strings to the path list if extrapaths != "": path = extrapaths.split(":") + path |