[lfs-fr] r1254 - in trunk/clfs: . appendices/dependencies boot boot/x86 boot/x86_64

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Sam 22 Jan 14:37:30 PST 2011


Author: jmengual
Date: 2011-01-22 23:37:30 +0100 (Sat, 22 Jan 2011)
New Revision: 1254

Removed:
   trunk/clfs/boot/x86/grub.xml
   trunk/clfs/boot/x86_64/grub-build.xml
Modified:
   trunk/clfs/appendices/dependencies/x86_64-64.xml
   trunk/clfs/boot/x86-chapter.xml
   trunk/clfs/boot/x86/grub-build.xml
   trunk/clfs/boot/x86_64-64-chapter.xml
   trunk/clfs/boot/x86_64-chapter.xml
   trunk/clfs/general.ent
Log:
Mise a jour (disparition de lilo pour grub sur x86_64).


Modified: trunk/clfs/appendices/dependencies/x86_64-64.xml
===================================================================
--- trunk/clfs/appendices/dependencies/x86_64-64.xml	2011-01-11 20:50:41 UTC (rev 1253)
+++ trunk/clfs/appendices/dependencies/x86_64-64.xml	2011-01-22 22:37:30 UTC (rev 1254)
@@ -13,58 +13,4 @@
 
   <para>Cette page contient des informations de dépendance spécifiques à x86 Pure64.</para>
 
-<!-- Begin Bin86 dependency info -->
-  <bridgehead renderas="sect2" id="bin86-dep">Bin86</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make et Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Aucun</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Lilo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Lilo dependency info -->
-  <bridgehead renderas="sect2" id="lilo-dep">Lilo</bridgehead>
-  
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Bin86, Binutils, Coreutils, EGLIBC, GCC, Make et Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Aucun</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Aucun</seg>
-        </seglistitem>
-      </segmentedlist>
-
 </appendix>

Modified: trunk/clfs/boot/x86/grub-build.xml
===================================================================
--- trunk/clfs/boot/x86/grub-build.xml	2011-01-11 20:50:41 UTC (rev 1253)
+++ trunk/clfs/boot/x86/grub-build.xml	2011-01-22 22:37:30 UTC (rev 1254)
@@ -28,47 +28,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p8'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+<screen os="ab"><userinput>./configure --prefix=/usr \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --sysconfdir=/etc</userinput></screen>
 
-<screen os="aa"><userinput>./configure --prefix=/usr \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -81,19 +46,8 @@
     href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${CLFS} install
-mkdir -v ${CLFS}/boot/grub
-cp -v ${CLFS}/usr/lib/grub/*/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
+<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
-    <para os="ac">The directory in
-    <filename class="directory">${CLFS}/usr/lib/grub</filename> (its name
-    depends on your arch) contains a number of <filename>*stage1_5</filename>
-    files, different ones for different file systems. Review the files
-    available and copy the appropriate ones to the <filename
-    class="directory">${CLFS}/boot/grub</filename> directory. Most users will
-    copy the <filename>e2fs_stage1_5</filename> and/or
-    <filename>reiserfs_stage1_5</filename> files.</para>
-
   </sect2>
 
   <sect2 role="content">

Deleted: trunk/clfs/boot/x86/grub.xml
===================================================================
--- trunk/clfs/boot/x86/grub.xml	2011-01-11 20:50:41 UTC (rev 1253)
+++ trunk/clfs/boot/x86/grub.xml	2011-01-22 22:37:30 UTC (rev 1254)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub">
-  <?dbhtml filename="grub.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>démarrage, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>dd if=${CLFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=${CLFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='n'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='p'])"/>
-
-<screen><userinput>cat > ${CLFS}/boot/grub/menu.lst << "EOF"
-<literal># Begin /boot/grub/menu.lst
-
-# By default boot the first menu entry.
-default 0
-
-# Allow 30 seconds before booting the default.
-timeout 30
-
-# Use prettier colors.
-color green/black light-green/black
-
-# The first entry is for CLFS.
-title CLFS &version;
-root (hd0,3)
-kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='q'])"/>
-
-<screen os="r"><userinput>cat >> ${CLFS}/boot/grub/menu.lst << "EOF"
-<literal>title Red Hat
-root (hd0,2)
-kernel /boot/kernel-2.6.5 root=/dev/hda3
-initrd /boot/initrd-2.6.5</literal>
-EOF</userinput></screen>
-
-</sect1>

Modified: trunk/clfs/boot/x86-chapter.xml
===================================================================
--- trunk/clfs/boot/x86-chapter.xml	2011-01-11 20:50:41 UTC (rev 1253)
+++ trunk/clfs/boot/x86-chapter.xml	2011-01-22 22:37:30 UTC (rev 1254)
@@ -21,13 +21,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/kernel.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub-build.xml"/>-->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
 </chapter>

Deleted: trunk/clfs/boot/x86_64/grub-build.xml
===================================================================
--- trunk/clfs/boot/x86_64/grub-build.xml	2011-01-11 20:50:41 UTC (rev 1253)
+++ trunk/clfs/boot/x86_64/grub-build.xml	2011-01-22 22:37:30 UTC (rev 1254)
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub-build" role="wrap">
-  <?dbhtml filename="grub-build.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-boot-grub-build">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>démarrage</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation de GRUB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p8'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=/usr \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-grub" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/clfs/boot/x86_64-64-chapter.xml
===================================================================
--- trunk/clfs/boot/x86_64-64-chapter.xml	2011-01-11 20:50:41 UTC (rev 1253)
+++ trunk/clfs/boot/x86_64-64-chapter.xml	2011-01-22 22:37:30 UTC (rev 1254)
@@ -21,15 +21,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo-build.xml"/>-->
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
 </chapter>

Modified: trunk/clfs/boot/x86_64-chapter.xml
===================================================================
--- trunk/clfs/boot/x86_64-chapter.xml	2011-01-11 20:50:41 UTC (rev 1253)
+++ trunk/clfs/boot/x86_64-chapter.xml	2011-01-22 22:37:30 UTC (rev 1254)
@@ -21,14 +21,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub-build.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
 </chapter>

Modified: trunk/clfs/general.ent
===================================================================
--- trunk/clfs/general.ent	2011-01-11 20:50:41 UTC (rev 1253)
+++ trunk/clfs/general.ent	2011-01-22 22:37:30 UTC (rev 1254)
@@ -2,7 +2,7 @@
 
 <!ENTITY month "01"> <!-- Use two digits -->
 <!ENTITY month_name "janvier">
-<!ENTITY day "10"> <!-- Use two digits -->
+<!ENTITY day "22"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">




More information about the lfs-traducfr mailing list