Changeset 1718e20 for BOOK/final-system/common

Timestamp:

May 23, 2011, 3:04:49 PM (13 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

cfb2026a

Parents:

30a199c (diff), 1ac2d0c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/final-system/common/kbd.xml

Location:

BOOK/final-system/common

Files:

• glib.xml (added)
• kbd.xml (modified) (4 diffs)
• pkg-config.xml (modified) (1 diff)
• xz.xml (modified) (1 diff)

BOOK/final-system/common/kbd.xml

@@ -26 +26 @@
     <title>Installation of Kbd</title>
 
+    <para os="p1">Apply the following patch to fix a typo in es.po:</para>
+
+    <screen os="p2"><userinput>patch -Np1 -i ../&kbd-espo-patch;</userinput></screen>
+
     <para os="a">Prepare Kbd for compilation:</para>
 
@@ -56 +60 @@
 
       <seglistitem>
-        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbd_mode,
-        kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
+        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo,
+        kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
         (link to psfxtable), psfgettable (link to psfxtable), psfstriptable
         (link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
-        setleds, setmetamode, showconsolefont, showkey, unicode_start, and
-        unicode_stop</seg>
+        setleds, setmetamode, setvtrgb, showconsolefont, showkey,
+        unicode_start, and unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
         /usr/share/keymaps, /usr/share/unimaps</seg>
@@ -118 +122 @@
           <indexterm zone="ch-system-kbd getkeycodes">
             <primary sortas="b-getkeycodes">getkeycodes</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kbdinfo">
+        <term><command>kbdinfo</command></term>
+        <listitem>
+          <para>Obtains information about the console</para>
+          <indexterm zone="ch-system-kbd kbdinfo">
+            <primary sortas="b-kbdinfo">kbdinfo</primary>
           </indexterm>
         </listitem>
@@ -276 +290 @@
       </varlistentry>
 
+      <varlistentry id="setvtrgb">
+        <term><command>setvtrgb</command></term>
+        <listitem>
+          <para>Sets the virtal terminal RGB colors</para>
+          <indexterm zone="ch-system-kbd setvtrgb">
+            <primary sortas="b-setvtrgb">setvtrgb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="showconsolefont">
         <term><command>showconsolefont</command></term>

BOOK/final-system/common/pkg-config.xml

@@ -28 +28 @@
     <para os="a">Prepare Pkg-config for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
+    GLIB_LIBS="-lglib-2.0" \
+    ./configure --prefix=/usr</userinput></screen>
+
+    <variablelist os="bb">
+      <title>The meaning of the new configure option:</title>
+
+      <varlistentry>
+        <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"</parameter></term>
+        <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
+        <listitem>
+          <para>Pkg-config no longer comes with Glib and because Pkg-config
+        has not been installed itself it needs to be told where Glib is.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para os="c">Compile the package:</para>

BOOK/final-system/common/xz.xml

@@ -36 +36 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">Install the programs:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-    <para os="g">Move the <filename>xz</filename> binary, and several symlinks
+    <para os="e">To test the results, issue:
+    <userinput>make check</userinput>.</para>
+
+
+    <para os="f">Install the programs:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+    <para os="h">Move the <filename>xz</filename> binary, and several symlinks
     that point to it, into the /bin directory:</para>
 
-<screen os="h"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
-
-    <para os="i">Move the static libraries to the proper location:</para>
-
-<screen os="j"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
+<screen os="i"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
 
   </sect2>