summaryrefslogtreecommitdiffstats
path: root/scripts/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-xscripts/contrib/bbvars.py10
-rwxr-xr-xscripts/contrib/list-packageconfig-flags.py4
-rwxr-xr-xscripts/contrib/python/generate-manifest-2.7.py4
-rwxr-xr-xscripts/contrib/python/generate-manifest-3.5.py4
4 files changed, 11 insertions, 11 deletions
diff --git a/scripts/contrib/bbvars.py b/scripts/contrib/bbvars.py
index 04f5023969..6f479355eb 100755
--- a/scripts/contrib/bbvars.py
+++ b/scripts/contrib/bbvars.py
@@ -59,8 +59,8 @@ def collect_bbvars(metadir):
59 for root,dirs,files in os.walk(metadir): 59 for root,dirs,files in os.walk(metadir):
60 for name in files: 60 for name in files:
61 if name.find(".bb") >= 0: 61 if name.find(".bb") >= 0:
62 for key in recipe_bbvars(os.path.join(root,name)).iterkeys(): 62 for key in recipe_bbvars(os.path.join(root,name)).keys():
63 if bbvars.has_key(key): 63 if key in bbvars:
64 bbvars[key] = bbvars[key] + 1 64 bbvars[key] = bbvars[key] + 1
65 else: 65 else:
66 bbvars[key] = 1 66 bbvars[key] = 1
@@ -155,15 +155,15 @@ def main():
155 155
156 # Collect all the variable names from the recipes in the metadirs 156 # Collect all the variable names from the recipes in the metadirs
157 for m in metadirs: 157 for m in metadirs:
158 for key,cnt in collect_bbvars(m).iteritems(): 158 for key,cnt in collect_bbvars(m).items():
159 if bbvars.has_key(key): 159 if key in bbvars:
160 bbvars[key] = bbvars[key] + cnt 160 bbvars[key] = bbvars[key] + cnt
161 else: 161 else:
162 bbvars[key] = cnt 162 bbvars[key] = cnt
163 163
164 # Check each var for documentation 164 # Check each var for documentation
165 varlen = 0 165 varlen = 0
166 for v in bbvars.iterkeys(): 166 for v in bbvars.keys():
167 if len(v) > varlen: 167 if len(v) > varlen:
168 varlen = len(v) 168 varlen = len(v)
169 if not bbvar_is_documented(v, docfiles): 169 if not bbvar_is_documented(v, docfiles):
diff --git a/scripts/contrib/list-packageconfig-flags.py b/scripts/contrib/list-packageconfig-flags.py
index 5dfe796c0a..22d0c4904d 100755
--- a/scripts/contrib/list-packageconfig-flags.py
+++ b/scripts/contrib/list-packageconfig-flags.py
@@ -86,7 +86,7 @@ def collect_flags(pkg_dict):
86 ''' Collect available PACKAGECONFIG flags and all affected pkgs ''' 86 ''' Collect available PACKAGECONFIG flags and all affected pkgs '''
87 # flag_dict = {'flag': ['pkg1', 'pkg2',...]} 87 # flag_dict = {'flag': ['pkg1', 'pkg2',...]}
88 flag_dict = {} 88 flag_dict = {}
89 for pkgname, flaglist in pkg_dict.iteritems(): 89 for pkgname, flaglist in pkg_dict.items():
90 for flag in flaglist: 90 for flag in flaglist:
91 if flag in flag_dict: 91 if flag in flag_dict:
92 flag_dict[flag].append(pkgname) 92 flag_dict[flag].append(pkgname)
@@ -132,7 +132,7 @@ def display_all(data_dict):
132 packageconfig = 'None' 132 packageconfig = 'None'
133 print('PACKAGECONFIG %s' % packageconfig) 133 print('PACKAGECONFIG %s' % packageconfig)
134 134
135 for flag,flag_val in data_dict[fn].getVarFlags("PACKAGECONFIG").iteritems(): 135 for flag,flag_val in data_dict[fn].getVarFlags("PACKAGECONFIG").items():
136 if flag == "doc": 136 if flag == "doc":
137 continue 137 continue
138 print('PACKAGECONFIG[%s] %s' % (flag, flag_val)) 138 print('PACKAGECONFIG[%s] %s' % (flag, flag_val))
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index 48be3a6d74..f2ecf8d3f5 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -97,7 +97,7 @@ class MakefileMaker:
97 # generate package variables 97 # generate package variables
98 # 98 #
99 99
100 for name, data in sorted(self.packages.iteritems()): 100 for name, data in sorted(self.packages.items()):
101 desc, deps, files = data 101 desc, deps, files = data
102 102
103 # 103 #
@@ -130,7 +130,7 @@ class MakefileMaker:
130 self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) 130 self.out( 'SUMMARY_${PN}-modules="All Python modules"' )
131 line = 'RDEPENDS_${PN}-modules="' 131 line = 'RDEPENDS_${PN}-modules="'
132 132
133 for name, data in sorted(self.packages.iteritems()): 133 for name, data in sorted(self.packages.items()):
134 if name not in ['${PN}-dev', '${PN}-distutils-staticdev']: 134 if name not in ['${PN}-dev', '${PN}-distutils-staticdev']:
135 line += "%s " % name 135 line += "%s " % name
136 136
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index a7b38d202a..41f209b17f 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -100,7 +100,7 @@ class MakefileMaker:
100 # generate package variables 100 # generate package variables
101 # 101 #
102 102
103 for name, data in sorted(self.packages.iteritems()): 103 for name, data in sorted(self.packages.items()):
104 desc, deps, files = data 104 desc, deps, files = data
105 105
106 # 106 #
@@ -133,7 +133,7 @@ class MakefileMaker:
133 self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) 133 self.out( 'SUMMARY_${PN}-modules="All Python modules"' )
134 line = 'RDEPENDS_${PN}-modules="' 134 line = 'RDEPENDS_${PN}-modules="'
135 135
136 for name, data in sorted(self.packages.iteritems()): 136 for name, data in sorted(self.packages.items()):
137 if name not in ['${PN}-dev', '${PN}-distutils-staticdev']: 137 if name not in ['${PN}-dev', '${PN}-distutils-staticdev']:
138 line += "%s " % name 138 line += "%s " % name
139 139