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

adaptations to recent modifications in the systemd book and

Browse source 
merging of a change (rev 3750) in the ablfs branch
This commit is contained in:
Pierre Labastie 2013-05-21 20:20:24 +00:00
parent 0700131382
commit 8099885218
2 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
LFS/lfs.xsl
View file

@ -145,14 +145,15 @@
<xsl:template match="sect2"> <xsl:template match="sect2">
<!--XML::Parser is on the same page as Perl. The present code is OK <!--XML::Parser is on the same page as Perl. The present code is OK
except for PKG_DEST and PKGDIR, which would be the same as for Perl. except for PKG_DEST and PKGDIR, which would be the same as for Perl.
so set them to valid values.--> so set them to valid values.
Since rev 10281, that is no more true. So comment out.
<xsl:if test="contains(string(./title),'XML::Parser')"> <xsl:if test="contains(string(./title),'XML::Parser')">
<xsl:text>PKGDIR=$(dirname $PKGDIR)/</xsl:text> <xsl:text>PKGDIR=$(dirname $PKGDIR)/</xsl:text>
<xsl:copy-of select="substring-after(.//userinput[@remap='pre'], 'cd ')"/> <xsl:copy-of select="substring-after(.//userinput[@remap='pre'], 'cd ')"/>
<xsl:text> <xsl:text>
PKG_DEST=$(dirname $PKGDIR)/000-xml-parser PKG_DEST=$(dirname $PKGDIR)/000-xml-parser
</xsl:text> </xsl:text>
</xsl:if> </xsl:if>-->
<xsl:apply-templates <xsl:apply-templates
select=".//screen[not(@role) or select=".//screen[not(@role) or
@role != 'nodump']/userinput[ @role != 'nodump']/userinput[
@ -269,35 +270,39 @@ fi
<xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/> <xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/>
<xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/> <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
<!-- Creating dirs and files --> <!-- Creating dirs and files -->
<exsl:document href="{$dirname}/{$order}-{position()}-{$filename}" method="text"> <xsl:if test="count(descendant::screen/userinput) &gt; 0 and
<xsl:text>#!/bin/bash count(descendant::screen/userinput) &gt;
count(descendant::screen[@role='nodump'])">
<exsl:document href="{$dirname}/{$order}-{position()}-{$filename}"
method="text">
<xsl:text>#!/bin/bash
set +h set +h
set -e set -e
cd $PKGDIR cd $PKGDIR
</xsl:text> </xsl:text>
<xsl:apply-templates <xsl:apply-templates
select=".//screen[not(@role) or @role != 'nodump']/userinput[@remap != 'adjust']" select=".//screen[not(@role) or
@role != 'nodump']/userinput[@remap != 'adjust']"
mode="pkgmngt"/> mode="pkgmngt"/>
<xsl:if test="$dirname = 'chapter06'"> <xsl:if test="$dirname = 'chapter06'">
<xsl:text>packInstall <xsl:text>packInstall
rm -rf $PKG_DEST rm -rf $PKG_DEST
</xsl:text> </xsl:text>
</xsl:if> </xsl:if>
<xsl:apply-templates <xsl:apply-templates
select=".//screen[ select=".//screen[not(@role) or
not(@role) or @role != 'nodump'
@role != 'nodump' ]/userinput[not(@remap) or
]/userinput[ @remap='adjust'
not(@remap) or
@remap='adjust'
]" ]"
mode="pkgmngt"/> mode="pkgmngt"/>
<xsl:text> <xsl:text>
echo -e "\n\nTotalseconds: $SECONDS\n" echo -e "\n\nTotalseconds: $SECONDS\n"
exit exit
</xsl:text> </xsl:text>
</exsl:document> </exsl:document>
</xsl:if>
</xsl:template> </xsl:template>
<xsl:template match="userinput" mode="pkgmngt"> <xsl:template match="userinput" mode="pkgmngt">

4
common/libs/func_wrt_Makefile
View file

@ -106,6 +106,10 @@ get_package_tarball_name() { #
;; ;;
udev) echo $(grep "^systemd" $JHALFSDIR/pkg_tarball_list | head -n1 ) udev) echo $(grep "^systemd" $JHALFSDIR/pkg_tarball_list | head -n1 )
;; ;;
xml-parser) echo $(grep "^XML" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
libdbus) echo $(grep "^dbus" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
*) echo $(grep "^$script_name[_-][[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 ) *) echo $(grep "^$script_name[_-][[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
;; ;;
esac esac