New management of dependencies:

- Even if only required or recommended deps only are requested and built,
  account for optional deps to build the pacakge order
- build "runtime" deps after the pacakge dependening on them, but before
  any other package
- using the "first" role in the book, implement pass1 pacakges when there
  are circular dependencies
- Documentation has still to be written
- There must be bugs, thank you for testing...

BLFS/gen_pkg_book.sh

@@ -99,13 +99,10 @@ generate_deps() {        #
 
   local -i index
   local DepDir=$1
-  rm -f $DepDir/*.{o,}dep
+  rm -f $DepDir/*.{tree,dep}
   for (( index=0 ; index < ${#TARGET[*]} ; index ++ )); do
-    echo 1 ${TARGET[${index}]} >> $DepDir/root.odep
+    echo 1 b ${TARGET[${index}]} >> $DepDir/root.dep
   done
-  echo 1 > $DepDir/root.dep
-  echo 1 >> $DepDir/root.dep
-  cat $DepDir/root.odep >> $DepDir/root.dep
 }
 
 #
@@ -156,15 +153,29 @@ mkdir $DepDir
 generate_deps $DepDir
 pushd $DepDir > /dev/null
 set +e
-generate_dependency_tree root.dep 1
+generate_subgraph root.dep 1 1 b
-echo
+echo -e "\n${SD_BORDER}"
-LIST="$(tree_browse root.dep)"
+echo Graph contains $(ls |wc -l) nodes
+echo -e "${SD_BORDER}"
+echo Cleaning subgraph...
+clean_subgraph
+echo done
+echo Generating the tree
+echo 1 >  root.tree
+echo 1 >> root.tree
+cat root.dep >> root.tree
+generate_dependency_tree root.tree 1
+echo -e "\n${SD_BORDER}"
+#echo -e \\n provisional end...
+#exit
+echo Generating the ordered package list
+LIST="$(tree_browse root.tree)"
 set -e
 popd > /dev/null
 rm -f ${BookXml}
 echo Making XML book
 xsltproc --stringparam list    "$LIST"        \
-         --stringparam MTA     "$SERVER_MAIL" \
+         --stringparam MTA     "$MAIL_SERVER" \
          --stringparam lfsbook "$LFS_FULL"    \
          -o ${BookXml} \
          ${MakeBook} \

BLFS/libs/func_dependencies

@@ -3,36 +3,55 @@
 # $Id$
 #
 
-#---------------------------------------------------------------------------#
+#-----------------------------------------------------------------------------#
-# This is a set of (recursive) functions for manipulating a dependency      #
+# This is a set of (recursive) functions for manipulating a dependency graph. #
-# tree. Everything would be "simple" without circular dependencies. We      #
+# We use algorithms and definitions from chapter 4 (mainly section 4.2) of    #
-# would just have to build the tree using the packages.xml file, and to     #
+# https://algs4.cs.princeton.edu/. The graph we manipulate is the directed    #
-# provide a function for browsing it. But we need to be able to detect      #
+# graph of the dependencies: nodes are packages in the BLFS book. A node A is #
-# circular dependencies and to possibly change the tree depending on        #
+# connected to a node B if package A depends on B. A topological order (rev-  #
-# priorities. This is why we keep with each node a record of the path       #
+# erted) is exactly what we want for a build order. But a topological order   #
-# from the root to the node, which we call *link* and a record of the       #
+# only exists if the graph is acyclic. We'll therefore have to remove cycles. #
-# successive priorities which we call *priolink*.                           #
+# There are a number of other features we want to consider:                   #
+# - edges are weighted according to the dependency requirement:               #
+#   1 for required                                                            #
+#   2 for recommended                                                         #
+#   3 for optional                                                            #
+#   4 for external                                                            #
+#   We should consider only edges with weight lower or equal to that          #
+#   specified by the user, but see below.                                     #
+# - we do not want to build the whole book. The user specifies a set of       #
+#   packages, and we have to consider only nodes reachable from this set      #
+#   using edges of weight not exceeding the specified weight.                 #
+# - when doing the topological sort, we want to consider all the edges and    #
+#   not only those not exceeding the specified weight: If a package A in the  #
+#   reachable subgraph depends optionally on another package B in the same    #
+#   subgraph, we want to build B before A. But this means we'll have to       #
+#   remove cycles for all weights.                                            #
+# - dependencies have another qualifier: before or after. The problem: if a   #
+#   package A depends on B with an "after" qualifier, and a package C depends #
+#   on A with a "before" qualifier, C may need B to be able to use A. So the  #
+#   only safe way to consider "after" qualifiers is to consider that they are #
+#   "before" deps for any parent of the packages considered.                  #
+# We'll therefore have a 3 pass procedure. First build the set of nodes       #
+# reachable from the root set. Second, remove dangling edges (those pointing  #
+# to packages outside the node set), and move "after" edges to "before" edges #
+# originating from the parents. Third remove cycles and generate a            #
+# topological sort.                                                           #
 #                                                                             #
-# Layout of the tree:                                                       #
+# TODO: document each pass
+# Data layout:                                                                #
+# TODO: needs also to document the .tree files, and the "f" qualifier
 #                                                                             #
-# A node of the tree is represented by a file <nodeName>.dep. We keep all   #
+# A node of the tree is represented by a text file <nodeName>.dep. Each edge  #
-# those files in the same directory. The root node file is "root.dep".      #
+# starting from this node is represented by a line in this file. We keep      #
-# Files <nodeName>.dep have the following layout:                           #
+# those files in the same directory. We introduce a special node named root,  #
-#   - the first line is the link: the link is an array of numbers           #
+# whose edges point to the list of nodes requested by the user. Each line     #
-#     (n1 n2 ... nN), describing the path from the root to <nodeName>: n1   #
+# contains three fields:                                                      #
-#     is the position of the first node of the path in root.dep, n2 is the  #
+#  - the weight of the edge                                                   #
-#     position of the second node of the path in <node1>.dep and so on. The #
+#  - the "before" (b) or "after" (a) qualifier                                #
-#     link is not needed for normal tree operations (building a subtree or  #
+#  - the name of the destination of the edge                                  #
-#     browsing the tree), but it allows to check whether a dependency is    #
-#     circular, and to find its parent.                                     #
-#   - the second line is an array of priorities (p1 p2 ... pN), giving the  #
-#     priority (1=required, 2=recommended, 3=optional) of each dependency   #
-#     in the link.                                                          #
-#   - each subsequent line is of the form "p <depname>", where p is the     #
-#     priority as above, and <depname> is the name of the dependency. The   #
-#     position which is recorded in the link is the number of the line      #
-#     minus 2.                                                              #
 #                                                                           #
+# TODO: The following is obsolete
 # Circular dependencies:                                                    #
 #                                                                           #
 # In case we find a cirdular dependency, it has the form :                  #
@@ -51,9 +70,256 @@
 # Global variables:
 # A string of spaces for indenting:
 declare -a spaceSTR="                                                                   "
-# When we are backing up from a circular dependency, `exchange_triplet'
+# When we are backing up from a circular dependency, `parentNode'
-# shall contain (parent dependency_0 dependency_n):
+# contains the node which has an edge entering the cycle
-declare -a exchange_triplet
+declare parentNode
+
+#---------------------#
+generate_subgraph() { #
+#---------------------#
+: <<inline_doc
+    function:   Create a subgraph of all the nodes reachable from the node
+                represented by the file whose name is $1. The edges considered
+                are those with maximal weight DEP_LEVEL (recursive function).
+    input vars: $1 : file name corresponding to the node whose edges will be
+		     followed for the DFS
+                $2 : weight of the edge leading to this node
+                $3 : depth (root is 1)
+                $4 : qualifier (a for after, b for before)
+    externals:  vars:  DEP_LEVEL   contains 1 if we want to build the
+                                   tree only for required dependencies,
+                                   2 if we want also recommended ones,
+                                   3 if we want also optional ones, but only
+                                   for the requested packages,
+                                   4 if we want all the dependencies
+                       MAIL_SERVER contains the name of the MTA we want to use.
+                files: ../xsl/dependencies.xsl: stylesheet for creating the
+                                               .dep files
+                       ../packages.xml:         File containing packages id
+                                                and dependencies
+    returns:    0 if the tree has been successfully created
+    output:     files: for each node reachable from $1, a file <node>.dep.
+    on error:   nothing
+    on success: nothing
+inline_doc
+
+local depFile=$1
+local -i weight=$2
+local -i depth=$3
+local qualifier=$4
+local -i spacing=0
+local priostring
+local buildstring
+local id_of_dep
+local prio_of_dep
+local build_of_dep
+local dep_level
+
+if (( depth < 10 )); then spacing=1; fi
+case $weight in
+    1) priostring=required    ;;
+    2) priostring=recommended ;;
+    3) priostring=optional    ;;
+esac
+case $qualifier in
+    a) buildstring=runtime ;;
+    b) buildstring=        ;;
+esac
+dep_level=$DEP_LEVEL
+if [ "$dep_level" = 3 ] && [ "$depth" -gt 2 ]; then dep_level=2; fi
+if [ "$dep_level" -gt 3 ]; then dep_level=3; fi
+echo -en "\nNode: $depth${spaceSTR:0:$(( depth + spacing ))}${RED}${depFile%.dep}${OFF} $priostring $buildstring"
+
+depth=$(( depth + 1 ))
+if (( depth < 10 )); then spacing=1; else spacing=0; fi
+# Start of loop
+{
+while read prio_of_dep build_of_dep id_of_dep; do
+case $prio_of_dep in
+    1) priostring=required ;;
+    2) priostring=recommended ;;
+    3) priostring=optional ;;
+    4) priostring=external ;;
+esac
+case $build_of_dep in
+    a) buildstring=runtime ;;
+    b) buildstring=        ;;
+esac
+# Has this entry already been seen
+  if [ -f ${id_of_dep}.dep ] ; then
+# Just display it and proceed.
+    echo -en "\nEdge: $depth${spaceSTR:0:$((depth + spacing))}${MAGENTA}${id_of_dep}${OFF} $priostring $buildstring"
+    continue
+  fi
+# Is the weight higher than requested?
+  if [ "$prio_of_dep" -gt $dep_level ]; then
+# Just display it and proceed.
+    echo -en "\n Out: $depth${spaceSTR:0:$((depth + spacing))}${YELLOW}${id_of_dep}${OFF} $priostring $buildstring"
+    continue
+  fi
+# Otherwise, let's build the corresponding subgraph.
+  xsltproc --stringparam idofdep "$id_of_dep" \
+           --stringparam MTA "$MAIL_SERVER"   \
+           -o ${id_of_dep}.dep                \
+           ../xsl/dependencies.xsl ../packages.xml
+
+  if [[ -s ${id_of_dep}.dep ]]; then # this dependency has dependencies
+    generate_subgraph ${id_of_dep}.dep $prio_of_dep $depth $build_of_dep
+  else # id_of_dep has no dependencies, just touch the file and display
+    touch ${id_of_dep}.dep
+    echo -en "\nLeaf: $depth${spaceSTR:0:$((depth + spacing))}${CYAN}${id_of_dep}${OFF} $priostring $buildstring"
+  fi
+done
+} <$depFile
+depth=$(( depth - 1 ))
+if (( depth < 10 )); then spacing=1; else spacing=0; fi
+echo -en "\n End: $depth${spaceSTR:0:$((depth + spacing))}${GREEN}${depFile%.dep}${OFF}"
+return 0
+}
+
+#-----------#
+path_to() { #
+#-----------#
+: <<inline_doc
+    function:   check whether there is a path from $1 to $2 on the graph
+    input       vars: $1 contains the filename of the starting node.
+                      $2 contains the name of the node to reach
+                      $3 contains the weight above which we do not want to
+                         follow an edge
+                      "seen" (global) contains the list of already seen nodes
+    returns:    0 if the node has been found
+                1 if not
+    on error:   nothing
+    on success: nothing
+inline_doc
+local start=$1
+local seek=$2
+local prio=$3
+local prio_of_dep
+local build_of_dep
+local id_of_dep
+local r
+
+if test "${start%.dep}" = "$seek"; then return 0; fi
+seen="$seen$file "
+if test -s $file; then
+  {
+  while read prio_of_dep build_of_dep id_of_dep; do
+    if test "$prio" -lt "$prio_of_dep"; then continue; fi
+    if test "${seen% $id_of_dep *}" = "$seen"; then continue; fi
+    if path_to ${id_of_dep}.dep $seek $prio; then return 0; fi
+  done
+  } < $start
+fi
+return 1
+}
+#------------------#
+clean_subgraph() { #
+#------------------#
+: <<inline_doc
+    function:   Remove dangling edges and create groups of deps for "after"
+                deps: A-before->B-after->C becomes:
+                 A -before-> Bgroupxx -before-> B
+                                     \
+                                      -before-> C
+                the name of the group is chosen so that it is unlikely as
+                a package name (so that it is removed when building the
+                xml book).
+    input       vars: None
+                files: <node>.dep files containing dangling edges and
+                       "after" qualifiers
+    returns:    0
+    output:     files: <node>.dep files containing no dangling edges and
+                       no "after" qualifiers
+    on error:   nothing
+    on success: nothing
+inline_doc
+
+local node
+local id_of_dep
+local prio_of_dep
+local build_of_dep
+local lines_to_remove
+local lines_to_change
+local parent
+local p
+local b
+local start
+local seen
+
+for node in $(ls *.dep); do
+  if test $node = root.dep; then continue; fi
+  lines_to_remove=
+  {
+  while read prio_of_dep build_of_dep id_of_dep; do
+    if ! test -f ${id_of_dep}.dep; then
+      lines_to_remove="$lines_to_remove $id_of_dep"
+      continue
+    fi
+  done
+  } <$node
+  for id_of_dep in $lines_to_remove; do
+    sed "/\ $id_of_dep\$/d" -i $node
+  done
+done
+for node in $(grep -l ' a ' *.dep); do
+  lines_to_remove=
+  if ! [ -e ${node%.dep}groupxx.dep ]; then
+    for parent in $(grep -l ${node%.dep}\$ *); do
+      p=0
+      for start in $(grep ' a ' $node | cut -d' ' -f3); do
+        seen=" "
+        if path_to ${start}.dep ${parent%.dep} 3; then p=1; break; fi
+      done
+      if test $p = 0; then
+        sed -i "s/\ ${node%.dep}\$/&groupxx/" $parent
+      fi
+    done
+    echo "1 b ${node%.dep}" > ${node%.dep}groupxx.dep
+  fi
+  {
+  while read prio_of_dep build_of_dep id_of_dep; do
+    if test $build_of_dep = a; then
+      if ! grep -q ${id_of_dep} ${node%.dep}groupxx.dep; then
+        echo "$prio_of_dep b ${id_of_dep}" >> ${node%.dep}groupxx.dep
+      fi
+      lines_to_remove="$lines_to_remove $id_of_dep"
+    fi
+  done
+  } <$node
+  for id_of_dep in $lines_to_remove; do
+    sed "/\ $id_of_dep\$/d" -i $node
+  done
+done
+for node in $(grep -l ' f ' *); do
+  lines_to_change=
+  {
+  while read prio_of_dep build_of_dep id_of_dep; do
+    if test $build_of_dep = f; then
+      if ! test -f ${id_of_dep}-pass1.dep; then
+        cp ${id_of_dep}{,-pass1}.dep;
+      fi
+      lines_to_change="$lines_to_change $id_of_dep"
+      unset lr
+      {
+      while read p b start; do
+        seen=" "
+        if path_to ${start}.dep ${node%.dep} $p; then
+          lr="$lr $start"
+        fi
+      done
+      } < ${id_of_dep}-pass1.dep
+      for p in $lr; do
+        sed "/\ $p\$/d" -i ${id_of_dep}-pass1.dep
+      done
+    fi
+  done
+  } <$node
+  for id_of_dep in $lines_to_change; do
+    sed "/\ $id_of_dep\$/"'{s/ f / b /;s/$/-pass1/}' -i $node
+  done
+done
+} # End clean_subgraph
 
 #----------------------------#
 generate_dependency_tree() { #
@@ -64,25 +330,22 @@ generate_dependency_tree() { #
     input vars: $1 : file with a list of targets (child nodes)
                      the first line of the file is the link
                 $2 : priority (1=req, 2=rec, 3=opt)
-    externals:  vars:  DEP_LEVEL   contains 1 if we want to build the
-                                   tree only for required dependencies,
-                                   2 if we want also recommended ones,
-                                   and 3 if we want optional ones too.
-                       MAIL_SERVER contains the name of the MTA we want to use.
-                files: ../xsl/dependencies.xsl: stylesheet for creating the
-                                               .dep files
-                       ../packages.xml:         File containing packages id
-                                                and dependencies
     returns:    0 if the tree has been successfully created
                 1 if we are backing up to the parent of a circular dep
-    modifies:   vars: exchange_triplet contains the triplet when return is 1
+                  and there are only required deps in the cycle
+                2 if we are backing up to the parent of a circular dep
+                  and there are recommended deps and no optional deps in the
+                  cycle
+                3 if we are backing up to the parent of a circular dep
+                  and there are optiional deps in the cycle
+    modifies:   vars: ParentNode is set when return is not 0
     output:     files: for each <pkg> with dependencies in $1,
-                       a file <pkg>.dep and its dependencies
+                       a file <pkg>.tree and its dependencies
     on error:   nothing
     on success: nothing
 inline_doc
 
-local DepFile=$1
+local depFile=$1
 local priority=$2
 local -a rootlink
 local -a priolink
@@ -90,156 +353,107 @@ local -a otherlink
 local -i depth
 local -i count=0
 local id_of_dep
+local build_of_dep
+local prio_of_dep
 local parent
 local lines_to_remove=
 local srootlink
-local dep_level
 local priostring
 local dpriostring
 local i
 
 {
-# We use fd number 6 for input from DepFile, because we need 0 for user input
+read -a rootlink
-read -u6 -a rootlink
 depth=${#rootlink[*]}
-read -u6 -a priolink
+read -a priolink
-dep_level=$DEP_LEVEL
-# For now, process optional deps only for the root packages.
-if (( $DEP_LEVEL > 2 )) && (( $depth > 1 )); then dep_level=2; fi
 srootlink="${rootlink[*]} "
 case $priority in
     1) priostring=required ;;
     2) priostring=recommended ;;
     3) priostring=optional ;;
-    4) priostring=external ;;
 esac
-# start of DepFile
+# start of depFile
-echo -en "\nNode: $depth${spaceSTR:0:$depth}${RED}$DepFile${OFF} $priostring"
+echo -en "\nNode: $depth${spaceSTR:0:$depth}${RED}${depFile%.tree}${OFF} $priostring"
 
-while read -u6 prio_of_dep id_of_dep; do
+while read prio_of_dep build_of_dep id_of_dep; do
-case $prio_of_dep in
+  case $prio_of_dep in
     1) dpriostring=required ;;
     2) dpriostring=recommended ;;
     3) dpriostring=optional ;;
-    4) dpriostring=external ;;
+  esac
-esac
 # count entries in file
   (( count++ ))
 # Has this entry already been seen?
-  if [ -f ${id_of_dep}.dep ]; then # found ${id_of_dep}.dep already in tree
+  if [ -f ${id_of_dep}.tree ]; then # found ${id_of_dep}.tree already in tree
-    otherlink=($(head -n 1 ${id_of_dep}.dep))
+    otherlink=($(head -n 1 ${id_of_dep}.tree))
     if [ -z "${otherlink[*]}" ]
-      then echo otherlink empty for $id_of_dep.dep
+      then echo otherlink empty for $id_of_dep.tree
       echo This should not happen, but happens to happen...
       exit 1
     fi
-# Do not use "${rootlink[*]}" =~ "${otherlink[*]}": case rootlink=(1 11)
+#Do not use "${rootlink[*]}" =~ "${otherlink[*]}": case rootlink=(1 11)
 # and otherlink=(1 1)
     if [[ ${srootlink#"${otherlink[*]} "} != ${srootlink} ]]; then # cir. dep
       echo -en "\nCirc: $((depth+1))${spaceSTR:0:$((depth+1))}${YELLOW}${id_of_dep}${OFF} $dpriostring"
-# First look for the other parent of this dependency.
+# Find lowest priority in branch from parent to depFile:
-# The parent has the same link without the last entry.
-# We do not need otherlink anymore so just destroy the last element
-      unset otherlink[-1]
-      parent=$(grep ^"${otherlink[*]}"\$ -l *)
-      parent=${parent%.dep}
-# Find lowest priority in branch from parent to DepFile:
       p2=0
       for (( i=${#otherlink[*]}; i < $depth ; i++ )) ; do
         if (( ${priolink[i]} > $p2 )); then p2=${priolink[i]}; fi
       done
       if (( $prio_of_dep >= $p2 )); then # prune
         lines_to_remove="$lines_to_remove $id_of_dep"
-        sed -i "/$id_of_dep/d" ${DepFile/.dep/.odep}
+        sed -i "/$id_of_dep/d" ${depFile/.tree/.dep}
-      else #backup with prio priority
+      else # find and set parent, then return lowest priority
-        exchange_triplet=($parent $id_of_dep ${DepFile%.dep})
+# The parent has the same link without the last entry.
-        return $priority
+# We do not need otherlink anymore so just destroy the last element
+        unset otherlink[-1]
+        parentNode=$(grep ^"${otherlink[*]}"\$ -l *)
+        return $p2
       fi
-    else # not circular: prune tree (but not .odep, since it may happen that
+    else # not circular: prune tree (but not .dep, since it may happen that
          # the tree is destroyed and rebuilt in another order)
       lines_to_remove="$lines_to_remove $id_of_dep"
     fi # circular or not
     continue # this dependency has already been seen, and the associated
              # subtree computed. We are done
   fi # Has this entry already been seen?
-# So, this entry has not already been seen.
+# So, this entry has not already been seen. Let's build the corresponding
-# If this is an external dep, just display it and go to next dep:
+# subtree. First check there is a subtree...
-  if [ "$prio_of_dep" -eq 4 ]; then
+# Use -s, because it may happen that after removing lines, .dep exists
-    echo "${rootlink[*]} $count" > ${id_of_dep}.dep
-    echo -en "\nLeaf: $(($depth+1))${spaceSTR:0:$(($depth+1))}${CYAN}${id_of_dep}${OFF} $dpriostring"
-    continue
-  fi
-# Otherwise, let's build the corresponding
-# subtree. Since decisions about circular deps can lead us to start again
-# dependencies, we restart until the flag is false.
-  flag=true
-  while [ $flag = true ]; do
-    flag=false
-    if [ ! -f "${id_of_dep}.odep" ]; then
-      xsltproc --stringparam dependencies ${dep_level} \
-        --stringparam idofdep $id_of_dep \
-        --stringparam MTA $MAIL_SERVER   \
-        -o ${id_of_dep}.odep \
-        ../xsl/dependencies.xsl ../packages.xml
-    fi
-
-# Use -s, because it may happen that after removing lines, .odep exists
 # but is empty.
-    if [[ -s ${id_of_dep}.odep ]]; then # this dependency has dependencies
+  if [[ -s ${id_of_dep}.dep ]]; then # this dependency has dependencies
     sed "1i${rootlink[*]} $count\\
-${priolink[*]} $prio_of_dep" < ${id_of_dep}.odep \
+${priolink[*]} $prio_of_dep" < ${id_of_dep}.dep \
-                             > ${id_of_dep}.dep # add link and priolink
+                             > ${id_of_dep}.tree # add link and priolink
-      generate_dependency_tree ${id_of_dep}.dep $prio_of_dep
+    generate_dependency_tree ${id_of_dep}.tree $prio_of_dep
 # Test return value, in case we exchange dependencies
     p2=$?
     case $p2 in
      0) # Normal return
        ;;
-       [123]) # We are backing up to parent
+     $prio_of_dep) # we remove this dep, but since it may become unreachable,
-         if [[ ${exchange_triplet} == ${DepFile%.dep} ]] ; then
+                   # move it to be built later (as a dep of parent).
-# We are the parent!
+         tree_erase ${id_of_dep}.tree
-# First, we have to find the parent of our new direct dep, and remove
+         lines_to_remove="$lines_to_remove $id_of_dep"
-# the new direct dep from the parent.odep:
+         sed -i "/${id_of_dep}/d" ${depFile/.tree/.dep}
-           otherlink=($(head -n1 ${exchange_triplet[2]}.dep))
+         echo "$prio_of_dep b $id_of_dep" >> $parentNode
-           unset otherlink[-1]
+# must be added to .dep in case parentNode is destroyed when erasing
-           parent=$(grep -l ^"${otherlink[*]}"\$ *.dep)
+# the tree
-           sed -i /[[:digit:]]\ ${exchange_triplet[2]}\$/d ${parent/.dep/.odep}
+         echo "$prio_of_dep b $id_of_dep" >> ${parentNode/.tree/.dep}
-           tree_erase ${id_of_dep}.dep
+         continue
-# We want that our direct dep be ${exchange_triplet[2]} and that id_of_dep
+       ;;
-# be pulled in as an indirect dep, so exchange.
+     *) # We are backing up
-# Just doing a sed -i "s@${id_of_dep}@${exchange_triplet[2]}@" $DepFile
-# is not good if $DepFile contains several times the same line
-# so first find the first line and then sed
-           lineno=$(sed -n /${id_of_dep}/= $DepFile | head -n1)
-           sed -i "${lineno}s@${id_of_dep}@${exchange_triplet[2]}@" $DepFile
-# Do the same for the odep file:
-           local OdepFile=${DepFile/.dep/.odep}
-           lineno=$(sed -n /${id_of_dep}/= $OdepFile | head -n1)
-           sed -i "${lineno}s@${id_of_dep}@${exchange_triplet[2]}@" $OdepFile
-           id_of_dep=${exchange_triplet[2]}
-           flag=true # we have to regenerate the tree for the new dependency
-         else
-# We are not the parent. If our priority is greater than p2
-# we have to change the triplet and return priority, else return current p2.
-# echo (DEBUG) backing up to ${exchange_triplet} at ${DepFile%.dep}
-           if (( $priority > $p2 )); then
-             exchange_triplet[2]=${DepFile%.dep}
-             return $priority
-           else
          return $p2
-           fi
-         fi
        ;;
     esac
   else # id_of_dep has no dependencies, just record the link in a file
        # and print
-      echo "${rootlink[*]} $count" > ${id_of_dep}.dep
+    echo "${rootlink[*]} $count" > ${id_of_dep}.tree
     echo -en "\nLeaf: $(($depth+1))${spaceSTR:0:$(($depth+1))}${CYAN}${id_of_dep}${OFF} $dpriostring"
   fi
-  done
 done
-echo -en "\n End: $depth${spaceSTR:0:$depth}${GREEN}$DepFile${OFF}"
+echo -en "\n End: $depth${spaceSTR:0:$depth}${GREEN}${depFile%.tree}${OFF}"
-} 6<$DepFile
+} <$depFile
 # It may happen that a file is created with several times
 # the same line. Normally, all those lines but one
 # would be flagged to be removed (or all of them if
@@ -249,12 +463,13 @@ echo -en "\n End: $depth${spaceSTR:0:$depth}${GREEN}$DepFile${OFF}"
 # so first get the position of last line and then delete
 # that line
 for line in $lines_to_remove
-  do lineno=$(sed -n /^[[:digit:]]\ $line\$/= $DepFile | tail -n1)
+  do lineno=$(sed -n /^[[:digit:]]\ b\ $line\$/= $depFile | tail -n1)
-  sed -i ${lineno}d $DepFile
+  sed -i ${lineno}d $depFile
 done
 return 0
 }
 
+
 #---------------#
 tree_browse() { #
 #---------------#
@@ -264,8 +479,8 @@ local f
 #echo file=$file
 for f in $(grep '[^0-9 ]' $file | sed 's/.* //'); do
 #  echo f=$f
-  if grep -q '[^0-9 ]' ${f}.dep ; then
+  if grep -q '[^0-9 ]' ${f}.tree ; then
-    tree_browse ${f}.dep
+    tree_browse ${f}.tree
   fi
   echo $f
 done
@@ -282,8 +497,8 @@ local rootlink2
 #echo file=$file
 rootlink="$(head -n1 $file) "
 for f in $(grep '[^0-9 ]' $file | sed 's/.* //'); do
-  if [ -f ${f}.dep ]; then
+  if [ -f ${f}.tree ]; then
-    rootlink2="$(head -n1 ${f}.dep) "
+    rootlink2="$(head -n1 ${f}.tree) "
 # We want two things:
 # i)  do not erase the file if it is in another branch
 # ii) do not erase the file if there is a circular dependency
@@ -293,7 +508,7 @@ for f in $(grep '[^0-9 ]' $file | sed 's/.* //'); do
 # See comment above about srootlink
     if [[ ${rootlink2#${rootlink}} != ${rootlink2} &&
 	  ${rootlink#${rootlink2}} == ${rootlink} ]] ; then
-      tree_erase ${f}.dep
+      tree_erase ${f}.tree
     fi
   fi
 done

BLFS/packdesc.dtd

@@ -19,6 +19,6 @@
 <!-- subdependencies of a dependency are defined for example in Perl
      modules -->
 <!ATTLIST dependency status (required|recommended|optional) "recommended"
-                     build (before|after) "before"
+                     build (before|after|first) "before"
                      name CDATA #REQUIRED
                      type (ref|link) "ref">

BLFS/xsl/dependencies.xsl

@@ -8,7 +8,6 @@
   <xsl:output method="text"/>
 
   <xsl:param name="MTA" select="'sendmail'"/>
-  <xsl:param name="dependencies" select="2"/>
   <xsl:param name="idofdep" select="'dbus'"/>
 
   <xsl:key name="depnode"
@@ -20,39 +19,14 @@
   </xsl:template>
 
   <xsl:template match="package">
-    <xsl:apply-templates select="./dependency[@status='required']">
+    <xsl:apply-templates select="./dependency"/>
-      <xsl:with-param name="priority" select="1"/>
-    </xsl:apply-templates>
-    <xsl:if test="$dependencies &gt; '1'">
-      <xsl:apply-templates select="./dependency[@status='recommended']">
-        <xsl:with-param name="priority" select="2"/>
-      </xsl:apply-templates>
-      <xsl:if test="$dependencies = '3'">
-        <xsl:apply-templates select="./dependency[@status='optional']">
-          <xsl:with-param name="priority" select="3"/>
-        </xsl:apply-templates>
-      </xsl:if>
-    </xsl:if>
   </xsl:template>
 
   <xsl:template match="module">
-    <xsl:apply-templates select="./dependency[@status='required']">
+    <xsl:apply-templates select="./dependency"/>
-      <xsl:with-param name="priority" select="1"/>
-    </xsl:apply-templates>
-    <xsl:if test="$dependencies &gt; '1'">
-      <xsl:apply-templates select="./dependency[@status='recommended']">
-        <xsl:with-param name="priority" select="2"/>
-      </xsl:apply-templates>
-      <xsl:if test="$dependencies = '3'">
-        <xsl:apply-templates select="./dependency[@status='optional']">
-          <xsl:with-param name="priority" select="3"/>
-        </xsl:apply-templates>
-      </xsl:if>
-    </xsl:if>
   </xsl:template>
 
   <xsl:template match="dependency">
-    <xsl:param name="priority"/>
     <xsl:variable name="depname">
       <xsl:choose>
         <xsl:when test="@name='x-window-system'">xinit</xsl:when>
@@ -79,16 +53,32 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <xsl:apply-templates select="dependency">
+    <xsl:apply-templates select="dependency"/>
-      <xsl:with-param name="priority" select="1"/>
-    </xsl:apply-templates>
     <xsl:if test="number($install_it)">
       <xsl:choose>
         <xsl:when test="@type='link'">
           <xsl:text>4</xsl:text>
         </xsl:when>
+        <xsl:when test="@status='required'">
+          <xsl:text>1</xsl:text>
+        </xsl:when>
+        <xsl:when test="@status='recommended'">
+          <xsl:text>2</xsl:text>
+        </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="$priority"/>
+          <xsl:text>3</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:text> </xsl:text>
+      <xsl:choose>
+        <xsl:when test="@build='first'">
+          <xsl:text>f</xsl:text>
+        </xsl:when>
+        <xsl:when test="@build='before'">
+          <xsl:text>b</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>a</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:text> </xsl:text>

BLFS/xsl/gen_config.xsl

@@ -39,10 +39,13 @@ choice
         bool    "Required dependencies only"
 
         config  DEPLVL_2
-        bool    "Required and recommended dependencies"
+        bool    "Required plus recommended dependencies"
 
         config  DEPLVL_3
-        bool    "Required, recommended and optional dependencies"
+        bool    "Req/rec  plus optional dependencies of requested package(s)"
+
+        config  DEPLVL_4
+        bool    "All non external dependencies"
 
 endchoice
 config  optDependency
@@ -50,6 +53,7 @@ config  optDependency
         default 1       if DEPLVL_1
         default 2       if DEPLVL_2
         default 3       if DEPLVL_3
+        default 4       if DEPLVL_4
 
 
 config  SUDO

BLFS/xsl/gen_pkg_list.xsl

@@ -363,6 +363,7 @@
             <xsl:with-param name="build">
               <xsl:choose>
                 <xsl:when test="@role='runtime'">after</xsl:when>
+                <xsl:when test="@role='first'">first</xsl:when>
                 <xsl:otherwise>before</xsl:otherwise>
               </xsl:choose>
             </xsl:with-param>
@@ -378,6 +379,7 @@
             <xsl:attribute name="build">
               <xsl:choose>
                 <xsl:when test="@role='runtime'">after</xsl:when>
+                <xsl:when test="@role='first'">first</xsl:when>
                 <xsl:otherwise>before</xsl:otherwise>
               </xsl:choose>
             </xsl:attribute>
@@ -404,6 +406,7 @@
             <xsl:attribute name="build">
               <xsl:choose>
                 <xsl:when test="@role='runtime'">after</xsl:when>
+                <xsl:when test="@role='first'">first</xsl:when>
                 <xsl:otherwise>before</xsl:otherwise>
               </xsl:choose>
             </xsl:attribute>

BLFS/xsl/make_book.xsl

@@ -82,6 +82,7 @@
                             select="substring-after($list,' ')"/>
           </xsl:call-template>
         </xsl:when>
+        <xsl:when test="contains($list,'groupxx')"/>
         <xsl:otherwise>
           <xsl:variable name="is-lfs">
             <xsl:call-template name="detect-lfs">
@@ -100,6 +101,15 @@
                 <xsl:with-param name="lfsbook" select="$lfsbook"/>
               </xsl:call-template>
             </xsl:when>
+            <xsl:when test="contains(concat($list,' '),'-pass1 ')">
+<!-- Let's do it only for sect1, hopefully -->
+              <xsl:variable
+                   name="real-id"
+                   select="substring-before(concat($list,' '),'-pass1 ')"/>
+              <xsl:if test="id($real-id)[self::sect1]">
+                <xsl:apply-templates select="id($real-id)" mode="pass1"/>
+              </xsl:if>
+            </xsl:when>
             <xsl:when test="not(id($list)[self::sect1 or self::sect2 or self::para or self::bridgehead])">
               <xsl:apply-templates
                    select="//sect1[contains(@id,'xorg7')
@@ -124,6 +134,74 @@
     <xsl:apply-templates select="." mode="sect1"/>
   </xsl:template>
 
+  <xsl:template match="*" mode="pass1">
+    <xsl:choose>
+      <xsl:when test="self::xref">
+        <xsl:choose>
+          <xsl:when test="contains(concat(' ',normalize-space($list),' '),
+                                   concat(' ',@linkend,' '))">
+            <xsl:choose>
+              <xsl:when test="@linkend='x-window-system' or @linkend='xorg7'">
+                <xref linkend="xorg7-server"/>
+              </xsl:when>
+              <xsl:when test="@linkend='server-mail'">
+                <xref linkend="{$MTA}"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:copy-of select="."/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:choose>
+              <xsl:when test="@linkend='bootscripts' or
+                              @linkend='systemd-units'">
+                <xsl:copy-of select="."/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="@linkend"/> (in full book)
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:when test="@id">
+        <xsl:element name="{name()}">
+          <xsl:for-each select="attribute::*">
+            <xsl:attribute name="{name()}">
+              <xsl:value-of select="."/>
+              <xsl:if test="name() = 'id'">-pass1</xsl:if>
+            </xsl:attribute>
+          </xsl:for-each>
+          <xsl:apply-templates mode="pass1"/>
+        </xsl:element>
+      </xsl:when>
+      <xsl:when test=".//xref | .//@id">
+        <xsl:element name="{name()}">
+          <xsl:for-each select="attribute::*">
+            <xsl:attribute name="{name()}">
+              <xsl:value-of select="."/>
+            </xsl:attribute>
+          </xsl:for-each>
+          <xsl:apply-templates mode="pass1"/>
+        </xsl:element>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="."/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="processing-instruction()" mode="pass1">
+    <xsl:variable name="pi-full" select="string()"/>
+    <xsl:variable name="pi-value"
+                  select="substring-after($pi-full,'filename=')"/>
+    <xsl:variable name="filename"
+                  select="substring-before(substring($pi-value,2),'.html')"/>
+    <xsl:processing-instruction name="dbhtml">filename="<xsl:copy-of
+                select="$filename"/>-pass1.html"</xsl:processing-instruction>
+  </xsl:template>
+
   <xsl:template match="processing-instruction()" mode="sect1">
     <xsl:copy-of select="."/>
   </xsl:template>