mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-09 02:03:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

python: fix parse dependencies

Browse Source 
Adding a file-checksums flag for the manifest to do_split_packages doesn't
achieve anything as do_split_packages isn't a task.  Changing this to tha task
do_package shows that the path is wrong, but we also know that as the manifest
is in SRC_URI any changes to it would result in a rebuild anyway, so this line
can be deleted.

However there is a problem of the recipe not being reparsed when it needs to be,
if the JSON has changed.  The main bitbake process can hash the recipe and use
stale data from the cache as it hasn't considered the manifest file changing.  This
results in non-determinism warnings when the worker parses the recipe again and
comes to a different hash (as the manifest has changed, so the packaging
changed).

Solve this by calling bb.parse.mark_dependency() to declare the dependency on
the manifest.

(From OE-Core rev: a321b28c8dafc9775f465ce7c0f6bcbe8ccc2945)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-01-26 10:44:35 +00:00
committed by Richard Purdie
parent 0db712bd24
commit a889ece924
2 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
meta/recipes-devtools/python/python_2.7.13.bb
View File

@@ -202,12 +202,14 @@ RPROVIDES_${PN} += "${PN}-modules"
INCLUDE_PYCS ?= "1"
python(){
pythondir = d.getVar('THISDIR',True)
# Read JSON manifest
import json
with open(pythondir+'/python/python2-manifest.json') as manifest_file:
filename = os.path.join(d.getVar('THISDIR'), 'python', 'python2-manifest.json')
# This python changes the datastore based on the contents of a file, so mark
# that dependency.
bb.parse.mark_dependency(d, filename)
with open(filename) as manifest_file:
python_manifest=json.load(manifest_file)
include_pycs = d.getVar('INCLUDE_PYCS')
@@ -215,7 +217,6 @@ python(){
packages = d.getVar('PACKAGES').split()
pn = d.getVar('PN')
newpackages=[]
for key in python_manifest:
@@ -250,25 +251,22 @@ python(){
d.setVar('ALLOW_EMPTY_${PN}-modules', '1')
}
do_split_packages[file-checksums] += "${THISDIR}/python/python2-manifest.json:True"
# Files needed to create a new manifest
SRC_URI += "file://create_manifest2.py file://get_module_deps2.py file://python2-manifest.json"
do_create_manifest() {
# This task should be run with every new release of Python.
# We must ensure that PACKAGECONFIG enables everything when creating
# a new manifest, this is to base our new manifest on a complete
# native python build, containing all dependencies, otherwise the task
# wont be able to find the required files.
# e.g. BerkeleyDB is an optional build dependency so it may or may not
# be present, we must ensure it is.
# This task should be run with every new release of Python.
# We must ensure that PACKAGECONFIG enables everything when creating
# a new manifest, this is to base our new manifest on a complete
# native python build, containing all dependencies, otherwise the task
# wont be able to find the required files.
# e.g. BerkeleyDB is an optional build dependency so it may or may not
# be present, we must ensure it is.
cd ${WORKDIR}
# This needs to be executed by python-native and NOT by HOST's python
nativepython create_manifest2.py
cp python2-manifest.json.new ${THISDIR}/python/python2-manifest.json
cd ${WORKDIR}
# This needs to be executed by python-native and NOT by HOST's python
nativepython create_manifest2.py
cp python2-manifest.json.new ${THISDIR}/python/python2-manifest.json
}
# bitbake python -c create_manifest