summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-04-17 16:43:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-19 13:34:42 +0100
commit9fc558721b2a9b662afe8423350523327994f75f (patch)
tree1905c0c72661f72b7913eb4c5377f7bab754a6f0 /meta
parenta23c938f2c06d4167565c297ab1da4ba6bf914e4 (diff)
downloadpoky-9fc558721b2a9b662afe8423350523327994f75f.tar.gz
classes/package: clarify installed-vs-shipped message
Based on the number of times I've had to explain it over the years it seems that a lot of new users don't immediately realise what is meant by "shipped" here (nor should we expect them to) so let's at least mention packaging and briefly tell the user what they need to do. (I was going to go into more detail in the message, but there is really more detail than can be covered succinctly here.) (From OE-Core rev: 7047d02619547401c313de8c6972a7a0af77e2bc) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 5558d0d100..f1b966ddb9 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1132,12 +1132,13 @@ python populate_packages () {
1132 unshipped.append(path) 1132 unshipped.append(path)
1133 1133
1134 if unshipped != []: 1134 if unshipped != []:
1135 msg = pn + ": Files/directories were installed but not shipped" 1135 msg = pn + ": Files/directories were installed but not shipped in any package:"
1136 if "installed-vs-shipped" in (d.getVar('INSANE_SKIP_' + pn, True) or "").split(): 1136 if "installed-vs-shipped" in (d.getVar('INSANE_SKIP_' + pn, True) or "").split():
1137 bb.note("Package %s skipping QA tests: installed-vs-shipped" % pn) 1137 bb.note("Package %s skipping QA tests: installed-vs-shipped" % pn)
1138 else: 1138 else:
1139 for f in unshipped: 1139 for f in unshipped:
1140 msg = msg + "\n " + f 1140 msg = msg + "\n " + f
1141 msg = msg + "\nPlease set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install."
1141 package_qa_handle_error("installed-vs-shipped", msg, d) 1142 package_qa_handle_error("installed-vs-shipped", msg, d)
1142} 1143}
1143populate_packages[dirs] = "${D}" 1144populate_packages[dirs] = "${D}"