summaryrefslogtreecommitdiffstats
path: root/scripts/contrib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:02:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:03:13 +0000
commit5494bfca38c8cf15ffb1cf68c3b61082eca56aae (patch)
tree0250ec7d96d1cb0eff5d5a2f0d811ba4bb2bd495 /scripts/contrib
parent361d3b971a78f760c74f8d1189b29b68dc90fa8f (diff)
downloadpoky-5494bfca38c8cf15ffb1cf68c3b61082eca56aae.tar.gz
scripts/contrib/python/generate-manifest-2.7.py: Catch up with staticdev fixes
(From OE-Core rev: 0030644f4890ca25894916189470317650ec8246) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-xscripts/contrib/python/generate-manifest-2.7.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index e0171f9e3e..85ca353285 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -83,7 +83,10 @@ class MakefileMaker:
83 83
84 packageLine = 'PACKAGES="${PN}-dbg ' 84 packageLine = 'PACKAGES="${PN}-dbg '
85 for name in sorted(self.packages): 85 for name in sorted(self.packages):
86 if name != '${PN}-dbg': 86 if name.startswith("${PN}-distutils"):
87 if name == "${PN}-distutils":
88 packageLine += "%s-staticdev %s " % (name, name)
89 elif name != '${PN}-dbg':
87 packageLine += "%s " % name 90 packageLine += "%s " % name
88 packageLine += '${PN}-modules"' 91 packageLine += '${PN}-modules"'
89 92
@@ -128,7 +131,7 @@ class MakefileMaker:
128 line = 'RDEPENDS_${PN}-modules="' 131 line = 'RDEPENDS_${PN}-modules="'
129 132
130 for name, data in sorted(self.packages.iteritems()): 133 for name, data in sorted(self.packages.iteritems()):
131 if name not in ['${PN}-dev']: 134 if name not in ['${PN}-dev', '${PN}-distutils-staticdev']:
132 line += "%s " % name 135 line += "%s " % name
133 136
134 self.out( "%s \"" % line ) 137 self.out( "%s \"" % line )
@@ -235,6 +238,9 @@ if __name__ == "__main__":
235 m.addPackage( "${PN}-difflib", "Python helpers for computing deltas between objects.", "${PN}-lang ${PN}-re", 238 m.addPackage( "${PN}-difflib", "Python helpers for computing deltas between objects.", "${PN}-lang ${PN}-re",
236 "difflib.*" ) 239 "difflib.*" )
237 240
241 m.addPackage( "${PN}-distutils-staticdev", "Python Distribution Utilities (Static Libraries)", "${PN}-distutils",
242 "config/lib*.a" ) # package
243
238 m.addPackage( "${PN}-distutils", "Python Distribution Utilities", "${PN}-core", 244 m.addPackage( "${PN}-distutils", "Python Distribution Utilities", "${PN}-core",
239 "config distutils" ) # package 245 "config distutils" ) # package
240 246