diff options
author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2017-02-26 08:39:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 23:27:10 +0000 |
commit | e720e3b4af036f0867f7616470013c714cad38e1 (patch) | |
tree | 68bfae0145548da12832d381f0e3b36ce4c87104 /scripts | |
parent | 8d8d0a52d5f00a1703de65e1fb60f3771a0fbf33 (diff) | |
download | poky-e720e3b4af036f0867f7616470013c714cad38e1.tar.gz |
generate-manifest-2.7.py: add logic to generate native manifest
python-native supposes to RPROVIDE all native packages as added in
generate-manifest-2.7.py, but it does not so far, this leads a problem
that sometimes bitbake cant find a runtime provider for a python-*-native
when a new runtime dependency on it being required, this usualy happens
after a new native python-* recipe is created or the old native python-*
recipes are upgraded.
To give a example, the following commit is trying to address such a issue:
commit 4583cd1bb15306e8f0ab7bcd80732e6f35aa4533:
[ python-native: Make python-native also RPROVIDE python-unittest-native ]
To avoid manually extending RPROVIDE every time when a new runtime
dependency is introduced, an argument '-n/--native' is added to the
manifest generator, allowing it create a native python manifest, with a
RPROVIDE line only, the RPROVIDE should contain all the sub-packages.
The generated python-native-2.7-manifest.inc is also added which is
included by python-native recipe.
(From OE-Core rev: 0cb15d9559e34faffea1ac0be825d0602f225ba9)
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/contrib/python/generate-manifest-2.7.py | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py index f2ecf8d3f5..6f7a4c39e0 100755 --- a/scripts/contrib/python/generate-manifest-2.7.py +++ b/scripts/contrib/python/generate-manifest-2.7.py | |||
@@ -9,10 +9,14 @@ | |||
9 | # * Updated to no longer generate special -dbg package, instead use the | 9 | # * Updated to no longer generate special -dbg package, instead use the |
10 | # single system -dbg | 10 | # single system -dbg |
11 | # * Update version with ".1" to indicate this change | 11 | # * Update version with ".1" to indicate this change |
12 | # | ||
13 | # February 26, 2017 -- Ming Liu <peter.x.liu@external.atlascopco.com> | ||
14 | # * Updated to support generating manifest for native python | ||
12 | 15 | ||
13 | import os | 16 | import os |
14 | import sys | 17 | import sys |
15 | import time | 18 | import time |
19 | import argparse | ||
16 | 20 | ||
17 | VERSION = "2.7.2" | 21 | VERSION = "2.7.2" |
18 | 22 | ||
@@ -21,16 +25,17 @@ __version__ = "20110222.2" | |||
21 | 25 | ||
22 | class MakefileMaker: | 26 | class MakefileMaker: |
23 | 27 | ||
24 | def __init__( self, outfile ): | 28 | def __init__( self, outfile, isNative ): |
25 | """initialize""" | 29 | """initialize""" |
26 | self.packages = {} | 30 | self.packages = {} |
27 | self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] | 31 | self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] |
32 | self.isNative = isNative | ||
28 | self.output = outfile | 33 | self.output = outfile |
29 | self.out( """ | 34 | self.out( """ |
30 | # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. | 35 | # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. |
31 | # Generator: '%s' Version %s (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de> | 36 | # Generator: '%s%s' Version %s (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de> |
32 | # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy | 37 | # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy |
33 | """ % ( sys.argv[0], __version__ ) ) | 38 | """ % ( sys.argv[0], ' --native' if isNative else '', __version__ ) ) |
34 | 39 | ||
35 | # | 40 | # |
36 | # helper functions | 41 | # helper functions |
@@ -66,6 +71,20 @@ class MakefileMaker: | |||
66 | global VERSION | 71 | global VERSION |
67 | 72 | ||
68 | # | 73 | # |
74 | # generate rprovides line for native | ||
75 | # | ||
76 | |||
77 | if self.isNative: | ||
78 | rprovideLine = 'RPROVIDES+="' | ||
79 | for name in sorted(self.packages): | ||
80 | rprovideLine += "%s-native " % name.replace( '${PN}', 'python' ) | ||
81 | rprovideLine += '"' | ||
82 | |||
83 | self.out( rprovideLine ) | ||
84 | self.out( "" ) | ||
85 | return | ||
86 | |||
87 | # | ||
69 | # generate provides line | 88 | # generate provides line |
70 | # | 89 | # |
71 | 90 | ||
@@ -147,17 +166,21 @@ class MakefileMaker: | |||
147 | self.doEpilog() | 166 | self.doEpilog() |
148 | 167 | ||
149 | if __name__ == "__main__": | 168 | if __name__ == "__main__": |
169 | parser = argparse.ArgumentParser( description='generate python manifest' ) | ||
170 | parser.add_argument( '-n', '--native', help='generate manifest for native python', action='store_true' ) | ||
171 | parser.add_argument( 'outfile', metavar='OUTPUT_FILE', nargs='?', default='', help='Output file (defaults to stdout)' ) | ||
172 | args = parser.parse_args() | ||
150 | 173 | ||
151 | if len( sys.argv ) > 1: | 174 | if args.outfile: |
152 | try: | 175 | try: |
153 | os.unlink(sys.argv[1]) | 176 | os.unlink( args.outfile ) |
154 | except Exception: | 177 | except Exception: |
155 | sys.exc_clear() | 178 | sys.exc_clear() |
156 | outfile = open( sys.argv[1], "w" ) | 179 | outfile = open( args.outfile, "w" ) |
157 | else: | 180 | else: |
158 | outfile = sys.stdout | 181 | outfile = sys.stdout |
159 | 182 | ||
160 | m = MakefileMaker( outfile ) | 183 | m = MakefileMaker( outfile, args.native ) |
161 | 184 | ||
162 | # Add packages here. Only specify dlopen-style library dependencies here, no ldd-style dependencies! | 185 | # Add packages here. Only specify dlopen-style library dependencies here, no ldd-style dependencies! |
163 | # Parameters: revision, name, description, dependencies, filenames | 186 | # Parameters: revision, name, description, dependencies, filenames |