graph-depends: allow to exclude host packages

The condition to determine if a virtual package should be excluded from the list due to "virtual" being passed in --exclude is under a loop iterating over each entry of the exclude_list, but it doesn't use the iterator of this list.

Indeed, the condition contains:

"virtual" in exclude_list

which checks automatically if "virtual" was passed in the list. Due to this, there is no need for this check to be within the "for p in exclude_list" iteration. This commit fixes that by moving the check outside of the loop.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 support/scripts/graph-depends | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

support/scripts/graph-depends +3 -4

index fd8ad2f..cfb4f82 100755
@@ -359,15 +359,14 @@ def print_pkg_deps(depth, pkg):
         return
     if max_depth == 0 or depth < max_depth:
         for d in dict_deps[pkg]:
+            if dict_version.get(d) == "virtual" \
+               and "virtual" in exclude_list:
+                continue
             add = True
             for p in exclude_list:
                 if fnmatch(d,p):
                     add = False
                     break
-                if dict_version.get(d) == "virtual" \
-                and "virtual" in exclude_list:
-                    add = False
-                    break
             if add:
                 print("%s -> %s" % (pkg_node_name(pkg), pkg_node_name(d)))
                 print_pkg_deps(depth+1, d)

Signature · 6 lines

2.6.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Just like the --stop-on and --exclude options allow to stop on or exclude virtual packages from the list by passing the "virtual" magic value, this commit extends the graph-depends logic to support a "host" magic value for --stop-on and --exclude. This will allow to draw the graph by stopping on host packages, or by excluding host packages.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 support/scripts/graph-depends | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

support/scripts/graph-depends +3 -2

index cfb4f82..e4a230f 100755
@@ -44,8 +44,9 @@ parser.add_argument("--depth", '-d', metavar="DEPTH", dest="depth", type=int, de
                     help="Limit the dependency graph to DEPTH levels; 0 means no limit.")
 parser.add_argument("--stop-on", "-s", metavar="PACKAGE", dest="stop_list", action="append",
                     help="Do not graph past this package (can be given multiple times)." \
-                       + " Can be a package name or a glob, or" \
-                       + " 'virtual' to stop on virtual packages.")
+                       + " Can be a package name or a glob, " \
+                       + " 'virtual' to stop on virtual packages, or " \
+                       + "'host' to stop on host packages.")
 parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append",
                     help="Like --stop-on, but do not add PACKAGE to the graph.")
 parser.add_argument("--colours", "-c", metavar="COLOR_LIST", dest="colours",

@@ -357,11 +358,15 @@ def print_pkg_deps(depth, pkg):
             return

support/scripts/graph-depends +1 -0

+                continue
             add = True
             for p in exclude_list:
                 if fnmatch(d,p):

Signature · 6 lines

2.6.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

support/scripts/graph-depends def print_pkg_deps(depth, pkg): · line 368

Quoted 8 lines

support/scripts/graph-depends +3 -0

+    if pkg.startswith("host-") and "host" in stop_list:
+        return
     if max_depth == 0 or depth < max_depth:
         for d in dict_deps[pkg]:
             if dict_version.get(d) == "virtual" \
                and "virtual" in exclude_list:
                 continue
+            if d.startswith("host-") and "host" in exclude_list:

Can we make that line look like the corresponding line for the virtual packages, two-and-three lines above?

This commit updates the graph-depends documentation to take into account the new 'host' keyword that can be passed to the --stop-on and --exclude options.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 docs/manual/common-usage.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

docs/manual/common-usage.txt +4 -3

index bca99f4..01cd31e 100644
@@ -212,9 +212,10 @@ The +graph-depends+ behaviour can be controlled by setting options in the
   default, +0+, means no limit.
 
 * +--stop-on PKG+, +-s PKG+, to stop the graph on the package +PKG+.
-  +PKG+ can be an actual package name, a glob, or the keyword 'virtual'
-  (to stop on virtual packages). The package is still present on the
-  graph, but its dependencies are not.
+  +PKG+ can be an actual package name, a glob, the keyword 'virtual'
+  (to stop on virtual packages), or the keyword 'host' (to stop on
+  host packages). The package is still present on the graph, but its
+  dependencies are not.
 
 * +--exclude PKG+, +-x PKG+, like +--stop-on+, but also omits +PKG+ from
   the graph.

Signature · 6 lines

2.6.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Here is a v2 of the small patch series that allows to exclude host packages. It fixes a major bug in the previous implementation, which was stopping drawing the list of dependencies as soon as one host package was encountered, rather than just skipping that one package.

This new implementation hopefully fixes that problem.

Thanks,

Thomas

Thomas Petazzoni (3):
graph-depends: fix handling of "virtual" in exclude_list
graph-depends: add support for excluding host packages docs/manual: update graph-depends documentation about --stop-on