Changeset 048bc8cc

Timestamp:

05/31/2007 07:26:14 AM (16 years ago)

Author:

Dan Nichilson <dnicholson@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, ken/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

1afe6c26

Parents:

8d237953

Message:

Comment out the unwanted packages in the Xorg wget lists

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6798 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/x7app.xml (modified) (2 diffs)
• x/installing/x7data.xml (modified) (2 diffs)
• x/installing/x7driver.xml (modified) (2 diffs)
• x/installing/x7font.xml (modified) (1 diff)
• x/installing/x7lib.xml (modified) (1 diff)
• x/installing/x7proto.xml (modified) (1 diff)
• x/installing/x7util.xml (modified) (1 diff)
• x/installing/xorg7.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -54 +54 @@
           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>

x/installing/x7app.xml

@@ -97 +97 @@
 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>
@@ -104 +104 @@
   <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

x/installing/x7data.xml

@@ -76 +76 @@
 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>
@@ -83 +83 @@
   <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>

x/installing/x7driver.xml

@@ -78 +78 @@
 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>
@@ -91 +91 @@
     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

x/installing/x7font.xml

@@ -73 +73 @@
 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>

x/installing/x7lib.xml

@@ -100 +100 @@
 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>

x/installing/x7proto.xml

@@ -76 +76 @@
 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>

x/installing/x7util.xml

@@ -78 +78 @@
 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>

x/installing/xorg7.xml

@@ -61 +61 @@
     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.
@@ -82 +84 @@
 
 <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//')