Author: dnicholson
Date: 2007-05-31 01:26:14 -0600 (Thu, 31 May 2007)
New Revision: 6798
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/installing/x7app.xml
trunk/BOOK/x/installing/x7data.xml
trunk/BOOK/x/installing/x7driver.xml
trunk/BOOK/x/installing/x7font.xml
trunk/BOOK/x/installing/x7lib.xml
trunk/BOOK/x/installing/x7proto.xml
trunk/BOOK/x/installing/x7util.xml
trunk/BOOK/x/installing/xorg7.xml
trunk/auxfiles/xorg/app-7.2.wget
trunk/auxfiles/xorg/data-7.2.wget
trunk/auxfiles/xorg/driver-7.2.wget
Log:
Comment out the unwanted packages in the Xorg wget lists
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2007-05-31 07:26:12 UTC
(rev 6797)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2007-05-31 07:26:14 UTC
(rev 6798)
@@ -53,6 +53,11 @@
<para>[dnicholson] - Streamlined the commands for each Xorg
section.</para>
</listitem>
+ <listitem>
+ <para>[dnicholson] - Commented out the sun video drivers and
+ deprecated modules in the Xorg wget lists and changed the
+ download commands to support the comments.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/x/installing/x7app.xml
===================================================================
--- trunk/BOOK/x/installing/x7app.xml 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/BOOK/x/installing/x7app.xml 2007-05-31 07:26:14 UTC (rev 6798)
@@ -96,17 +96,14 @@
<screen><userinput>wget &files-anduin;/xorg/app-&xorg7-version;.wget &&
mkdir app &&
cd app &&
-wget -B http://xorg.freedesktop.org/releases/individual/app/ \
- -i ../app-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../app-&xorg7-version;.wget | wget -i- \
+ -B
http://xorg.freedesktop.org/releases/individual/app/</userinput></screen>
</sect2>
<sect2 role="installation">
<title>Installation of Xorg Applications</title>
- <warning><para>The <application>mkcfm</application> package is
- deprecated and should not be installed.</para></warning>
-
<para>Install the applications by running the following commands for each
package:</para>
Modified: trunk/BOOK/x/installing/x7data.xml
===================================================================
--- trunk/BOOK/x/installing/x7data.xml 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/BOOK/x/installing/x7data.xml 2007-05-31 07:26:14 UTC (rev 6798)
@@ -75,18 +75,14 @@
<screen><userinput>wget &files-anduin;/xorg/data-&xorg7-version;.wget
&&
mkdir data &&
cd data &&
-wget -B http://xorg.freedesktop.org/releases/individual/data/ \
- -i ../data-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../data-&xorg7-version;.wget | wget -i- \
+ -B
http://xorg.freedesktop.org/releases/individual/data/</userinput></screen>
</sect2>
<sect2 role="installation">
<title>Installation of Xorg Data</title>
- <warning><para>The <application>xkbdata</application> package is
- deprecated and should not be installed. It has been replaced by
- <xref linkend="xkeyboard-config"/>.</para></warning>
-
<para>Compile the selected packages with the following commands:</para>
<screen><userinput>./configure $XORG_CONFIG &&
Modified: trunk/BOOK/x/installing/x7driver.xml
===================================================================
--- trunk/BOOK/x/installing/x7driver.xml 2007-05-31 07:26:12 UTC (rev
6797)
+++ trunk/BOOK/x/installing/x7driver.xml 2007-05-31 07:26:14 UTC (rev
6798)
@@ -77,8 +77,8 @@
<screen><userinput>wget &files-anduin;/xorg/driver-&xorg7-version;.wget
&&
mkdir driver &&
cd driver &&
-wget -B http://xorg.freedesktop.org/releases/individual/driver/ \
- -i ../driver-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../driver-&xorg7-version;.wget | wget -i- \
+ -B
http://xorg.freedesktop.org/releases/individual/driver/</userinput></screen>
</sect2>
@@ -90,7 +90,8 @@
for an x86 PC as the Sun drivers will expect to see SPARC symbols
exported from the kernel. Failure to follow this warning will result
in a display lockup, which requires a hard reboot, when configuring
- <application>Xorg</application> for the first time.</para></warning>
+ <application>Xorg</application> for the first time. For this reason,
+ these drivers have been commented out in the wget file.</para></warning>
<para>Install the drivers by running the following commands for each
package:</para>
Modified: trunk/BOOK/x/installing/x7font.xml
===================================================================
--- trunk/BOOK/x/installing/x7font.xml 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/BOOK/x/installing/x7font.xml 2007-05-31 07:26:14 UTC (rev 6798)
@@ -72,8 +72,8 @@
<screen><userinput>wget &files-anduin;/xorg/font-&xorg7-version;.wget
&&
mkdir font &&
cd font &&
-wget -B http://xorg.freedesktop.org/releases/individual/font/ \
- -i ../font-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../font-&xorg7-version;.wget | wget -i- \
+ -B
http://xorg.freedesktop.org/releases/individual/font/</userinput></screen>
</sect2>
Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/BOOK/x/installing/x7lib.xml 2007-05-31 07:26:14 UTC (rev 6798)
@@ -99,8 +99,8 @@
<screen><userinput>wget &files-anduin;/xorg/lib-&xorg7-version;.wget &&
mkdir lib &&
cd lib &&
-wget -B http://xorg.freedesktop.org/releases/individual/lib/ \
- -i ../lib-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../lib-&xorg7-version;.wget | wget -i- \
+ -B
http://xorg.freedesktop.org/releases/individual/lib/</userinput></screen>
</sect2>
Modified: trunk/BOOK/x/installing/x7proto.xml
===================================================================
--- trunk/BOOK/x/installing/x7proto.xml 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/BOOK/x/installing/x7proto.xml 2007-05-31 07:26:14 UTC (rev 6798)
@@ -75,8 +75,8 @@
<screen><userinput>wget &files-anduin;/xorg/proto-&xorg7-version;.wget
&&
mkdir proto &&
cd proto &&
-wget -B http://xorg.freedesktop.org/releases/individual/proto/ \
- -i ../proto-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../proto-&xorg7-version;.wget | wget -i- \
+ -B
http://xorg.freedesktop.org/releases/individual/proto/</userinput></screen>
</sect2>
Modified: trunk/BOOK/x/installing/x7util.xml
===================================================================
--- trunk/BOOK/x/installing/x7util.xml 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/BOOK/x/installing/x7util.xml 2007-05-31 07:26:14 UTC (rev 6798)
@@ -77,8 +77,8 @@
<screen><userinput>wget &files-anduin;/xorg/util-&xorg7-version;.wget
&&
mkdir util &&
cd util &&
-wget -B http://xorg.freedesktop.org/releases/individual/util/ \
- -i ../util-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../util-&xorg7-version;.wget | wget -i- \
+ -B
http://xorg.freedesktop.org/releases/individual/util/</userinput></screen>
</sect2>
Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/BOOK/x/installing/xorg7.xml 2007-05-31 07:26:14 UTC (rev 6798)
@@ -60,7 +60,9 @@
<para>Even if you intend to download only the necessary packages, you
should download the wget file lists. The list of files are ordered by
dependency, and the package versions listed in the files are known to
- work well with each other. Newer packages are likely intended for the
+ work well with each other. Further, the wget file lists contain comments
+ for specific packages that are deprecated or are not recommended to
+ install. Newer packages are likely intended for the
next release of <application>Xorg</application> and have already proved
to be incompatible with current versions of software installed in BLFS.
The installed size of <application>Xorg</application> can be reduced
@@ -81,7 +83,7 @@
all packages in a wget file list:</para>
<screen>bash -e #exit on all errors
-for package in $(cat ../wgetlist.wget)
+for package in $(grep -v '^#' ../wgetlist.wget)
do
packagedir=$(echo $package | sed 's/.tar.bz2//')
tar -xf $package
Modified: trunk/auxfiles/xorg/app-7.2.wget
===================================================================
--- trunk/auxfiles/xorg/app-7.2.wget 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/auxfiles/xorg/app-7.2.wget 2007-05-31 07:26:14 UTC (rev 6798)
@@ -10,7 +10,8 @@
ico-1.0.1.tar.bz2
lbxproxy-1.0.1.tar.bz2
listres-1.0.1.tar.bz2
-mkcfm-1.0.1.tar.bz2
+# mkcfm has been deprecated in Xorg-7.2
+#mkcfm-1.0.1.tar.bz2
mkfontdir-1.0.2.tar.bz2
mkfontscale-1.0.3.tar.bz2
oclock-1.0.1.tar.bz2
Modified: trunk/auxfiles/xorg/data-7.2.wget
===================================================================
--- trunk/auxfiles/xorg/data-7.2.wget 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/auxfiles/xorg/data-7.2.wget 2007-05-31 07:26:14 UTC (rev 6798)
@@ -1,2 +1,4 @@
xcursor-themes-1.0.1.tar.bz2
-xkbdata-1.0.1.tar.bz2
+# xkbdata has been deprecated for Xorg-7.2.
+# xkeyboard-config is preferred.
+#xkbdata-1.0.1.tar.bz2
Modified: trunk/auxfiles/xorg/driver-7.2.wget
===================================================================
--- trunk/auxfiles/xorg/driver-7.2.wget 2007-05-31 07:26:12 UTC (rev 6797)
+++ trunk/auxfiles/xorg/driver-7.2.wget 2007-05-31 07:26:14 UTC (rev 6798)
@@ -52,13 +52,15 @@
xf86-video-siliconmotion-1.4.2.tar.bz2
xf86-video-sis-0.9.3.tar.bz2
xf86-video-sisusb-0.8.1.tar.bz2
-xf86-video-sunbw2-1.1.0.tar.bz2
-xf86-video-suncg14-1.1.0.tar.bz2
-xf86-video-suncg3-1.1.0.tar.bz2
-xf86-video-suncg6-1.1.0.tar.bz2
-xf86-video-sunffb-1.1.0.tar.bz2
-xf86-video-sunleo-1.1.0.tar.bz2
-xf86-video-suntcx-1.1.0.tar.bz2
+# The sun video drivers cause problems on x86. Uncomment
+# them if the appropriate SPARC architecture is available
+#xf86-video-sunbw2-1.1.0.tar.bz2
+#xf86-video-suncg14-1.1.0.tar.bz2
+#xf86-video-suncg3-1.1.0.tar.bz2
+#xf86-video-suncg6-1.1.0.tar.bz2
+#xf86-video-sunffb-1.1.0.tar.bz2
+#xf86-video-sunleo-1.1.0.tar.bz2
+#xf86-video-suntcx-1.1.0.tar.bz2
xf86-video-tdfx-1.3.0.tar.bz2
xf86-video-tga-1.1.0.tar.bz2
xf86-video-trident-1.2.3.tar.bz2
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
