Changeset 2140f22 for BLFS/gen_pkg_book.sh

Timestamp:

01/28/2018 05:56:55 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

1fa0dee

Parents:

764a5d7

Message:

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...

File:

• BLFS/gen_pkg_book.sh (modified) (3 diffs)

BLFS/gen_pkg_book.sh

@@ -100 +100 @@
   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
 }
 
@@ -157 +154 @@
 pushd $DepDir > /dev/null
 set +e
-generate_dependency_tree root.dep 1
-echo
-LIST="$(tree_browse root.dep)"
+generate_subgraph root.dep 1 1 b
+echo -e "\n${SD_BORDER}"
+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
@@ -165 +176 @@
 echo Making XML book
 xsltproc --stringparam list    "$LIST"        \
-         --stringparam MTA     "$SERVER_MAIL" \
+         --stringparam MTA     "$MAIL_SERVER" \
          --stringparam lfsbook "$LFS_FULL"    \
          -o ${BookXml} \