From a65fcb24427a8ac0cc89fb3469601721532bcd5d Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Wed, 23 Apr 2008 12:46:41 +0000
Subject: Fixed kbd to build and install setkeycodes, getkeycodes and
 resizecons. Also move loadkeys to /bin from /usr/bin for use by the
 bootscripts. Thanks, Greg Schafer.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8536 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 11 +++++++++++
 chapter06/kbd.xml       | 16 ++++++++++++++--
 general.ent             |  4 ++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 245a14f97..6c2c58080 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2008-04-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Fixed kbd to install getkeycodes,
+	  setkeycodes and resizecons. Also moved loadkeys to /bin from
+          /usr/bin. Thanks, Greg Schafer.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-04-22</para>
       <itemizedlist>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index fce93840d..235ad4990 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -49,6 +49,17 @@
     <para>After patching, the Backspace key generates the character with code 127,
     and the Delete key generates a well-known escape sequence.</para>
 
+    <para>In this version of Kbd the instructions to build
+    <filename>getkeycodes</filename>, <filename>setkeycodes</filename> and
+    <filename>resizecons</filename> do not get passed over to the generated
+    <filename>Makefile</filename> as they should. So that these programs
+    are built and installed add two lines to the top of
+    <filename>src/Makefile.in</filename>:
+    </para>
+
+<screen><userinput remap="pre">sed -i -e '1i KEYCODES_PROGS = @KEYCODES_PROGS@' \
+    -e '1i RESIZECONS_PROGS = @RESIZECONS_PROGS@' src/Makefile.in</userinput></screen>
+
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd</userinput></screen>
@@ -85,12 +96,13 @@
     </note>
 
     <para>Some of the scripts in the LFS-Bootscripts package depend on
-    <command>kbd_mode</command>, <command>openvt</command>, and
+    <command>kbd_mode</command>, <command>loadkeys</command>,
+    <command>openvt</command>, and
     <command>setfont</command>.  As <filename class="directory">/usr</filename>
     may not be available during the early stages of booting, those binaries
     need to be on the root partition:</para>
 
-<screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen>
+<screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin</userinput></screen>
 
   </sect2>
 
diff --git a/general.ent b/general.ent
index d63db5eb4..0c23bf567 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20080422">
-<!ENTITY releasedate "April 22, 2008">
+<!ENTITY version "SVN-20080423">
+<!ENTITY releasedate "April 23, 2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
-- 
cgit v1.2.3-54-g00ecf