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

Fix gen-special when an entity is commented out:

Browse source 
In the xorg application, mkfontdir is commented out, but we did not
check that because it was complicated with the shell. This was
leading to mkfontfir appearing in the packages to install, which
is not wanted. We use the information in the "cat" command to
eliminate the commented out package.
This commit is contained in:
Pierre Labastie 2021-03-09 21:53:29 +01:00
parent e5518fd03e
commit c2af9cd73f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BLFS/gen-special.sh
View file

@ -133,7 +133,11 @@ EOF
if [ "$i" = "$packname" ]; then break; fi if [ "$i" = "$packname" ]; then break; fi
precpack=$i precpack=$i
done done
# It may happen that packname is not in list_cat, because its entity
# is commented out in the xml, but we do not check that (too complicated).
# In that case, the whole list is scanned, and $precpack=$i at the end.
# when packname is found in the list $precpack!=$i.
if [ "$precpack" = "$i" ]; then continue; fi
cat >>$SPECIAL_FILE << EOF cat >>$SPECIAL_FILE << EOF
<module><xsl:text>&#xA; </xsl:text> <module><xsl:text>&#xA; </xsl:text>
<xsl:element name="name">$packname</xsl:element> <xsl:element name="name">$packname</xsl:element>