diff options
-rw-r--r-- | meta/classes/insane.bbclass | 13 | ||||
-rw-r--r-- | meta/classes/utils.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 2 |
3 files changed, 17 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 () { | |||
1047 | # Check various variables | 1047 | # Check various variables |
1048 | ########################################################################### | 1048 | ########################################################################### |
1049 | 1049 | ||
1050 | # Checking ${FILESEXTRAPATHS} | ||
1051 | extrapaths = (d.getVar("FILESEXTRAPATHS", True) or "") | ||
1052 | if '__default' not in extrapaths.split(":"): | ||
1053 | msg = "FILESEXTRAPATHS-variable, must always use _prepend (or _append)\n" | ||
1054 | msg += "type of assignment, and don't forget the colon.\n" | ||
1055 | msg += "Please assign it with the format of:\n" | ||
1056 | msg += " FILESEXTRAPATHS_append := \":${THISDIR}/Your_Files_Path\" or\n" | ||
1057 | msg += " FILESEXTRAPATHS_prepend := \"${THISDIR}/Your_Files_Path:\"\n" | ||
1058 | msg += "in your bbappend file\n\n" | ||
1059 | msg += "Your incorrect assignment is:\n" | ||
1060 | msg += "%s\n" % extrapaths | ||
1061 | bb.fatal(msg) | ||
1062 | |||
1050 | if d.getVar('do_stage', True) is not None: | 1063 | if d.getVar('do_stage', True) is not None: |
1051 | 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)) | 1064 | 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)) |
1052 | 1065 | ||
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): | |||
312 | def base_set_filespath(path, d): | 312 | def base_set_filespath(path, d): |
313 | filespath = [] | 313 | filespath = [] |
314 | extrapaths = (d.getVar("FILESEXTRAPATHS", True) or "") | 314 | extrapaths = (d.getVar("FILESEXTRAPATHS", True) or "") |
315 | # Remove default flag which was used for checking | ||
316 | extrapaths = extrapaths.replace("__default:", "") | ||
315 | # Don't prepend empty strings to the path list | 317 | # Don't prepend empty strings to the path list |
316 | if extrapaths != "": | 318 | if extrapaths != "": |
317 | path = extrapaths.split(":") + path | 319 | path = extrapaths.split(":") + path |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 135461518c..5872d1d12c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -311,6 +311,8 @@ FILES_${PN}-locale = "${datadir}/locale" | |||
311 | FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}" | 311 | FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}" |
312 | # FILESPATH is set in base.bbclass | 312 | # FILESPATH is set in base.bbclass |
313 | #FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" | 313 | #FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" |
314 | # This default was only used for checking | ||
315 | FILESEXTRAPATHS ?= "__default:" | ||
314 | 316 | ||
315 | ################################################################## | 317 | ################################################################## |
316 | # General work and output directories for the build system. | 318 | # General work and output directories for the build system. |