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

Add ninja and python to the list of LFS packages which should not appear,

Browse source 
since they are also in BLFS
This commit is contained in:
Pierre Labastie 2017-10-07 08:17:57 +00:00
parent b2fa9e83de
commit 87405299a9
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BLFS/xsl/gen_pkg_list.xsl
View file

@ -98,6 +98,9 @@
<xsl:when test="./productname='dbus'"/> <xsl:when test="./productname='dbus'"/>
<!-- Systemd version is taken from BLFS --> <!-- Systemd version is taken from BLFS -->
<xsl:when test="./productname='systemd'"/> <xsl:when test="./productname='systemd'"/>
<!-- Same for python and ninja -->
<xsl:when test="./productname='ninja'"/>
<xsl:when test="./productname='Python'"/>
<xsl:otherwise> <xsl:otherwise>
<package><xsl:text>&#xA; </xsl:text> <package><xsl:text>&#xA; </xsl:text>
<xsl:element name="name"> <xsl:element name="name">

6
BLFS/xsl/lfs_make_book.xsl
View file

@ -15,6 +15,8 @@
$package='dbus' or $package='dbus' or
$package='vim' or $package='vim' or
$package='systemd' or $package='systemd' or
$package='ninja' or
$package='Python' or
$package='shadow'"/> $package='shadow'"/>
<xsl:when test="$package='LFS-Release'">true</xsl:when> <xsl:when test="$package='LFS-Release'">true</xsl:when>
<xsl:otherwise> <xsl:otherwise>
@ -33,6 +35,8 @@
$package='dbus' or $package='dbus' or
$package='vim' or $package='vim' or
$package='systemd' or $package='systemd' or
$package='ninja' or
$package='Python' or
$package='shadow'"/> $package='shadow'"/>
<xsl:when test="$package='linux'"> <xsl:when test="$package='linux'">
<xsl:for-each select="document($lfsbook)"> <xsl:for-each select="document($lfsbook)">
@ -55,7 +59,7 @@
<xsl:template match="*" mode="lfs"> <xsl:template match="*" mode="lfs">
<xsl:choose> <xsl:choose>
<!--variablelist may contain id attributes equal to the name of the package, <!--variablelist may contain id attributes equal to the name of the package,
which generates non-unique id. They are of not mcuh use (short descriptions) which generates non-unique id. They are of not much use (short descriptions)
here. So just remove them--> here. So just remove them-->
<xsl:when test="self::variablelist"/> <xsl:when test="self::variablelist"/>
<!--The id's in lfs are of the form ch-xxx-package. We do not want to <!--The id's in lfs are of the form ch-xxx-package. We do not want to