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

Install units rather than bootscripts when REV=systemd

Browse source
This commit is contained in:
Pierre Labastie 2017-03-01 16:07:26 +00:00
parent 50a8ed0de7
commit eb8667a45d
2 changed files with 66 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
BLFS/xsl/make_book.xsl
View file

@ -8,6 +8,18 @@
<xsl:param name="list" select="''"/> <xsl:param name="list" select="''"/>
<xsl:param name="MTA" select="'sendmail'"/> <xsl:param name="MTA" select="'sendmail'"/>
<!-- Check whether the book is sysv or systemd -->
<xsl:variable name="rev">
<xsl:choose>
<xsl:when test="//bookinfo/title/phrase[@revision='systemd']">
<xsl:text>systemd</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>sysv</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:output <xsl:output
method="xml" method="xml"
encoding="ISO-8859-1" encoding="ISO-8859-1"
@ -19,7 +31,14 @@
<preface> <preface>
<?dbhtml filename="preface.html"?> <?dbhtml filename="preface.html"?>
<title>Preface</title> <title>Preface</title>
<xsl:copy-of select="id('bootscripts')"/> <xsl:choose>
<xsl:when test="$rev='sysv'">
<xsl:copy-of select="id('bootscripts')"/>
</xsl:when>
<xsl:otherwise>
<xsl:copy-of select="id('systemd-units')"/>
</xsl:otherwise>
</xsl:choose>
</preface> </preface>
<chapter> <chapter>
<?dbhtml filename="chapter.html"?> <?dbhtml filename="chapter.html"?>
@ -112,7 +131,8 @@
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:choose> <xsl:choose>
<xsl:when test="@linkend='bootscripts'"> <xsl:when test="@linkend='bootscripts' or
@linkend='systemd-units'">
<xsl:copy-of select="."/> <xsl:copy-of select="."/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>

51
BLFS/xsl/scripts.xsl
View file

@ -9,6 +9,18 @@
<!-- XSLT stylesheet to create shell scripts from "linear build" BLFS books. --> <!-- XSLT stylesheet to create shell scripts from "linear build" BLFS books. -->
<!-- Check whether the book is sysv or systemd -->
<xsl:variable name="rev">
<xsl:choose>
<xsl:when test="//bookinfo/title/phrase[@revision='systemd']">
systemd
</xsl:when>
<xsl:otherwise>
sysv
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<!-- Wrap "root" commands inside a wrapper function, allowing <!-- Wrap "root" commands inside a wrapper function, allowing
"porg style" package management --> "porg style" package management -->
<xsl:param name="wrap-install" select="'n'"/> <xsl:param name="wrap-install" select="'n'"/>
@ -24,7 +36,7 @@
<xsl:template match="sect1"> <xsl:template match="sect1">
<xsl:if test="@id != 'bootscripts'"> <xsl:if test="@id != 'bootscripts' and @id != 'systemd-units'">
<!-- The file names --> <!-- The file names -->
<xsl:variable name="filename" select="@id"/> <xsl:variable name="filename" select="@id"/>
@ -427,12 +439,20 @@ wrapInstall '
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
<xsl:template match="screen" mode="config"> <xsl:template name="set-bootpkg-dir">
<xsl:if test="preceding-sibling::para[1]/xref[@linkend='bootscripts']"> <xsl:param name="bootpkg" select="'bootscripts'"/>
<xsl:text>[[ ! -d $SRC_DIR/blfs-bootscripts ]] &amp;&amp; mkdir $SRC_DIR/blfs-bootscripts <xsl:param name="url" select="''"/>
pushd $SRC_DIR/blfs-bootscripts <xsl:text>[[ ! -d $SRC_DIR/blfs-</xsl:text>
<xsl:copy-of select="$bootpkg"/>
<xsl:text> ]] &amp;&amp; mkdir $SRC_DIR/blfs-</xsl:text>
<xsl:copy-of select="$bootpkg"/>
<xsl:text>
pushd $SRC_DIR/blfs-</xsl:text>
<xsl:copy-of select="$bootpkg"/>
<xsl:text>
URL=</xsl:text> URL=</xsl:text>
<xsl:value-of select="id('bootscripts')//itemizedlist//ulink/@url"/><xsl:text> <xsl:value-of select="$url"/>
<xsl:text>
BOOTPACKG=$(basename $URL) BOOTPACKG=$(basename $URL)
if [[ ! -f $BOOTPACKG ]] ; then if [[ ! -f $BOOTPACKG ]] ; then
if [[ -f $SRC_ARCHIVE/$PKG_DIR/$BOOTPACKG ]] ; then if [[ -f $SRC_ARCHIVE/$PKG_DIR/$BOOTPACKG ]] ; then
@ -459,9 +479,26 @@ else
fi fi
cd $BOOTUNPACKDIR cd $BOOTUNPACKDIR
</xsl:text> </xsl:text>
</xsl:template>
<xsl:template match="screen" mode="config">
<xsl:if test="preceding-sibling::para[1]/xref[@linkend='bootscripts']">
<xsl:call-template name="set-bootpkg-dir">
<xsl:with-param name="bootpkg" select="'bootscripts'"/>
<xsl:with-param name="url"
select="id('bootscripts')//itemizedlist//ulink/@url"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="preceding-sibling::para[1]/xref[@linkend='systemd-units']">
<xsl:call-template name="set-bootpkg-dir">
<xsl:with-param name="bootpkg" select="'systemd-units'"/>
<xsl:with-param name="url"
select="id('systemd-units')//itemizedlist//ulink/@url"/>
</xsl:call-template>
</xsl:if> </xsl:if>
<xsl:apply-templates select='.'/> <xsl:apply-templates select='.'/>
<xsl:if test="preceding-sibling::para[1]/xref[@linkend='bootscripts']"> <xsl:if test="preceding-sibling::para[1]/xref[@linkend='bootscripts' or
@linkend='systemd-units']">
<xsl:text> <xsl:text>
popd</xsl:text> popd</xsl:text>
</xsl:if> </xsl:if>