Present the manifest file that contains the matches for
files being installed to a location that already contains
that file. This will help to determine which is the correct
recipe to fix when this occurs.
[YOCTO #3191]
Signed-off-by: Saul Wold <s...@linux.intel.com>
---
meta/classes/sstate.bbclass | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index d2a120b..140dd59 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -27,7 +27,7 @@ SSTATE_DUPWHITELIST +=
"${STAGING_LIBDIR_NATIVE}/${MULTIMACH_TARGET_SYS} ${STAGI
# Also avoid python issues until we fix the python recipe
SSTATE_DUPWHITELIST += "${STAGING_LIBDIR}/python2.7/config/Makefile
${STAGING_LIBDIR}/libpython2.7 ${STAGING_INCDIR}/python2.7/pyconfig.h"
# Avoid docbook/sgml catalog warnings for now
-SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml
${STAGING_DATADIR_NATIVE}/sgml"
+#SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml
${STAGING_DATADIR_NATIVE}/sgml"
SSTATE_SCAN_FILES ?= "*.la *-config *_config"
SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name
\"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f'
@@ -120,6 +120,7 @@ def sstate_add(ss, source, dest, d):
def sstate_install(ss, d):
import oe.path
+ import subprocess
sharedfiles = []
shareddirs = []
@@ -164,8 +165,12 @@ def sstate_install(ss, d):
break
if realmatch:
match.append(f)
+ sstate_search_cmd = "grep -rl %s %s | sed -e 's:^.*/::' -e
's:\.populate-sysroot::'" % (f, d.expand("${SSTATE_MANIFESTS}"))
+ search_output = subprocess.check_output(sstate_search_cmd,
stderr=subprocess.STDOUT, shell=True)
+ if search_output != None:
+ match.append("Matched in %s" % search_output.rstrip())
if match:
- bb.warn("The recipe %s is trying to install files into a shared area
when those files already exist. Those files are:\n %s" % (d.getVar("PN",
True), "\n ".join(match)))
+ bb.warn("The recipe %s is trying to install files into a shared area
when those files already exist. Those files and their manifest location are:\n
%s\nPlease verify which package should provide the above files." %
(d.getVar('PN', True), "\n ".join(match)))
# Write out the manifest
f = open(manifest, "w")
--
1.7.9.5
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
