diff --git a/BLFS/libs/scripts.xsl b/BLFS/libs/scripts.xsl index bb54b23..be7e09d 100644 --- a/BLFS/libs/scripts.xsl +++ b/BLFS/libs/scripts.xsl @@ -184,7 +184,7 @@ FTP_SERVER=$FTP_SERVER mkdir -p ${section} cd ${section} - for line in $(grep -v '^#' ../${sect-ver}.wget) ; do + 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} @@ -200,23 +200,23 @@ FTP_SERVER=$FTP_SERVER fi fi done -md5sum -c ../${sect-ver}.md5 -cp ../${sect-ver}.wget ../${sect-ver}.wget.orig -cp ../${sect-ver}.md5 ../${sect-ver}.md5.orig +md5sum -c ../${sect_ver}.md5 +cp ../${sect_ver}.wget ../${sect_ver}.wget.orig +cp ../${sect_ver}.md5 ../${sect_ver}.md5.orig - for package in $(grep -v '^#' ../${sect-ver}.wget) ; do + for package in $(grep -v '^#' ../${sect_ver}.wget) ; do packagedir=$(echo $package | sed 's/.tar.bz2//') tar -xf ${package} cd ${packagedir} cd .. rm -rf ${packagedir} - sed -i "/${package}/d" ../${sect-ver}.wget - sed -i "/${package}/d" ../${sect-ver}.md5 + 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 +mv ../${sect_ver}.wget.orig ../${sect_ver}.wget +mv ../${sect_ver}.md5.orig ../${sect_ver}.md5 sudo /sbin/ @@ -460,7 +460,7 @@ mv ../${sect-ver}.md5.orig ../${sect-ver}.md5 section= - sect-ver= + sect_ver= diff --git a/README.BLFS b/README.BLFS index 430f9ae..ba8977b 100644 --- a/README.BLFS +++ b/README.BLFS @@ -184,13 +184,17 @@ $Id$ 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 - packages by hand. + be fixed. You must rename it as the sub-package to be installed and + edit it to use the proper commads for that sub-package. - 4.4 GCC, JDK, Sane, and KDE-multimedia + You may need to create additional scripts for these sub-package + dependencies, if any. + + 4.4 GCC, JDK, Sane, and KDE-multimedia, freetype2, MesaLib and others On the pages for these packages, the BLFS book actually has instructions - to install two packages. You must edit the scripts to fix this. + to download and install two or more packages. You must edit the scripts to + fix this. We will try to fix some of them, but this may not be possible. @@ -207,6 +211,9 @@ $Id$ the scripts to be sure that the most current individual packages are used. Thus don't reuse previouly existing ones. + In the script for xorg7-font, be sure to move the fonts directories + symlinks creation to after the "for ... done" loop. + 4.6 PATCHES By default, all required patches will be downloaded from the NET.