summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/contrib/devtool-stress.py6
-rwxr-xr-xscripts/contrib/list-packageconfig-flags.py7
-rwxr-xr-xscripts/contrib/verify-homepage.py6
3 files changed, 9 insertions, 10 deletions
diff --git a/scripts/contrib/devtool-stress.py b/scripts/contrib/devtool-stress.py
index 7ba0984238..d555c51a65 100755
--- a/scripts/contrib/devtool-stress.py
+++ b/scripts/contrib/devtool-stress.py
@@ -43,15 +43,15 @@ def select_recipes(args):
43 tinfoil = bb.tinfoil.Tinfoil() 43 tinfoil = bb.tinfoil.Tinfoil()
44 tinfoil.prepare(False) 44 tinfoil.prepare(False)
45 45
46 pkg_pn = tinfoil.cooker.recipecache.pkg_pn 46 pkg_pn = tinfoil.cooker.recipecaches[''].pkg_pn
47 (latest_versions, preferred_versions) = bb.providers.findProviders(tinfoil.config_data, tinfoil.cooker.recipecache, pkg_pn) 47 (latest_versions, preferred_versions) = bb.providers.findProviders(tinfoil.config_data, tinfoil.cooker.recipecaches[''], pkg_pn)
48 48
49 skip_classes = args.skip_classes.split(',') 49 skip_classes = args.skip_classes.split(',')
50 50
51 recipelist = [] 51 recipelist = []
52 for pn in sorted(pkg_pn): 52 for pn in sorted(pkg_pn):
53 pref = preferred_versions[pn] 53 pref = preferred_versions[pn]
54 inherits = [os.path.splitext(os.path.basename(f))[0] for f in tinfoil.cooker.recipecache.inherits[pref[1]]] 54 inherits = [os.path.splitext(os.path.basename(f))[0] for f in tinfoil.cooker.recipecaches[''].inherits[pref[1]]]
55 for cls in skip_classes: 55 for cls in skip_classes:
56 if cls in inherits: 56 if cls in inherits:
57 break 57 break
diff --git a/scripts/contrib/list-packageconfig-flags.py b/scripts/contrib/list-packageconfig-flags.py
index b8327e4ebc..9090935e0f 100755
--- a/scripts/contrib/list-packageconfig-flags.py
+++ b/scripts/contrib/list-packageconfig-flags.py
@@ -37,7 +37,6 @@ if not bitbakepath:
37 sys.stderr.write("Unable to find bitbake by searching parent directory of this script or PATH\n") 37 sys.stderr.write("Unable to find bitbake by searching parent directory of this script or PATH\n")
38 sys.exit(1) 38 sys.exit(1)
39 39
40import bb.cache
41import bb.cooker 40import bb.cooker
42import bb.providers 41import bb.providers
43import bb.tinfoil 42import bb.tinfoil
@@ -45,7 +44,7 @@ import bb.tinfoil
45def get_fnlist(bbhandler, pkg_pn, preferred): 44def get_fnlist(bbhandler, pkg_pn, preferred):
46 ''' Get all recipe file names ''' 45 ''' Get all recipe file names '''
47 if preferred: 46 if preferred:
48 (latest_versions, preferred_versions) = bb.providers.findProviders(bbhandler.config_data, bbhandler.cooker.recipecache, pkg_pn) 47 (latest_versions, preferred_versions) = bb.providers.findProviders(bbhandler.config_data, bbhandler.cooker.recipecaches[''], pkg_pn)
49 48
50 fn_list = [] 49 fn_list = []
51 for pn in sorted(pkg_pn): 50 for pn in sorted(pkg_pn):
@@ -58,11 +57,11 @@ def get_fnlist(bbhandler, pkg_pn, preferred):
58 57
59def get_recipesdata(bbhandler, preferred): 58def get_recipesdata(bbhandler, preferred):
60 ''' Get data of all available recipes which have PACKAGECONFIG flags ''' 59 ''' Get data of all available recipes which have PACKAGECONFIG flags '''
61 pkg_pn = bbhandler.cooker.recipecache.pkg_pn 60 pkg_pn = bbhandler.cooker.recipecaches[''].pkg_pn
62 61
63 data_dict = {} 62 data_dict = {}
64 for fn in get_fnlist(bbhandler, pkg_pn, preferred): 63 for fn in get_fnlist(bbhandler, pkg_pn, preferred):
65 data = bb.cache.Cache.loadDataFull(fn, bbhandler.cooker.collection.get_file_appends(fn), bbhandler.config_data) 64 data = bbhandler.parse_recipe_file(fn)
66 flags = data.getVarFlags("PACKAGECONFIG") 65 flags = data.getVarFlags("PACKAGECONFIG")
67 flags.pop('doc', None) 66 flags.pop('doc', None)
68 if flags: 67 if flags:
diff --git a/scripts/contrib/verify-homepage.py b/scripts/contrib/verify-homepage.py
index 61a047c40b..0b1450a018 100755
--- a/scripts/contrib/verify-homepage.py
+++ b/scripts/contrib/verify-homepage.py
@@ -33,17 +33,17 @@ def wgetHomepage(pn, homepage):
33 return 0 33 return 0
34 34
35def verifyHomepage(bbhandler): 35def verifyHomepage(bbhandler):
36 pkg_pn = bbhandler.cooker.recipecache.pkg_pn 36 pkg_pn = bbhandler.cooker.recipecaches[''].pkg_pn
37 pnlist = sorted(pkg_pn) 37 pnlist = sorted(pkg_pn)
38 count = 0 38 count = 0
39 checked = [] 39 checked = []
40 for pn in pnlist: 40 for pn in pnlist:
41 for fn in pkg_pn[pn]: 41 for fn in pkg_pn[pn]:
42 # There's no point checking multiple BBCLASSEXTENDed variants of the same recipe 42 # There's no point checking multiple BBCLASSEXTENDed variants of the same recipe
43 realfn, _ = bb.cache.Cache.virtualfn2realfn(fn) 43 realfn, _, _ = bb.cache.virtualfn2realfn(fn)
44 if realfn in checked: 44 if realfn in checked:
45 continue 45 continue
46 data = bb.cache.Cache.loadDataFull(realfn, bbhandler.cooker.collection.get_file_appends(realfn), bbhandler.config_data) 46 data = bbhandler.parse_recipe_file(realfn)
47 homepage = data.getVar("HOMEPAGE", True) 47 homepage = data.getVar("HOMEPAGE", True)
48 if homepage: 48 if homepage:
49 try: 49 try: