Skip to contentSkip to conversation

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

PATCH New Joshua Lock 1 participant 2 messages Jun 17, 2015

lore
Share & tools
lore
#0 lore raw

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

A recipe I was working on which indirectly inherited both distutils-common-base and gtk-icon-cache was reporting installed but not shipped errors for icons in the path gtk-icon-cache explicitly adds to FILES_${PN}.

This turns out to be because distutils-common-base sets (=) rather than appends (+= or _append) FILES_${PN} and gtk-icon-cache was ahead of distutils-common-base in the inherit order.

The proposed fix here, appending rather then settings FILES_${PN}, works for the recipe I am working on and doesn't introduce errors for any recipe in meta/recipes-devtools/python.

Cheers,

Joshua

The following changes since commit 45b368427accf6d519078812d5335ec250bacef8:

packagedata: Fix to ensure variables expand correctly (2015-06-16 14:20:17 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib joshuagl/distutils
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/distutils

Joshua Lock (1):
distutils-common-base: add to, don't set, FILES_${PN}

 meta/classes/distutils-common-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 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}

---
 meta/classes/distutils-common-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/distutils-common-base.bbclass +1 -1
index 9a608eb..427275b 100644
@@ -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 \
Signature · 1 line
2.1.0