gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

graphs-depends: merge redundant-dependencies elimination

Browse Source 
Merge the redundant-dependencies elimination into the newly introduced
transitive-dependencies elimination.

This makes the code cleaner and much shorter, because:

  - the ('all',pkg) redundant dependency is in fact a transitive
    dependency, and we now have code to deal with that

  - the (pkg,'toolchain') dependency is easy enough to deal with that
    having a separate function for that is overkill

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Cc: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2014-06-08 16:03:47 +02:00 committed by Thomas Petazzoni
parent 67957967a5
commit 95ab905ba7
1 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
support/scripts/graph-depends
View File

@ -146,40 +146,6 @@ def get_all_depends(pkgs):
def pkg_node_name(pkg):
return pkg.replace("-","")
# Helper function for remove_redundant_deps(). This function tells
# whether package "pkg" is the dependency of another package that is
# not the special "all" package.
def has_redundant_deps(deps, pkg):
for dep in deps:
if dep[0] != "all" and dep[1] == pkg:
return True
return False
# This function removes redundant dependencies of the special "all"
# package. This "all" package is created to reflect the origin of the
# selection for all packages that are not themselves selected by any
# other package. So for example if you enable libpng, zlib is enabled
# as a dependency. But zlib being selected by libpng, it also appears
# as a dependency of the "all" package. This needlessly complicates
# the generated dependency graph. So when we have the dependency list
# (all -> zlib, all -> libpn, libpng -> zlib), we get rid of the 'all
# -> zlib' dependency, because zlib is already a dependency of a
# regular package.
def remove_redundant_deps(deps):
newdeps = []
for dep in deps:
if dep[0] == "all" and dep[1] == "toolchain":
newdeps.append(dep)
continue
if dep[0] != "all" and dep[1] != "toolchain":
newdeps.append(dep)
continue
if not has_redundant_deps(deps, dep[1]):
newdeps.append(dep)
continue
sys.stderr.write("Removing redundant dep %s -> %s\n" % (dep[0],dep[1]))
return newdeps
TARGET_EXCEPTIONS = [
"target-generic-securetty",
"target-generic-issue",
@ -217,8 +183,6 @@ if mode == FULL_MODE:
elif mode == PKG_MODE:
dependencies = get_all_depends([rootpkg])
dependencies = remove_redundant_deps(dependencies)
# Make the dependencies a dictionnary { 'pkg':[dep1, dep2, ...] }
dict_deps = {}
for dep in dependencies:
@ -260,10 +224,18 @@ def remove_transitive_deps(pkg,deps):
new_d.append(d[i])
return new_d
# This function removes the dependency on the 'toolchain' package
def remove_toolchain_deps(pkg,deps):
return [p for p in deps[pkg] if not p == 'toolchain']
# This functions trims down the dependency list of all packages.
# It applies in sequence all the dependency-elimination methods.
def remove_extra_deps(deps):
for pkg in deps.keys():
if not transitive:
if not pkg == 'all':
deps[pkg] = remove_toolchain_deps(pkg,deps)
for pkg in deps.keys():
if not transitive or pkg == 'all':
deps[pkg] = remove_transitive_deps(pkg,deps)
return deps