NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support/scripts/graph-depends: use proper rootpkg in remove_extra_deps()

Browse Source 
The remove_extra_deps() function removes dependencies that we are not
interested in seeing in the dependency graph. It does this for all
packages, except the 'all' package, which on full dependency graphs is
the root of the tree.

However, this doesn't take into account package-specific dependency
graphs (i.e make <pkg>-graph-depends) where the root is not 'all', but
'<pkg>'. Due to this, dependencies on "mandatory deps" were not
visible at all, i.e the toolchain package (and its dependencies) and
the skeleton package (and its dependencies) were not displayed in
package-specific dependency graphs.

To fix this, we use the existing rootpkg variable instead of
hardcoding 'all'.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni 2018-12-02 10:04:34 +01:00
parent 7ee54bd603
commit 659d45adc4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
support/scripts/graph-depends
View File

@ -205,12 +205,12 @@ def check_circular_deps(deps):
# This functions trims down the dependency list of all packages. # This functions trims down the dependency list of all packages.
# It applies in sequence all the dependency-elimination methods. # It applies in sequence all the dependency-elimination methods.
def remove_extra_deps(deps, transitive): def remove_extra_deps(deps, rootpkg, transitive):
for pkg in list(deps.keys()): for pkg in list(deps.keys()):
if not pkg == 'all': if not pkg == rootpkg:
deps[pkg] = remove_mandatory_deps(pkg, deps) deps[pkg] = remove_mandatory_deps(pkg, deps)
for pkg in list(deps.keys()): for pkg in list(deps.keys()):
if not transitive or pkg == 'all': if not transitive or pkg == rootpkg:
deps[pkg] = remove_transitive_deps(pkg, deps) deps[pkg] = remove_transitive_deps(pkg, deps)
return deps return deps
@ -401,7 +401,7 @@ def main():
if check_only: if check_only:
sys.exit(0) sys.exit(0)
dict_deps = remove_extra_deps(dict_deps, args.transitive) dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive)
dict_version = brpkgutil.get_version([pkg for pkg in allpkgs dict_version = brpkgutil.get_version([pkg for pkg in allpkgs
if pkg != "all" and not pkg.startswith("root")]) if pkg != "all" and not pkg.startswith("root")])