[oe-commits] Joshua Lock : distutils-common-base: add to, don't set, FILES_${PN}

git at git.openembedded.org git at git.openembedded.org
Tue Jun 23 10:55:17 UTC 2015


Module: openembedded-core.git
Branch: master
Commit: f6478e8c73f9cfb79d1f7680b7bf3ff957eb51cb
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f6478e8c73f9cfb79d1f7680b7bf3ff957eb51cb

Author: Joshua Lock <joshua.lock at collabora.co.uk>
Date:   Wed Jun 17 09:33:18 2015 +0100

distutils-common-base: add to, don't set, FILES_${PN}

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}

Signed-off-by: Joshua Lock <joshua.lock at collabora.co.uk>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/distutils-common-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/distutils-common-base.bbclass b/meta/classes/distutils-common-base.bbclass
index 9a608eb..427275b 100644
--- a/meta/classes/distutils-common-base.bbclass
+++ b/meta/classes/distutils-common-base.bbclass
@@ -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 \



More information about the Openembedded-commits mailing list