Changeset 8538

Show
Ignore:
Timestamp:
04/23/08 10:34:48 (7 months ago)
Author:
jhuntwork
Message:

Merged r8536 and r8537 from trunk to jh branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/jh/BOOK/chapter01/changelog.xml

    r8535 r8538  
    3838 
    3939    <listitem> 
     40      <para>2008-04-23</para> 
     41      <itemizedlist> 
     42        <listitem> 
     43          <para>[jhuntwork] - Fixed behavior in kbd where man pages 
     44          for optional programs that aren't built are installed. 
     45          Thanks Greg Schafer for spotting this. 
     46          </para> 
     47        </listitem> 
     48        <listitem> 
     49          <para>[jhuntwork] - Fixed kbd to install getkeycodes, 
     50          setkeycodes and resizecons. Also moved loadkeys to /bin from 
     51          /usr/bin. Thanks, Greg Schafer.</para> 
     52        </listitem> 
     53      </itemizedlist> 
     54    </listitem> 
     55 
     56    <listitem> 
    4057      <para>2008-04-22</para> 
    4158      <itemizedlist> 

  • branches/jh/BOOK/chapter06/kbd.xml

    r8535 r8538  
    5050    and the Delete key generates a well-known escape sequence.</para> 
    5151 
     52    <para>In this version of Kbd the instructions to build 
     53    <filename>getkeycodes</filename>, <filename>setkeycodes</filename> and 
     54    <filename>resizecons</filename> do not get passed over to the generated 
     55    <filename>Makefile</filename> as they should. So that these programs 
     56    are built and installed add two lines to the top of 
     57    <filename>src/Makefile.in</filename>: 
     58    </para> 
     59 
     60<screen><userinput remap="pre">sed -i -e '1i KEYCODES_PROGS = @KEYCODES_PROGS@' \ 
     61    -e '1i RESIZECONS_PROGS = @RESIZECONS_PROGS@' src/Makefile.in</userinput></screen> 
     62 
     63    <para>This version of Kbd will also install man pages for optional programs 
     64    even if we don't use the <parameter>--enable-optional-progs</parameter> 
     65    option to build them. Fix this behavior:</para> 
     66 
     67<screen><userinput remap="pre">var=OPTIONAL_PROGS 
     68sed -i "s/ifdef $var/ifeq (\$($var),yes)/" man/Makefile.in 
     69unset var</userinput></screen> 
     70 
    5271    <para>Prepare Kbd for compilation:</para> 
    5372 
    …… 
    86105 
    87106    <para>Some of the scripts in the LFS-Bootscripts package depend on 
    88     <command>kbd_mode</command>, <command>openvt</command>, and 
     107    <command>kbd_mode</command>, <command>loadkeys</command>, 
     108    <command>openvt</command>, and 
    89109    <command>setfont</command>.  As <filename class="directory">/usr</filename> 
    90110    may not be available during the early stages of booting, those binaries 
    91111    need to be on the root partition:</para> 
    92112 
    93 <screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen> 
     113<screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin</userinput></screen> 
    94114 
    95115  </sect2> 

  • branches/jh/BOOK/general.ent

    r8533 r8538  
    11<?xml version="1.0" encoding="ISO-8859-1"?> 
    2 <!ENTITY version "SVN-JH-20080422"> 
    3 <!ENTITY releasedate "April 22, 2008"> 
     2<!ENTITY version "SVN-JH-20080423"> 
     3<!ENTITY releasedate "April 23, 2008"> 
    44<!ENTITY milestone "7.0"> 
    55<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->