The attached patch is the result of svn diff against the BLFS profile
trunk.
If fixes some typos, and the gtk-doc problem.
Some of the differences are specific to my system, but those are
annotated.
I hope it is of some value.
--
Regards
Alex
The email address above is a spamtrap.
alex@ the same domain will reach me
Index: trunk/chapter10/intltool.xml
===================================================================
--- trunk/chapter10/intltool.xml (revision 1804)
+++ trunk/chapter10/intltool.xml (working copy)
@@ -14,7 +14,7 @@
<package name="intltool" version="&intltool-version;">
<packageinfo>
<requires>
- <name>xml-parser</name>
+ <name>XML-Parser</name>
</requires>
</packageinfo>
<stage name="Unpacking">
Index: trunk/chapter10/gtk-doc.xml
===================================================================
Adds xmlcatalog commands to fix breakage.
--- trunk/chapter10/gtk-doc.xml (revision 1804)
+++ trunk/chapter10/gtk-doc.xml (working copy)
@@ -4,10 +4,12 @@
<!ENTITY % general_entities SYSTEM "../config/general.ent">
<!ENTITY % package_entities SYSTEM "../config/packages/ch10.ent">
<!ENTITY % config_entities SYSTEM "../config/config.ent">
+<!ENTITY % docbook_entities SYSTEM "../config/packages/ch44.ent">
%general_entities;
%package_entities;
%config_entities;
+%docbook_entities;
]>
<alfs>
@@ -36,6 +38,18 @@
<stageinfo>
<base>&build_dir;/>k-doc-directory;</base>
</stageinfo>
+ <execute command="xmlcatalog">
+ <param>--noout --add "rewriteSystem"</param>
+ <param>"http://docbook.sourceforge.net/release/xsl/current/";</param>
+ <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+ <param>/etc/xml/catalog</param>
+ </execute>
+ <execute command="xmlcatalog">
+ <param>--noout --add "rewriteURI"</param>
+ <param>"http://docbook.sourceforge.net/release/xsl/current";</param>
+ <param>"/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"</param>
+ <param>/etc/xml/catalog</param>
+ </execute>
<configure>
<param>--prefix=/usr</param>
</configure>
Index: trunk/chapter10/xscreensaver.xml
===================================================================
Adds missing dependancies
--- trunk/chapter10/xscreensaver.xml (revision 1804)
+++ trunk/chapter10/xscreensaver.xml (working copy)
@@ -12,6 +12,10 @@
]>
<alfs>
<package name="xscreensaver" version="&xscreensaver-version;">
+ <stageinfo>
+ <requires>bc</requires>
+ <requires>libglade></requires>
+ </stageinfo>
<stage name="Unpacking.">
<unpack>
<archive>&packages_dir;/&xscreensaver-package;</archive>
Index: trunk/chapter12/perlmods/Net-DNS.xml
===================================================================
Fixes hang while waiting for user response
Uses new entity 'nameserver-tests', defined in config.ent
--- trunk/chapter12/perlmods/Net-DNS.xml (revision 1804)
+++ trunk/chapter12/perlmods/Net-DNS.xml (working copy)
@@ -30,7 +30,10 @@
<stageinfo>
<base>&build_dir;/&Net-DNS-directory;</base>
</stageinfo>
- <execute command="perl Makefile.PL" />
+ <execute command="echo">
+ <param>"&nameserver-tests;" |</param>
+ <param>perl Makefile.PL</param>
+ </execute>
<make />
<make>
<param>test</param>
Index: trunk/chapter14/dhclient.xml
===================================================================
Fixes missing entity
--- trunk/chapter14/dhclient.xml (revision 1804)
+++ trunk/chapter14/dhclient.xml (working copy)
@@ -5,10 +5,12 @@
<!ENTITY % package_entities SYSTEM "../config/packages/ch14.ent">
<!ENTITY % config_entities SYSTEM "../config/config.ent">
<!ENTITY % files SYSTEM "../config/files.ent">
+<!ENTITY % dhcp_entities SYSTEM "../config/packages/ch22.ent">
%general_entities;
%package_entities;
%config_entities;
+%dhcp_entities;
%files;
<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
Index: trunk/chapter33/gimp.xml
===================================================================
Fixes erroneous dependancy name
--- trunk/chapter33/gimp.xml (revision 1804)
+++ trunk/chapter33/gimp.xml (working copy)
@@ -20,7 +20,7 @@
<name>libart-lgpl</name>
</requires>
<requires>
- <name>xml-parser</name>
+ <name>XML-Parser</name>
</requires>
<utilizes>
<name>gimp-print</name>
Index: trunk/runit.sh
===================================================================
On my system, without this change dependancies are not located
--- trunk/runit.sh (revision 1804)
+++ trunk/runit.sh (working copy)
@@ -14,8 +14,8 @@
echo "<!ENTITY blfs-config '$CURRENTDIR/config'>" > config/files.ent
if [ -e /usr/bin/nALFS ]; then
- /usr/bin/nALFS -S -l -L nalfs.log BLFS.xml
+ /usr/bin/nALFS -l -L nalfs.log BLFS.xml
else
- /usr/local/bin/nALFS -S -l -L nalfs.log BLFS.xml
+ /usr/local/bin/nALFS -l -L nalfs.log BLFS.xml
fi
Index: trunk/config_standard/general.ent
===================================================================
Updated kernel version
Updated bootscripts version
--- trunk/config_standard/general.ent (revision 1804)
+++ trunk/config_standard/general.ent (working copy)
@@ -3,13 +3,13 @@
<!ENTITY blfs-version "svn-20050310-r3538">
<!-- directory containing the compressed packages -->
-<!ENTITY packages_dir "/mnt/src">
+<!ENTITY packages_dir "/root/blfs-packages">
<!-- directory in which the packages will be compiled -->
<!ENTITY build_dir "/usr/src">
<!-- kernel version -->
-<!ENTITY kernel-version "2.4.23">
+<!ENTITY kernel-version "2.6.10">
<!-- kernel directory -->
<!ENTITY kernel-directory "/var2/factory/linux-2.4.23">
@@ -50,6 +50,6 @@
<!ENTITY ldconfig "<execute command='/sbin/ldconfig' />">
-<!ENTITY blfs-bootscripts-version "20050310">
+<!ENTITY blfs-bootscripts-version "20050313">
<!ENTITY blfs-bootscripts-package "blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
<!ENTITY blfs-bootscripts-directory "blfs-bootscripts-&blfs-bootscripts-version;">
Index: trunk/config_standard/x/xorg/host.def
===================================================================
Copied from Beyond Linux From Scratch - Version svn-20050315
--- trunk/config_standard/x/xorg/host.def (revision 1804)
+++ trunk/config_standard/x/xorg/host.def (working copy)
@@ -1,14 +1,17 @@
/* Begin Xorg host.def file */
/* System Related Information. If you read and configure only one
- * section then it should be this one. The Intel architecture defaults are
- * set for a i686 and higher. Axp is for the Alpha architecture and Ppc is
- * for the Power PC. AMD64 is for the Opteron processor. Note that there have
- * been reports that the Ppc optimization line causes segmentation faults during
- * build. If that happens, try building without the DefaultGcc2PpcOpt line. ***********/
+ * section then it should be this one. The Intel architecture defaults
+ * are set for a i686 and higher. Axp is for the Alpha architecture
+ * and Ppc is for the Power PC. AMD64 is for the Opteron processor.
+ * Note that there have been reports that the Ppc optimization line
+ * causes segmentation faults during build. If that happens, try
+ * building without the DefaultGcc2PpcOpt line. ***********/
-/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
-/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing */
+/*#define DefaultGcc2i386Opt -O2 -fno-strength-reduce \
+ -fno-strict-aliasing -march=i686 */
+/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce \
+ -fno-strict-aliasing */
/* #define DefaultGcc2AxpOpt -O2 -mcpu=ev6 */
/* #define DefaultGcc2PpcOpt -O2 -mcpu=750 */
@@ -19,17 +22,17 @@
#define HasZlib YES
/*
- * Which drivers to build. When building a static server, each of these
- * will be included in it. When building the loadable server each of these
- * modules will be built.
+ * Which drivers to build. When building a static server, each of
+ * these will be included in it. When building the loadable server
+ * each of these modules will be built.
*
#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
neomagic i740 tdfx savage \
cirrus vmware tseng trident chips apm \
GlideDriver fbdev i128 \
- ati AgpGartDrivers DevelDrivers ark cyrix \
- siliconmotion \
- vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
+ ati AgpGartDrivers DevelDrivers ark \
+ cyrix siliconmotion vesa vga \
+ XF86OSCardDrivers XF86ExtraCardDrivers
*/
/*
@@ -37,8 +40,8 @@
*
#define XInputDrivers mouse keyboard acecad calcomp citron \
digitaledge dmc dynapro elographics \
- microtouch mutouch penmount spaceorb summa \
- wacom void magictouch aiptek
+ microtouch mutouch penmount spaceorb \
+ summa wacom void magictouch aiptek
*/
/* Most installs will only need this */
Index: trunk/config_standard/config.ent
===================================================================
Updated perl version
Added entity to simulate user input
--- trunk/config_standard/config.ent (revision 1804)
+++ trunk/config_standard/config.ent (working copy)
@@ -21,12 +21,14 @@
<!-- Perl Version -->
<!-- Needed for perl modules -->
-<!ENTITY perl-version "5.8.5">
+<!ENTITY perl-version "5.8.6">
+<!-- Change this to "no" if you do not wish to perform these tests -->
+<!ENTITY nameserver-tests "yes">
<!-- Java Implementation -->
<!-- Set so packages that utilize or depend on java will use either the binary (j2sdk-binary) or
source (j2sdk-source) version -->
-<!ENTITY j2sdk "j2sdk-source">
+<!ENTITY j2sdk "j2sdk-binary">
<!-- X Window System Implementation -->
<!-- XFree86 (xfree86) or X.org (xorg) -->
Index: trunk/config_standard/etc/vimrc
===================================================================
These are sensible defaults for my system
--- trunk/config_standard/etc/vimrc (revision 1804)
+++ trunk/config_standard/etc/vimrc (working copy)
@@ -1,7 +1,11 @@
" Begin /etc/vimrc
+set nocompatible
+set bs=2
set columns=80
+set background=dark
set wrapmargin=8
+syntax on
set ruler
" End /etc/vimrc
Index: trunk/config_standard/etc/sysconfig/mouse
===================================================================
System specific
--- trunk/config_standard/etc/sysconfig/mouse (revision 1804)
+++ trunk/config_standard/etc/sysconfig/mouse (working copy)
@@ -1,7 +1,7 @@
# Begin /etc/sysconfig/mouse
-MDEVICE="/dev/psaux"
-PROTOCOL="ps2"
+MDEVICE="/dev/ttyS0"
+PROTOCOL="mman"
GPMOPTS=""
# End /etc/sysconfig/mouse
Index: trunk/config_standard/packages/ch25.ent
===================================================================
Version update
--- trunk/config_standard/packages/ch25.ent (revision 1804)
+++ trunk/config_standard/packages/ch25.ent (working copy)
@@ -1,6 +1,6 @@
<!--************* packages for chapter 25 *************-->
-<!ENTITY xorg-version "6.8.1">
+<!ENTITY xorg-version "6.8.2">
<!ENTITY xorg-package "X11R&xorg-version;-src.tar.bz2">
<!ENTITY xorg-directory "xc">
Index: trunk/config_standard/packages/ch11.ent
===================================================================
Version increment - not in the book - original version not available at infozip
--- trunk/config_standard/packages/ch11.ent (revision 1804)
+++ trunk/config_standard/packages/ch11.ent (working copy)
@@ -19,7 +19,7 @@
<!ENTITY which-package "which-&which-version;.tar.gz">
<!ENTITY which-directory "which-&which-version;">
-<!ENTITY unzip-version "5.51">
+<!ENTITY unzip-version "5.52">
<!ENTITY unzip-package "unzip551.tar.gz">
<!ENTITY unzip-directory "unzip-&unzip-version;">
Index: trunk/config_standard/packages/ch19.ent
===================================================================
Version increment - not in the book - 4.2.6 no longer available
--- trunk/config_standard/packages/ch19.ent (revision 1804)
+++ trunk/config_standard/packages/ch19.ent (working copy)
@@ -8,7 +8,7 @@
<!ENTITY nmap-package "nmap-&nmap-version;.tar.bz2">
<!ENTITY nmap-directory "nmap-&nmap-version;">
-<!ENTITY whois-version "4.6.26">
+<!ENTITY whois-version "4.7.1">
<!ENTITY whois-package "whois_&whois-version;.tar.gz">
<!ENTITY whois-directory "whois-&whois-version;">
Index: trunk/chapter43/openjade.xml
===================================================================
Fixes typos
--- trunk/chapter43/openjade.xml (revision 1804)
+++ trunk/chapter43/openjade.xml (working copy)
@@ -82,9 +82,9 @@
<param>/etc/sgml/openjade-&openjade-version;.cat</param>
</execute>
<execute command="echo">
- <param>"SYSTEM \"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd\"; \</param>
- <param>\"/usr/share/xml/docbook/xml-dtd-4.3/docbookx.dtd\"" >> \</param>
- <param>/usr/share/sgml/openjade-1.3.2/catalog'</param>
+ <param>"SYSTEM \"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd\";</param>
+ <param>\"/usr/share/xml/docbook/xml-dtd-4.3/docbookx.dtd\"" >></param>
+ <param>/usr/share/sgml/openjade-1.3.2/catalog</param>
</execute>
</stage>
<stage name="Cleanup">
Index: trunk/chapter44/xml-dtd.xml
===================================================================
Fixes typo
--- trunk/chapter44/xml-dtd.xml (revision 1804)
+++ trunk/chapter44/xml-dtd.xml (working copy)
@@ -188,7 +188,7 @@
<param>/etc/xml/docbook</param>
</execute>
<execute command="xmlcatalog">
- <param>--noout --add "rewriteURI""</param>
+ <param>--noout --add "rewriteURI"</param>
<param>"http://www.oasis-open.org/docbook/xml/4.2";</param>
<param>"file:///usr/share/xml/docbook/xml-dtd-&xml-dtd-version;"</param>
<param>/etc/xml/docbook</param>
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
