sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

scripts/contrib: update scripts for changes to internal API 

The multiconfig changes altered some of the functions being called here,
so update the calls. Make use of the new Tinfoil.parse_recipe_file()
function to make parsing easier.

(From OE-Core rev: 95b6ceffd947271f315d8a7660797ab371adfbb9)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2016-08-31 13:48:06 +12:00 committed by Richard Purdie
parent 1100af93cb
commit 4a5aa7ea4d
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/contrib/devtool-stress.py
View File

@ -43,15 +43,15 @@ def select_recipes(args):
tinfoil = bb.tinfoil.Tinfoil() tinfoil = bb.tinfoil.Tinfoil()
tinfoil.prepare(False) tinfoil.prepare(False)
pkg_pn = tinfoil.cooker.recipecache.pkg_pn pkg_pn = tinfoil.cooker.recipecaches[''].pkg_pn
(latest_versions, preferred_versions) = bb.providers.findProviders(tinfoil.config_data, tinfoil.cooker.recipecache, pkg_pn) (latest_versions, preferred_versions) = bb.providers.findProviders(tinfoil.config_data, tinfoil.cooker.recipecaches[''], pkg_pn)
skip_classes = args.skip_classes.split(',') skip_classes = args.skip_classes.split(',')
recipelist = [] recipelist = []
for pn in sorted(pkg_pn): for pn in sorted(pkg_pn):
pref = preferred_versions[pn] pref = preferred_versions[pn]
inherits = [os.path.splitext(os.path.basename(f))[0] for f in tinfoil.cooker.recipecache.inherits[pref[1]]] inherits = [os.path.splitext(os.path.basename(f))[0] for f in tinfoil.cooker.recipecaches[''].inherits[pref[1]]]
for cls in skip_classes: for cls in skip_classes:
if cls in inherits: if cls in inherits:
break break

7
scripts/contrib/list-packageconfig-flags.py
View File

@ -37,7 +37,6 @@ if not bitbakepath:
sys.stderr.write("Unable to find bitbake by searching parent directory of this script or PATH\n") sys.stderr.write("Unable to find bitbake by searching parent directory of this script or PATH\n")
sys.exit(1) sys.exit(1)
import bb.cache
import bb.cooker import bb.cooker
import bb.providers import bb.providers
import bb.tinfoil import bb.tinfoil
@ -45,7 +44,7 @@ import bb.tinfoil
def get_fnlist(bbhandler, pkg_pn, preferred): def get_fnlist(bbhandler, pkg_pn, preferred):
''' Get all recipe file names ''' ''' Get all recipe file names '''
if preferred: if preferred:
(latest_versions, preferred_versions) = bb.providers.findProviders(bbhandler.config_data, bbhandler.cooker.recipecache, pkg_pn) (latest_versions, preferred_versions) = bb.providers.findProviders(bbhandler.config_data, bbhandler.cooker.recipecaches[''], pkg_pn)
fn_list = [] fn_list = []
for pn in sorted(pkg_pn): for pn in sorted(pkg_pn):
@ -58,11 +57,11 @@ def get_fnlist(bbhandler, pkg_pn, preferred):
def get_recipesdata(bbhandler, preferred): def get_recipesdata(bbhandler, preferred):
''' Get data of all available recipes which have PACKAGECONFIG flags ''' ''' Get data of all available recipes which have PACKAGECONFIG flags '''
pkg_pn = bbhandler.cooker.recipecache.pkg_pn pkg_pn = bbhandler.cooker.recipecaches[''].pkg_pn
data_dict = {} data_dict = {}
for fn in get_fnlist(bbhandler, pkg_pn, preferred): for fn in get_fnlist(bbhandler, pkg_pn, preferred):
data = bb.cache.Cache.loadDataFull(fn, bbhandler.cooker.collection.get_file_appends(fn), bbhandler.config_data) data = bbhandler.parse_recipe_file(fn)
flags = data.getVarFlags("PACKAGECONFIG") flags = data.getVarFlags("PACKAGECONFIG")
flags.pop('doc', None) flags.pop('doc', None)
if flags: if flags:

6
scripts/contrib/verify-homepage.py
View File

@ -33,17 +33,17 @@ def wgetHomepage(pn, homepage):
return 0 return 0
def verifyHomepage(bbhandler): def verifyHomepage(bbhandler):
pkg_pn = bbhandler.cooker.recipecache.pkg_pn pkg_pn = bbhandler.cooker.recipecaches[''].pkg_pn
pnlist = sorted(pkg_pn) pnlist = sorted(pkg_pn)
count = 0 count = 0
checked = [] checked = []
for pn in pnlist: for pn in pnlist:
for fn in pkg_pn[pn]: for fn in pkg_pn[pn]:
# There's no point checking multiple BBCLASSEXTENDed variants of the same recipe # There's no point checking multiple BBCLASSEXTENDed variants of the same recipe
realfn, _ = bb.cache.Cache.virtualfn2realfn(fn) realfn, _, _ = bb.cache.virtualfn2realfn(fn)
if realfn in checked: if realfn in checked:
continue continue
data = bb.cache.Cache.loadDataFull(realfn, bbhandler.cooker.collection.get_file_appends(realfn), bbhandler.config_data) data = bbhandler.parse_recipe_file(realfn)
homepage = data.getVar("HOMEPAGE", True) homepage = data.getVar("HOMEPAGE", True)
if homepage: if homepage:
try: try: