Dan Nicholson wrote:
> This patch attempts to streamline the Xorg sections
One more before I call it a day. This attempts to allow comments in the
wget lists. By doing so, we can comment out deprecated modules (mkcfm
and xkbdata in Xorg-7.2) without losing any information. Also, this
allows us to comment out the Sun video drivers since they break things
for the vast majority of people here. This also allows people to strip
down the build by simply commenting out packages they don't want in the
wget lists. Of course, that's not officially supported or anything.
The comments are made by adding the "#" as the first character on the
line. I thought I'd had luck before using HTML style comments with wget,
but it doesn't seem to work now. Instead, it's just an inverting grep
feeding to wget. Kind of ugly, but it seems to work.
This also removes the comments about the deprecated modules that Randy
wasn't too fond of.
--
Dan
BOOK/introduction/welcome/changelog.xml | 5 +++++
BOOK/x/installing/x7app.xml | 7 ++-----
BOOK/x/installing/x7data.xml | 8 ++------
BOOK/x/installing/x7driver.xml | 7 ++++---
BOOK/x/installing/x7font.xml | 4 ++--
BOOK/x/installing/x7lib.xml | 4 ++--
BOOK/x/installing/x7proto.xml | 4 ++--
BOOK/x/installing/x7util.xml | 4 ++--
BOOK/x/installing/xorg7.xml | 6 ++++--
auxfiles/xorg/app-7.2.wget | 3 ++-
auxfiles/xorg/data-7.2.wget | 4 +++-
11 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/BOOK/introduction/welcome/changelog.xml
b/BOOK/introduction/welcome/changelog.xml
index 75b10c0..32996d9 100644
--- a/BOOK/introduction/welcome/changelog.xml
+++ b/BOOK/introduction/welcome/changelog.xml
@@ -52,6 +52,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>
diff --git a/BOOK/x/installing/x7app.xml b/BOOK/x/installing/x7app.xml
index 76f1dbd..b352269 100644
--- a/BOOK/x/installing/x7app.xml
+++ b/BOOK/x/installing/x7app.xml
@@ -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>
diff --git a/BOOK/x/installing/x7data.xml b/BOOK/x/installing/x7data.xml
index 5fe0c51..5ac8b95 100644
--- a/BOOK/x/installing/x7data.xml
+++ b/BOOK/x/installing/x7data.xml
@@ -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 &&
diff --git a/BOOK/x/installing/x7driver.xml b/BOOK/x/installing/x7driver.xml
index fafef45..4aa93a7 100644
--- a/BOOK/x/installing/x7driver.xml
+++ b/BOOK/x/installing/x7driver.xml
@@ -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 @@ wget -B
http://xorg.freedesktop.org/releases/individual/driver/ \
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>
diff --git a/BOOK/x/installing/x7font.xml b/BOOK/x/installing/x7font.xml
index 8f083e6..52237ef 100644
--- a/BOOK/x/installing/x7font.xml
+++ b/BOOK/x/installing/x7font.xml
@@ -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>
diff --git a/BOOK/x/installing/x7lib.xml b/BOOK/x/installing/x7lib.xml
index a905962..449e996 100644
--- a/BOOK/x/installing/x7lib.xml
+++ b/BOOK/x/installing/x7lib.xml
@@ -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>
diff --git a/BOOK/x/installing/x7proto.xml b/BOOK/x/installing/x7proto.xml
index dcb717a..10bd887 100644
--- a/BOOK/x/installing/x7proto.xml
+++ b/BOOK/x/installing/x7proto.xml
@@ -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>
diff --git a/BOOK/x/installing/x7util.xml b/BOOK/x/installing/x7util.xml
index f1bc23c..0978073 100644
--- a/BOOK/x/installing/x7util.xml
+++ b/BOOK/x/installing/x7util.xml
@@ -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>
diff --git a/BOOK/x/installing/xorg7.xml b/BOOK/x/installing/xorg7.xml
index 31fd59c..5396542 100644
--- a/BOOK/x/installing/xorg7.xml
+++ b/BOOK/x/installing/xorg7.xml
@@ -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
diff --git a/auxfiles/xorg/app-7.2.wget b/auxfiles/xorg/app-7.2.wget
index afe402f..8b84bbe 100644
--- a/auxfiles/xorg/app-7.2.wget
+++ b/auxfiles/xorg/app-7.2.wget
@@ -10,7 +10,8 @@ iceauth-1.0.1.tar.bz2
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
diff --git a/auxfiles/xorg/data-7.2.wget b/auxfiles/xorg/data-7.2.wget
index ded8362..141e685 100644
--- a/auxfiles/xorg/data-7.2.wget
+++ b/auxfiles/xorg/data-7.2.wget
@@ -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
--
1.5.1.3
--
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
