diff options
author | Joshua Lock <joshua.lock@collabora.co.uk> | 2015-06-17 09:33:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:17 +0100 |
commit | aa88803046e7b926cbb903d700e1aa27cc3cba5d (patch) | |
tree | 3836b8fd2aea3cd77090d81a2a8b738b9eba4b0b | |
parent | 903cf70f3aa616a0ec1fa1d5b7f745c2e438014e (diff) | |
download | poky-aa88803046e7b926cbb903d700e1aa27cc3cba5d.tar.gz |
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}
(From OE-Core rev: f6478e8c73f9cfb79d1f7680b7bf3ff957eb51cb)
(From OE-Core rev: 3e5ecb970eec3ba3199d2fc2a336d310f072594c)
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>
-rw-r--r-- | meta/classes/distutils-common-base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/distutils-common-base.bbclass b/meta/classes/distutils-common-base.bbclass index 9a608eb63e..427275b406 100644 --- a/meta/classes/distutils-common-base.bbclass +++ b/meta/classes/distutils-common-base.bbclass | |||
@@ -7,7 +7,7 @@ export STAGING_LIBDIR | |||
7 | 7 | ||
8 | PACKAGES = "${PN}-staticdev ${PN}-dev ${PN}-dbg ${PN}-doc ${PN}" | 8 | PACKAGES = "${PN}-staticdev ${PN}-dev ${PN}-dbg ${PN}-doc ${PN}" |
9 | 9 | ||
10 | FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" | 10 | FILES_${PN} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*" |
11 | 11 | ||
12 | FILES_${PN}-staticdev += "\ | 12 | FILES_${PN}-staticdev += "\ |
13 | ${PYTHON_SITEPACKAGES_DIR}/*.a \ | 13 | ${PYTHON_SITEPACKAGES_DIR}/*.a \ |