path: root/support
diff options
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-02 10:04:34 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-06 22:16:37 +0100
commit659d45adc4cdc12cd1ac8dd31fb1e24508841828 (patch)
tree3cafc8437d4eeda9bba301c9c5337789beea3cd2 /support
parent7ee54bd603bb185f06c2523df2cb911311ea8f38 (diff)
support/scripts/graph-depends: use proper rootpkg in remove_extra_deps()
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>
Diffstat (limited to 'support')
1 files changed, 4 insertions, 4 deletions
diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 3526a51662..f1b6b142fb 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -205,12 +205,12 @@ def check_circular_deps(deps):
# This functions trims down the dependency list of all packages.
# 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()):
- if not pkg == 'all':
+ if not pkg == rootpkg:
deps[pkg] = remove_mandatory_deps(pkg, deps)
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)
return deps
@@ -401,7 +401,7 @@ def main():
if check_only:
- 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
if pkg != "all" and not pkg.startswith("root")])