BLFS: Added SRC_ARCHIVE and resume support to Xorg7 packages.
This commit is contained in:
parent
5fb652f737
commit
a70c289526
2 changed files with 40 additions and 6 deletions
|
@ -179,9 +179,30 @@ cd $UNPACKDIR
</xsl:text>
|
|||
<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-patch"/>
|
||||
<xsl:text>SRC_ARCHIVE=$SRC_ARCHIVE
|
||||
FTP_SERVER=$FTP_SERVER
</xsl:text>
|
||||
<xsl:apply-templates select=".//screen" mode="sect-ver"/>
|
||||
<xsl:text>mkdir -p ${section}
cd ${section}
</xsl:text>
|
||||
<xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para" mode="xorg7-patch"/>
|
||||
<xsl:text>for line in $(grep -v '^#' ../${sect-ver}.wget) ; do
|
||||
if [[ ! -f $line ]] ; then
|
||||
if [[ -f $SRC_ARCHIVE/Xorg/$section/$line ]] ; then
|
||||
cp $SRC_ARCHIVE/Xorg/$section/$line $line
|
||||
elif [[ -f $SRC_ARCHIVE/Xorg/$line ]] ; then
|
||||
cp $SRC_ARCHIVE/Xorg/$line $line
|
||||
elif [[ -f $SRC_ARCHIVE/$section/$line ]] ; then
|
||||
cp $SRC_ARCHIVE/$section/$line $line
|
||||
elif [[ -f $SRC_ARCHIVE/$line ]] ; then
|
||||
cp $SRC_ARCHIVE/$line $line
|
||||
else
|
||||
wget ${FTP_SERVER}conglomeration/Xorg/$line || \
|
||||
wget http://xorg.freedesktop.org/releases/individual/util/$line
|
||||
fi
|
||||
fi
|
||||
done
|
||||
md5sum -c ../${sect-ver}.md5
|
||||
cp ../${sect-ver}.wget ../${sect-ver}.wget.orig
|
||||
cp ../${sect-ver}.md5 ../${sect-ver}.md5.orig
</xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:when test="@role = 'installation'">
|
||||
<xsl:text>for package in $(grep -v '^#' ../${sect-ver}.wget) ; do
|
||||
|
@ -191,7 +212,11 @@ cd $UNPACKDIR
</xsl:text>
|
|||
<xsl:apply-templates select=".//screen | .//para/command"/>
|
||||
<xsl:text> cd ..
|
||||
rm -rf $packagedir
|
||||
done
</xsl:text>
|
||||
sed -i "/${package}/d" ../${sect-ver}.wget
|
||||
sed -i "/${package}/d" ../${sect-ver}.md5
|
||||
done
|
||||
mv ../${sect-ver}.wget.orig ../${sect-ver}.wget
|
||||
mv ../${sect-ver}.md5.orig ../${sect-ver}.md5
</xsl:text>
|
||||
<xsl:if test="$sudo = 'y'">
|
||||
<xsl:text>sudo /sbin/</xsl:text>
|
||||
</xsl:if>
|
||||
|
@ -433,7 +458,9 @@ done
</xsl:text>
|
|||
</xsl:template>
|
||||
|
||||
<xsl:template match="screen" mode="sect-ver">
|
||||
<xsl:text>sect-ver=</xsl:text>
|
||||
<xsl:text>section=</xsl:text>
|
||||
<xsl:value-of select="substring-before(substring-after(string(),'mkdir '),' &')"/>
|
||||
<xsl:text>
sect-ver=</xsl:text>
|
||||
<xsl:value-of select="substring-before(substring-after(string(),'-c ../'),'.md5')"/>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:template>
|
||||
|
|
11
README.BLFS
11
README.BLFS
|
@ -196,10 +196,17 @@ $Id$
|
|||
|
||||
4.5 XORG7
|
||||
|
||||
The generated scripts for Xorg7 pseudo-packages don't have support for
|
||||
$SRC_ARCHIVE. If you have previously downloaded the packages, you must edit
|
||||
The generated scripts for Xorg7 pseudo-packages have $SRC_ARCHIVE
|
||||
support for individual packages, but not for patches nor *.wget and *.md5
|
||||
files.
|
||||
|
||||
If you have previously downloaded the patches, you must edit
|
||||
the scripts to use your local packages.
|
||||
|
||||
The *.wget and *.md5 files should be downladed always from inside
|
||||
the scripts to be sure that the most current individual packages are
|
||||
used. Thus don't reuse previouly existing ones.
|
||||
|
||||
4.6 PATCHES
|
||||
|
||||
By default, all required patches will be downloaded from the NET.
|
||||
|
|
Reference in a new issue