]> code.ossystems Code Review - openembedded-core.git/commitdiff
distutils-common-base: add to, don't set, FILES_${PN}
authorJoshua Lock <joshua.lock@collabora.co.uk>
Wed, 17 Jun 2015 08:33:18 +0000 (09:33 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 28 Jun 2015 08:42:02 +0000 (09:42 +0100)
If we set FILES_${PN} and a recipe inherits other classes that
modify FILES_${PN} *before* distutils-common-base is included, any
changes to FILES_${PN} made by those classes are lost.

Instead, append the additional directories we want to include in
FILES_${PN}

(From OE-Core rev: f6478e8c73f9cfb79d1f7680b7bf3ff957eb51cb)

Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/distutils-common-base.bbclass

index 9a608eb63ecedae10a70692d5fd67dde7cf6cdbf..427275b40601ebd77435c09c4a2babdeebfcf231 100644 (file)
@@ -7,7 +7,7 @@ export STAGING_LIBDIR
 
 PACKAGES = "${PN}-staticdev ${PN}-dev ${PN}-dbg ${PN}-doc ${PN}"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
+FILES_${PN} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*"
 
 FILES_${PN}-staticdev += "\
   ${PYTHON_SITEPACKAGES_DIR}/*.a \