[lfs-fr] r1331 - in trunk/clfs: . boot/64 boot/common boot/multilib boot/ppc64

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Dim 5 Juin 02:53:19 PDT 2011


Author: jmengual
Date: 2011-06-05 11:53:19 +0200 (Sun, 05 Jun 2011)
New Revision: 1331

Modified:
   trunk/clfs/Makefile
   trunk/clfs/boot/64/e2fsprogs.xml
   trunk/clfs/boot/64/util-linux.xml
   trunk/clfs/boot/common/e2fsprogs.xml
   trunk/clfs/boot/common/util-linux.xml
   trunk/clfs/boot/multilib/e2fsprogs.xml
   trunk/clfs/boot/multilib/util-linux.xml
   trunk/clfs/boot/ppc64/e2fsprogs-libs.xml
   trunk/clfs/boot/ppc64/e2fsprogs.xml
   trunk/clfs/general.ent
Log:
Des ajustements dans la VO.



Modified: trunk/clfs/Makefile
===================================================================
--- trunk/clfs/Makefile	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/Makefile	2011-06-05 09:53:19 UTC (rev 1331)
@@ -1,14 +1,14 @@
-TOP		:= $(PWD)
-RENDERDIR	:= /home/jp/tmp
+TOP		:= $(shell pwd)
+RENDERDIR	:= /home/jp/clfsfr/render
 
 VALIDATEDIR	:= $(RENDERDIR)/validate
 PROFILEDIR	:= $(RENDERDIR)/profile
 
-HTMLDIR		:= /home/jp/Documentations/Traductions/lfs/Français/trunk/clfs/clfs-svn
-NOCHUNKDIR	:= /home/jp/Documentations/Traductions/lfs/Français/trunk/clfs/clfs-svn
+HTMLDIR		:= $(RENDERDIR)/clfs-svn
+NOCHUNKDIR	:= $(RENDERDIR)/nochunk
 
 FODIR		:= $(RENDERDIR)/fo
-PDFDIR		:= /home/jp/Documentations/Traductions/lfs/Français/trunk/clfs/clfs-svn
+PDFDIR		:= $(RENDERDIR)/pdf
 
 TROUBLEDIR	:= $(RENDERDIR)/trouble
 DUMPDIR		:= $(RENDERDIR)/commands
@@ -53,8 +53,8 @@
 titlepage:
 	@echo "Rendering the top-level index..."
 	$(Q)xsltproc --nonet --output $(HTMLDIR)/index.html \
-	  $(PWD)/stylesheets/top-index.xsl \
-	  $(PWD)/index.xml
+	  $(TOP)/stylesheets/top-index.xsl \
+	  $(TOP)/index.xml
 	@$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(HTMLDIR)/index.html
 
 ARCHS_VD_XML := $(ARCHS:%=%-validate_dump-xml)
@@ -66,7 +66,7 @@
 	$(Q)xmllint --nonet --noent --xinclude \
 	  --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
 	  -o $(VALIDATEDIR)/$(arch)-full.xml \
-	  $(PWD)/$(arch)-index.xml
+	  $(TOP)/$(arch)-index.xml
 
 ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
 .PHONY: $(ARCHS_P_XML)
@@ -77,7 +77,7 @@
 	$(Q)mkdir -p $(PROFILEDIR)
 	$(Q)xsltproc --nonet --stringparam profile.condition html \
 	  --output $(PROFILEDIR)/$(arch)-html.xml \
-	  $(PWD)/stylesheets/lfs-xsl/profile.xsl \
+	  $(TOP)/stylesheets/lfs-xsl/profile.xsl \
 	  $(VALIDATEDIR)/$(arch)-full.xml
 
 ARCHS_HTML := $(ARCHS:%=%-html)
@@ -92,15 +92,15 @@
 	$(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
 	  -stringparam rootid "$(ROOT_ID)" \
 	  -stringparam base.dir $(HTMLDIR)/$(arch)/ \
-	  $(PWD)/stylesheets/clfs-chunked.xsl \
+	  $(TOP)/stylesheets/clfs-chunked.xsl \
 	  $(PROFILEDIR)/$(arch)-html.xml
 
 	@echo "Copying CSS code and images for $(arch)..."
 	$(Q)mkdir -p $(HTMLDIR)/$(arch)/stylesheets
-	$(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
+	$(Q)cp $(TOP)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
 	$(Q)sed -i -e "s at ../stylesheets at stylesheets@g" $(HTMLDIR)/$(arch)/*.html
 	$(Q)mkdir -p $(HTMLDIR)/$(arch)/images
-	$(Q)cp $(PWD)/images/*.png $(HTMLDIR)/$(arch)/images
+	$(Q)cp $(TOP)/images/*.png $(HTMLDIR)/$(arch)/images
 	$(Q)sed -i -e "s at ../images at images@g" $(HTMLDIR)/$(arch)/*.html
 
 	@$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(HTMLDIR)/$(arch)
@@ -116,7 +116,7 @@
 	$(Q)mkdir -p $(NOCHUNKDIR)
 	$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
 	  --output $(NOCHUNKDIR)/CLFS-$(arch).html \
-	  $(PWD)/stylesheets/clfs-nochunks.xsl \
+	  $(TOP)/stylesheets/clfs-nochunks.xsl \
 	  $(PROFILEDIR)/$(arch)-html.xml
 
 	@$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(NOCHUNKDIR)/CLFS-$(arch).html
@@ -132,7 +132,7 @@
 	@mkdir -p $(FODIR)
 	$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
 	  --output $(FODIR)/$(arch).fo \
-	  $(PWD)/stylesheets/clfs-pdf.xsl \
+	  $(TOP)/stylesheets/clfs-pdf.xsl \
 	  $(PROFILEDIR)/$(arch)-html.xml
 	$(Q)sed -i -e 's/span="inherit"/span="all"/' $(FODIR)/$(arch).fo
 
@@ -155,7 +155,7 @@
 	@echo "Validating $(arch)..."
 	$(Q)xmllint --xinclude --noout --nonet \
 	  --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-	  $(PWD)/$(arch)-index.xml
+	  $(TOP)/$(arch)-index.xml
 
 ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
 .PHONY: trouble $(ARCHS_TROUBLE)
@@ -167,7 +167,7 @@
 	$(Q)xmllint --xinclude --nonet \
 	  --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
 	  -o $(TROUBLEDIR)/dump-$(arch) \
-	  $(PWD)/$(arch)-index.xml
+	  $(TOP)/$(arch)-index.xml
 	$(Q)xmllint --xinclude --noout --nonet \
 	  --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
 	  $(TROUBLEDIR)/dump-$(arch)
@@ -182,8 +182,8 @@
 	$(Q)mkdir -p $(DUMPDIR)/$(arch)
 	$(Q)xsltproc --xinclude --nonet \
 	  --output $(DUMPDIR)/$(arch)/ \
-	  $(PWD)/stylesheets/dump-commands.xsl \
-	  $(PWD)/$(arch)-index.xml
+	  $(TOP)/stylesheets/dump-commands.xsl \
+	  $(TOP)/$(arch)-index.xml
 
 ARCHS_DLLIST := $(ARCHS:%=%-dllist)
 .PHONY: download-list $(ARCHS_DLLIST)
@@ -194,8 +194,8 @@
 	$(Q)mkdir -p $(DLLISTDIR)
 	$(Q)xsltproc --xinclude --nonet \
 	  --output $(DLLISTDIR)/$(arch).list \
-	  $(PWD)/stylesheets/wget.xsl \
-	  $(PWD)/$(arch)-index.xml
+	  $(TOP)/stylesheets/wget.xsl \
+	  $(TOP)/$(arch)-index.xml
 
 FG_GREEN := $(shell echo -e '\e[0;32m')
 FG_BLUE := $(shell echo -e '\e[0;34m')

Modified: trunk/clfs/boot/64/e2fsprogs.xml
===================================================================
--- trunk/clfs/boot/64/e2fsprogs.xml	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/boot/64/e2fsprogs.xml	2011-06-05 09:53:19 UTC (rev 1331)
@@ -34,9 +34,8 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
-  CC="${CC} ${BUILD64}" PKG_CONFIG=true \
-    ../configure --prefix=/tools --enable-elf-shlibs \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+  ../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Modified: trunk/clfs/boot/64/util-linux.xml
===================================================================
--- trunk/clfs/boot/64/util-linux.xml	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/boot/64/util-linux.xml	2011-06-05 09:53:19 UTC (rev 1331)
@@ -26,9 +26,10 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+  ./configure --prefix=/tools --exec-prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --enable-login-utils --disable-makeinstall-chown</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
@@ -46,14 +47,6 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/boot/common/e2fsprogs.xml
===================================================================
--- trunk/clfs/boot/common/e2fsprogs.xml	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/boot/common/e2fsprogs.xml	2011-06-05 09:53:19 UTC (rev 1331)
@@ -34,8 +34,8 @@
     href="../../final-system/common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
-  PKG_CONFIG=true ../configure --prefix=/tools \
+<screen os="aa"><userinput>PKG_CONFIG=true \
+  ../configure --prefix=/tools \
     --enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Modified: trunk/clfs/boot/common/util-linux.xml
===================================================================
--- trunk/clfs/boot/common/util-linux.xml	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/boot/common/util-linux.xml	2011-06-05 09:53:19 UTC (rev 1331)
@@ -26,9 +26,10 @@
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
+<screen os="b"><userinput>PKG_CONFIG=true \
+  ./configure --prefix=/tools --exec-prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --enable-login-utils --disable-makeinstall-chown</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/util-linux.xml"
@@ -40,19 +41,8 @@
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>  
 
-  <para os="i">Copiez les bibliothèques et les includes dans /tools :</para>
-
-<screen os="j"><userinput>rm -fv ${CLFS}/usr/lib/lib{blkid,uuid}.la
-cp -v ${CLFS}/usr/lib/lib{blkid,uuid}* /tools/lib
-cp -v ${CLFS}/lib/lib{blkid,uuid}* /tools/lib
-ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib/libblkid.so
-ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib/libuuid.so
-install -dv /tools/include/{blkid,uuid}
-cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
-cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
-  
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/boot/multilib/e2fsprogs.xml
===================================================================
--- trunk/clfs/boot/multilib/e2fsprogs.xml	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/boot/multilib/e2fsprogs.xml	2011-06-05 09:53:19 UTC (rev 1331)
@@ -40,9 +40,8 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib64" \
-  CC="${CC} ${BUILD64}" PKG_CONFIG=true \
-    ../configure --prefix=/tools --enable-elf-shlibs \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+  ../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Modified: trunk/clfs/boot/multilib/util-linux.xml
===================================================================
--- trunk/clfs/boot/multilib/util-linux.xml	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/boot/multilib/util-linux.xml	2011-06-05 09:53:19 UTC (rev 1331)
@@ -26,8 +26,11 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+  ./configure \
+    --prefix=/tools --exec-prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 --enable-login-utils \
     --disable-makeinstall-chown</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -46,19 +49,6 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>rm -fv ${CLFS}/usr/lib64/lib{blkid,uuid}.la
-cp -v ${CLFS}/usr/lib64/lib{blkid,uuid}* /tools/lib64
-cp -v ${CLFS}/lib64/lib{blkid,uuid}* /tools/lib64
-ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib64/libblkid.so
-ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib64/libuuid.so
-install -dv /tools/include/{blkid,uuid}
-cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
-cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/boot/ppc64/e2fsprogs-libs.xml
===================================================================
--- trunk/clfs/boot/ppc64/e2fsprogs-libs.xml	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/boot/ppc64/e2fsprogs-libs.xml	2011-06-05 09:53:19 UTC (rev 1331)
@@ -20,7 +20,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de E2fsprogs</title>
+    <title>Installation of E2fsprogs</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/e2fsprogs.xml"
@@ -45,9 +45,8 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
-  CC="${CC} ${BUILD32}" PKG_CONFIG=true \
-    ../configure --prefix=/tools --enable-elf-shlibs \
+<screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
+  ../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \
     --disable-uuidd --cache-file=config.cache</userinput></screen>
@@ -77,7 +76,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont disponibles dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-e2fsprogs" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/boot/ppc64/e2fsprogs.xml
===================================================================
--- trunk/clfs/boot/ppc64/e2fsprogs.xml	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/boot/ppc64/e2fsprogs.xml	2011-06-05 09:53:19 UTC (rev 1331)
@@ -20,7 +20,7 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de E2fsprogs</title>
+    <title>Installation of E2fsprogs</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/e2fsprogs.xml"
@@ -53,9 +53,8 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib64" \
-  CC="${CC} ${BUILD64}" PKG_CONFIG=true \
-    ../configure --prefix=/tools --enable-elf-shlibs \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+  ../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \
     --disable-uuidd --cache-file=config.cache</userinput></screen>
@@ -101,7 +100,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont disponibles dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-e2fsprogs" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/general.ent
===================================================================
--- trunk/clfs/general.ent	2011-05-31 22:56:43 UTC (rev 1330)
+++ trunk/clfs/general.ent	2011-06-05 09:53:19 UTC (rev 1331)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY month "05"> <!-- Use two digits -->
-<!ENTITY month_name "mai">
-<!ENTITY day "30"> <!-- Use two digits -->
+<!ENTITY month "06"> <!-- Use two digits -->
+<!ENTITY month_name "juin">
+<!ENTITY day "4"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">




More information about the lfs-traducfr mailing list