zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Print external dependencies when printing the dependency tree

Browse source
This commit is contained in:
Pierre Labastie 2015-11-23 14:22:48 +00:00
parent 7ac11f0671
commit e91a15da8a
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
BLFS/libs/func_dependencies
View file

@ -71,7 +71,7 @@ generate_dependency_tree() { #
MAIL_SERVER contains the name of the MTA we want to use. MAIL_SERVER contains the name of the MTA we want to use.
files: ../xsl/dependencies.xsl: stylesheet for creating the files: ../xsl/dependencies.xsl: stylesheet for creating the
.dep files .dep files
../packages.xml: Files containing packages id ../packages.xml: File containing packages id
and dependencies and dependencies
returns: 0 if the tree has been successfully created returns: 0 if the tree has been successfully created
1 if we are backing up to the parent of a circular dep 1 if we are backing up to the parent of a circular dep
@ -111,6 +111,7 @@ case $priority in
1) priostring=required ;; 1) priostring=required ;;
2) priostring=recommended ;; 2) priostring=recommended ;;
3) priostring=optional ;; 3) priostring=optional ;;
4) priostring=external ;;
esac 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${OFF} $priostring"
@ -120,6 +121,7 @@ case $prio_of_dep in
1) dpriostring=required ;; 1) dpriostring=required ;;
2) dpriostring=recommended ;; 2) dpriostring=recommended ;;
3) dpriostring=optional ;; 3) dpriostring=optional ;;
4) dpriostring=external ;;
esac esac
# count entries in file # count entries in file
(( count++ )) (( count++ ))
@ -160,7 +162,14 @@ esac
continue # this dependency has already been seen, and the associated continue # this dependency has already been seen, and the associated
# subtree computed. We are done # subtree computed. We are done
fi # Has this entry already been seen? fi # Has this entry already been seen?
# So, this entry has not already been seen. Let's build the corresponding # So, this entry has not already been seen.
# If this is an external dep, just display it and go to next dep:
if [ "$prio_of_dep" -eq 4 ]; then
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 # subtree. Since decisions about circular deps can lead us to start again
# dependencies, we restart until the flag is false. # dependencies, we restart until the flag is false.
flag=true flag=true

9
BLFS/xsl/dependencies.xsl
View file

@ -83,7 +83,14 @@
<xsl:with-param name="priority" select="1"/> <xsl:with-param name="priority" select="1"/>
</xsl:apply-templates> </xsl:apply-templates>
<xsl:if test="number($install_it)"> <xsl:if test="number($install_it)">
<xsl:value-of select="$priority"/> <xsl:choose>
<xsl:when test="@type='link'">
<xsl:text>4</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$priority"/>
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
<xsl:value-of select="$depname"/> <xsl:value-of select="$depname"/>
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>