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

merge trunk r3705

Browse source
This commit is contained in:
Pierre Labastie 2013-05-21 20:22:41 +00:00
parent d8ed3a9917
commit 16b8febb8c
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
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[

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