r3404 - in jhalfs/trunk: . BLFS/libs
manuel at linuxfromscratch.org
manuel at linuxfromscratch.org
Thu Jul 26 13:07:04 MDT 2007
Author: manuel
Date: 2007-07-26 13:07:03 -0600 (Thu, 26 Jul 2007)
New Revision: 3404
Modified:
jhalfs/trunk/BLFS/libs/scripts.xsl
jhalfs/trunk/README.BLFS
Log:
BLFS: Changes to handle the new Xorg7 installation commands structure.
Modified: jhalfs/trunk/BLFS/libs/scripts.xsl
===================================================================
--- jhalfs/trunk/BLFS/libs/scripts.xsl 2007-07-26 17:33:07 UTC (rev 3403)
+++ jhalfs/trunk/BLFS/libs/scripts.xsl 2007-07-26 19:07:03 UTC (rev 3404)
@@ -168,17 +168,16 @@
<xsl:template match="sect2" mode="xorg7">
<xsl:choose>
- <xsl:when test="@role = 'package'"/>
+ <xsl:when test="@role = 'package'">
+ <xsl:apply-templates select="itemizedlist/listitem/para" mode="xorg7"/>
+ </xsl:when>
<xsl:when test="not(@role)">
<xsl:apply-templates select=".//screen"/>
- <xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para"
- mode="xorg7"/>
- <xsl:text>WGET_LST=</xsl:text>
- <xsl:apply-templates select=".//screen" mode="wget_lst"/>
- <xsl:text>
</xsl:text>
+ <xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para" mode="xorg7-patch"/>
+ <xsl:apply-templates select=".//screen" mode="sect-ver"/>
</xsl:when>
<xsl:when test="@role = 'installation'">
- <xsl:text>for package in $(cat $WGET_LST) ; do
+ <xsl:text>for package in $(grep -v '^#' ../${sect-ver}.wget) ; do
packagedir=$(echo $package | sed 's/.tar.bz2//')
tar -xf $package
cd $packagedir
</xsl:text>
@@ -191,6 +190,10 @@
</xsl:if>
<xsl:text>ldconfig

</xsl:text>
</xsl:when>
+ <xsl:when test="@role = 'configuration'">
+ <xsl:apply-templates select=".//screen"/>
+ <xsl:text>
</xsl:text>
+ </xsl:when>
</xsl:choose>
</xsl:template>
@@ -391,6 +394,15 @@
</xsl:template>
<xsl:template match="itemizedlist/listitem/para" mode="xorg7">
+ <xsl:if test="contains(string(ulink/@url),'.md5') or
+ contains(string(ulink/@url),'.wget')">
+ <xsl:text>wget </xsl:text>
+ <xsl:value-of select="ulink/@url"/>
+ <xsl:text>
</xsl:text>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="itemizedlist/listitem/para" mode="xorg7-patch">
<xsl:if test="contains(string(ulink/@url),'.patch')">
<xsl:text>wget </xsl:text>
<xsl:value-of select="ulink/@url"/>
@@ -413,8 +425,10 @@
</xsl:if>
</xsl:template>
- <xsl:template match="screen" mode="wget_lst">
- <xsl:value-of select="substring-after(string(),' -i ')"/>
+ <xsl:template match="screen" mode="sect-ver">
+ <xsl:text>sect-ver=</xsl:text>
+ <xsl:value-of select="substring-before(substring-after(string(),'-c ../'),'.md5')"/>
+ <xsl:text>
</xsl:text>
</xsl:template>
<xsl:template match="para/command">
Modified: jhalfs/trunk/README.BLFS
===================================================================
--- jhalfs/trunk/README.BLFS 2007-07-26 17:33:07 UTC (rev 3403)
+++ jhalfs/trunk/README.BLFS 2007-07-26 19:07:03 UTC (rev 3404)
@@ -177,7 +177,7 @@
For those packages that have a "Configuration" section, you should
edit the build script to fit the needs of your system.
- 4.4 PDL and Perl modules.
+ 4.4 PDL, Perl modules, and Glib-Bindings.
The generated scripts for these packages are broken and can not
be fixed. You must replace them with your own scripts or install the
@@ -193,56 +193,9 @@
4.5 XORG7
The generated scripts for Xorg7 pseudo-packages don't have support for
- $SRC_ARCHIVE nor MD5 checking.
+ $SRC_ARCHIVE. If you have previously downloaded the packages, you must edit
+ the scripts to use your local packages.
- If you have previously downloaded the packages, you must edit the
- scripts to use your local packages.
-
- Also, you will need to edit the scripts to fix the commands that must
- be applied only to a concrete individual sub-package. For example, the
- "for" loop to install xorg7-util packages may read like:
-
-for package in $(cat $WGET_LST) ; do
- packagedir=$(echo $package | sed 's/.tar.bz2//')
- tar -xf $package
- cd $packagedir
- sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &&
- ./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config
- sudo sh -c "make install"
- ./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config &&
- make
- sudo sh -c "make install"
- ./configure $XORG_CONFIG &&
- make
- sudo sh -c "make install"
- cd ..
- rm -rf $packagedir
-done
-
- After reading the HTML page to find what command is for what package,
- the loop can be changed to read something like:
-
-for package in $(cat $WGET_LST) ; do
- packagedir=$(echo $package | sed 's/.tar.bz2//')
- tar -xf $package
- cd $packagedir
- if [ ${packagedir} = "xorg-cf-files" ] ; then
- sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &&
- ./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config
- sudo sh -c "make install"
- elif [ ${packagedir} = "Imake" ] ; then
- ./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config &&
- make
- sudo sh -c "make install"
- else
- ./configure $XORG_CONFIG &&
- make
- sudo sh -c "make install"
- fi
- cd ..
- rm -rf $packagedir
-done
-
4.6 PATCHES
By default, all required patches will be downloaded from the NET.
@@ -257,9 +210,7 @@
If building as a normal user (the default setting), be sure that all
commands that require root privileges are run using sudo. Also make sure
- necessary root privilege commands are visible in your PATH. ie. ldconfig
- may not be in your user path and you will have to adjust all instances to
- include the full path.
+ necessary root privilege commands are visible in your PATH.
Due to book layout issues, some sudo commands may be missing.
More information about the alfs-log
mailing list