Changeset 8548

Show
Ignore:
Timestamp:
06/03/08 15:51:14 (6 months ago)
Author:
bdubbs
Message:

Moved bootscripts and udev-config to BOOK
Updated Makefile to automatically generate bootscript and udev-config tarballs
Updated licesnse to be the same as BLFS

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BOOK

    • Property svn:ignore set to
      *.bz2
      *swp

  • trunk/BOOK/Makefile

    r8463 r8548  
    1313endif 
    1414 
    15 lfs: validxml profile-html 
     15lfs: maketar validxml profile-html 
    1616        @echo "Generating chunked XHTML files..." 
    1717        $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \ 
    …… 
    7979 
    8080validxml: tmpdir 
     81        @echo "Processing bootscripts..." 
     82        $(Q)sh process-scripts.sh $(RENDERTMP) 
    8183        @echo "Validating the book..." 
    8284        $(Q)xmllint --nonet --noent --xinclude --postvalid \ 
    8385          -o $(RENDERTMP)/lfs-full.xml index.xml 
     86        $(Q)rm -f appendices/*.script 
     87        $(Q)sh aux-file-data.sh $(RENDERTMP)/lfs-full.xml 
     88 
     89maketar: 
     90        @echo "Making tarballs..." 
     91        $(Q)sh make-aux-files.sh $(RENDERTMP) 
    8492 
    8593profile-html: validxml 
    …… 
    107115 
    108116.PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate \ 
    109          validxml wget-list 
     117         validxml wget-list maketar 

  • trunk/BOOK/chapter01/changelog.xml

    r8546 r8548  
    3838 
    3939    <listitem> 
     40      <para>2008-06-03</para> 
     41      <itemizedlist> 
     42        <listitem> 
     43          <para>[bdubbs] - Added udev-config scripts to appenices.</para> 
     44        </listitem> 
     45        <listitem> 
     46          <para>[bdubbs] - Added lfs-bootscripts to appenices.</para> 
     47        </listitem> 
     48        <listitem> 
     49          <para>[bdubbs] - Updated license to Creative Commons with 
     50          extracted code under the MIT license.</para> 
     51        </listitem> 
     52      </itemizedlist> 
     53    </listitem> 
     54 
     55    <listitem> 
    4056      <para>2008-05-23</para> 
    4157      <itemizedlist> 
    …… 
    6682        <listitem> 
    6783          <para>[jhuntwork] - Use -mtune=native for glibc. We don't 
    68          want our libc optimized for 486. It should be optimized 
    69          for the local machine.</para> 
     84          want our libc optimized for 486. It should be optimized 
     85          for the local machine.</para> 
    7086        </listitem> 
    7187        <listitem> 
    7288          <para>[jhuntwork] - Updated Autoconf to 2.62.</para> 
    7389        </listitem> 
    74        <listitem> 
    75          <para>[jhuntwork] - Updated E2fsprogs to 1.40.8. Fixes #2173. 
    76          </para> 
    77        </listitem> 
    78        <listitem> 
    79          <para>[jhuntwork] - Fixed behavior in kbd where man pages 
    80           for optional programs that aren't built are installed. 
    81          Thanks Greg Schafer for spotting this. 
    82          </para> 
    83        </listitem> 
     90        <listitem> 
     91          <para>[jhuntwork] - Updated E2fsprogs to 1.40.8. Fixes #2173. 
     92          </para> 
     93        </listitem> 
     94        <listitem> 
     95          <para>[jhuntwork] - Fixed behavior in kbd where man pages 
     96                for optional programs that aren't built are installed. 
     97          Thanks Greg Schafer for spotting this. 
     98          </para> 
     99        </listitem> 
    84100        <listitem> 
    85101          <para>[jhuntwork] - Fixed kbd to install getkeycodes, 
    86          setkeycodes and resizecons. Also moved loadkeys to /bin from 
     102          setkeycodes and resizecons. Also moved loadkeys to /bin from 
    87103          /usr/bin. Thanks, Greg Schafer.</para> 
    88104        </listitem> 

  • trunk/BOOK/general.ent

    r8545 r8548  
    11<?xml version="1.0" encoding="ISO-8859-1"?> 
    2 <!ENTITY version "SVN-20080522"> 
    3 <!ENTITY releasedate "May 22, 2008"> 
     2<!ENTITY version "SVN-20080603"> 
     3<!ENTITY releasedate "June 3, 2008"> 
     4<!ENTITY copyrightdate "1999&ndash;2008"> 
    45<!ENTITY milestone "7.0"> 
    56<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> 

  • trunk/BOOK/index.xml

    r7970 r8548  
    4242<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/> 
    4343<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies.xml"/> 
     44<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/scripts.xml"/> 
     45<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/> 
    4446</part> 
    4547 

  • trunk/BOOK/packages.ent

    r8545 r8548  
    284284<!ENTITY less-ch6-sbu "0.1 SBU"> 
    285285 
    286 <!ENTITY lfs-bootscripts-version "20080522"> 
    287 <!ENTITY lfs-bootscripts-size "42 KB"> 
     286<!ENTITY lfs-bootscripts-version "20080522">                 <!-- Scripts depend on this format --> 
     287<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile --> 
    288288<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"> 
    289 <!ENTITY lfs-bootscripts-md5 "2f29eb04b3373de58b770e3946575751"> 
     289<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile --> 
    290290<!ENTITY lfs-bootscripts-home " "> 
    291 <!ENTITY lfs-bootscripts-ch7-du "0.4 MB"> 
     291<!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> <!-- Updated in Makefile --> 
    292292<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU"> 
    293293 
    …… 
    497497<!ENTITY udev-ch6-sbu "0.1 SBU"> 
    498498 
    499 <!ENTITY udev-config "udev-config-20080522"> 
    500 <!ENTITY udev-config-size "13 KB"> 
     499<!ENTITY udev-config "udev-config-20080522"> <!-- Scripts depend on this format --> 
     500<!ENTITY udev-config-size "UDEV-SIZE KB">    <!-- Updated in Makefile --> 
    501501<!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2"> 
    502 <!ENTITY udev-config-md5 "cb5126322dacf38fe1770c28119208d5"> 
     502<!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile --> 
    503503<!ENTITY udev-config-home " "> 
    504504 

  • trunk/BOOK/prologue/bookinfo.xml

    r8517 r8548  
    2020 
    2121  <copyright id="copyright"> 
    22     <year>1999&ndash;2008</year> 
     22    <year>&copyrightdate;</year> 
    2323    <holder>Gerard Beekmans</holder> 
    2424  </copyright> 
    2525 
    2626  <legalnotice> 
    27     <para>Copyright (c) 1999&ndash;2007, Gerard Beekmans</para> 
     27    <para>Copyright &copy; &copyrightdate;, Gerard Beekmans</para> 
    2828 
    2929    <para>All rights reserved.</para> 
    3030 
    31     <para>Redistribution and use in source and binary forms, with or without 
    32     modification, are permitted provided that the following conditions are 
    33     met:</para> 
     31    <para>This book is licensed under a <xref linkend="CC"/>.</para> 
     32    <para>Computer instructions may be extracted from the book under the  
     33          <xref linkend="MIT"/>.</para> 
    3434 
    35     <itemizedlist> 
    36       <listitem> 
    37         <para>Redistributions in any form must retain the above copyright 
    38         notice, this list of conditions and the following disclaimer</para> 
    39       </listitem> 
    40       <listitem> 
    41         <para>Neither the name of <quote>Linux From Scratch</quote> nor the 
    42         names of its contributors may be used to endorse or promote products 
    43         derived from  this material without specific prior written 
    44         permission</para> 
    45       </listitem> 
    46       <listitem> 
    47         <para>Any material derived from Linux From Scratch must contain 
    48         a reference to the <quote>Linux From Scratch</quote> project</para> 
    49       </listitem> 
    50     </itemizedlist> 
    51  
    52     <para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
    53     <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
    54     BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
    55     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR 
    56     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
    57     EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
    58     PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
    59     OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
    60     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
    61     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
    62     ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para> 
     35    <para><trademark class='registered'>Linux</trademark> is a registered trademark of 
     36    Linus Torvalds.</para> 
    6337 
    6438  </legalnotice>