Author: krejzi
Date: Sun Mar 24 08:54:37 2013
New Revision: 11124
Log:
Misc fixes to the book.
Modified:
trunk/BOOK/general/prog/openjdk.xml
trunk/BOOK/multimedia/videoutils/vlc.xml
trunk/BOOK/networking/netprogs/wpa_supplicant.xml
Modified: trunk/BOOK/general/prog/openjdk.xml
==============================================================================
--- trunk/BOOK/general/prog/openjdk.xml Sun Mar 24 08:41:54 2013 (r11123)
+++ trunk/BOOK/general/prog/openjdk.xml Sun Mar 24 08:54:37 2013 (r11124)
@@ -281,27 +281,28 @@
</itemizedlist>
<bridgehead renderas="sect3">OpenJDK Dependencies</bridgehead>
- <bridgehead renderas="sect4">Optional Runtime Dependencies (required for
- source installation)</bridgehead>
- <para role="optional">
+ <bridgehead renderas="sect4">Runtime Dependencies (required for
+ binary installation)</bridgehead>
+ <para role="required">
<xref linkend="cacerts"/>,
<xref linkend="cups"/>,
<xref linkend="gtk3"/>,
<xref linkend="giflib"/>,
- <xref linkend="pulseaudio"/>,
- <xref linkend="xorg7-lib"/> and
- <xref linkend="nspr"/>.
+ <xref linkend="nspr"/>,
+ <xref linkend="pulseaudio"/> and
+ <xref linkend="xorg7-lib"/>
</para>
<bridgehead renderas="sect4">Additional Requirements
- (for source build, including optional requirements)</bridgehead>
- <para role="required">
- <xref linkend="apache-ant"/>,
- <xref linkend="cpio"/>,
- <xref linkend="unzip"/>,
- <xref linkend="wget"/>,
- <xref linkend="which"/>, and
- <xref linkend="zip"/></para>
+ (for source build, including runtime dependencies)</bridgehead>
+ <para role="optional">
+ <xref linkend="apache-ant"/>,
+ <xref linkend="cpio"/>,
+ <xref linkend="unzip"/>,
+ <xref linkend="wget"/>,
+ <xref linkend="which"/> and
+ <xref linkend="zip"/>
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/openjdk"/></para>
Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml Sun Mar 24 08:41:54 2013
(r11123)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml Sun Mar 24 08:54:37 2013
(r11124)
@@ -229,9 +229,10 @@
</para>
<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-opencv_fixes-1.patch
&&
+sed "s@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g" -i configure.ac &&
./bootstrap &&
-sed -i "s|LDFLAGS_sid)|& -L/usr/lib/sidplay/builders|" \
- modules/demux/Makefile.in &&
+sed -e "s@LDFLAGS_sid)@& -L/usr/lib/sidplay/builders@g" \
+ -i modules/demux/Makefile.in &&
./configure --prefix=/usr --disable-lua &&
make</userinput></screen>
@@ -260,8 +261,9 @@
</para>
<para>
- <command>sed -i ...</command>: This command fixes building against the
- <application>Sidplay2</application> package.
+ <command>sed -e ...</command>: First sed fixes building against the
+ <application>Sidplay2</application> and second sed fixes bootstrap
+ with <application>Automake</application> 1.13.
</para>
<para>
Modified: trunk/BOOK/networking/netprogs/wpa_supplicant.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/wpa_supplicant.xml Sun Mar 24 08:41:54
2013 (r11123)
+++ trunk/BOOK/networking/netprogs/wpa_supplicant.xml Sun Mar 24 08:54:37
2013 (r11124)
@@ -271,16 +271,16 @@
<para>
To connect to an access point that uses a password, you need to put
the pre-shared key in <filename>
-
/etc/sysconfig/wpa_supplicant-<replaceable>wlan0</replaceable>.conf</filename>.
+
/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
SSID is the string that the access point/router transmits to
identify itself. Run the following command as the
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>wpa_passphrase <replaceable>SSID</replaceable>
<replaceable>SECRET_PASSWORD</replaceable> >
/etc/sysconfig/wpa_supplicant-<replaceable>wlan0</replaceable>.conf</userinput></screen>
+<screen role="root"><userinput>wpa_passphrase <replaceable>SSID</replaceable>
<replaceable>SECRET_PASSWORD</replaceable> >
/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</userinput></screen>
<para>
-
<filename>/etc/sysconfig/wpa_supplicant-<replaceable>wlan0</replaceable>.conf
+
<filename>/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf
</filename> can hold the details of several access points. When
<command>wpa_supplicant</command> is started, it will scan for the
SSIDs it can see and choose the appropriate password to connect.
@@ -289,7 +289,7 @@
<para>
If you want to connect to an access point that isn't password
protected, put an entry like this in <filename>
-
/etc/sysconfig/wpa_supplicant-<replaceable>wlan0</replaceable>.conf</filename>.
+
/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
Replace "Some-SSID" with the SSID of the access point/router.
</para>
@@ -327,12 +327,12 @@
If your router/access point uses DHCP to allocate IP addresses, you
can install <xref linkend="dhcp"/> client and use it to
automatically obtain network addresses. Create the
- <filename>/etc/sysconfig/ifconfig-<replaceable>wlan0</replaceable>
+ <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
</filename> by running the following command as the
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>cat >
/etc/sysconfig/ifconfig.<replaceable>wlan0</replaceable> << "EOF"
+<screen role="root"><userinput>cat >
/etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> << "EOF"
<literal>ONBOOT="yes"
IFACE="<replaceable>wlan0</replaceable>"
SERVICE="wpa"
@@ -356,12 +356,12 @@
<para>
If you prefer <xref linkend="dhcpcd"/> instead of
<xref linkend="dhcp"/> client, then create the
- <filename>/etc/sysconfig/ifconfig-<replaceable>wlan0</replaceable>
+ <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
</filename> by running the following command as the
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>cat >
/etc/sysconfig/ifconfig.<replaceable>wlan0</replaceable> << "EOF"
+<screen role="root"><userinput>cat >
/etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> << "EOF"
<literal>ONBOOT="yes"
IFACE="<replaceable>wlan0</replaceable>"
SERVICE="wpa"
@@ -377,12 +377,12 @@
<para>
Alternatively, if you use static addresses on your local network,
then create the
- <filename>/etc/sysconfig/ifconfig-<replaceable>wlan0</replaceable>
+ <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
</filename> by running the following command as the
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>cat >
/etc/sysconfig/ifconfig.<replaceable>wlan0</replaceable> << "EOF"
+<screen role="root"><userinput>cat >
/etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> << "EOF"
<literal>ONBOOT="yes"
IFACE="<replaceable>wlan0</replaceable>"
SERVICE="wpa"
@@ -403,11 +403,16 @@
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>ifup
<replaceable>wlan0</replaceable></userinput></screen>
+<screen role="root"><userinput>ifup
<replaceable>wifi0</replaceable></userinput></screen>
<para>
Replace <replaceable>wlan0</replaceable> with the correct
- wireless interface.
+ wireless interface and <replaceable>wifi0</replaceable>
+ with desired name for the configuration file. Please note
+ that <filename>wpa_supplicant-*.conf</filename> and
+ <filename>ifconfig.*</filename> configuration files need
+ to have identical names, ie both contain
+ <replaceable>wifi0</replaceable> in their name.
</para>
</sect3>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
