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

BLFS: Changes to handle the new Xorg7 installation commands structure.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2007-07-26 19:07:03 +00:00
parent d1ede32fd8
commit 0efb837ae4
2 changed files with 27 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
BLFS/libs/scripts.xsl
View file

@ -168,17 +168,16 @@ cd $UNPACKDIR&#xA;</xsl:text>
<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>&#xA;</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&#xA;</xsl:text>
@ -191,6 +190,10 @@ done&#xA;</xsl:text>
</xsl:if>
<xsl:text>ldconfig&#xA;&#xA;</xsl:text>
</xsl:when>
<xsl:when test="@role = 'configuration'">
<xsl:apply-templates select=".//screen"/>
<xsl:text>&#xA;</xsl:text>
</xsl:when>
</xsl:choose>
</xsl:template>
@ -391,6 +394,15 @@ done&#xA;</xsl:text>
</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>&#xA;</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 @@ done&#xA;</xsl:text>
</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>&#xA;</xsl:text>
</xsl:template>
<xsl:template match="para/command">

57
README.BLFS
View file

@ -177,7 +177,7 @@ $Id$
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,55 +193,8 @@ $Id$
4.5 XORG7
The generated scripts for Xorg7 pseudo-packages don't have support for
$SRC_ARCHIVE nor MD5 checking.
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
$SRC_ARCHIVE. If you have previously downloaded the packages, you must edit
the scripts to use your local packages.
4.6 PATCHES
@ -257,9 +210,7 @@ done
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.