Subversion Repositories svn LFS-FR

Compare Revisions

Ignore whitespace Rev 1332 → Rev 1333

/trunk/lfs/make-aux-files.sh
4,11 → 4,11
 
# Get base file name and move bootscripts directory to that name
version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2`
mv lsb-bootscripts lfs-bootscripts-$version
mv bootscripts lfs-bootscripts-$version
 
# Create the tarball and clean up
tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version
mv lfs-bootscripts-$version lsb-bootscripts
mv lfs-bootscripts-$version bootscripts
 
rm -f udev-config*.bz2
 
/trunk/lfs/chapter01/changelog.xml
38,6 → 38,37
 
-->
<listitem>
<para>05-06-2011</para>
<itemizedlist>
<listitem>
<para>[matthew] - Passage à Linux-2.6.39.1. Corrige
<ulink url="&lfs-ticket-root;2884">#2884</ulink>.</para>
</listitem>
<listitem>
<para>[matthew] - Passage à Glib-2.28.7. Corrige
<ulink url="&lfs-ticket-root;2881">#2881</ulink>.</para>
</listitem>
<listitem>
<para>[matthew] - Passage à Udev-171. Corrige
<ulink url="&lfs-ticket-root;2880">#2880</ulink>.</para>
</listitem>
<listitem>
<para>[matthew] - Passage à XZ-5.0.3. Corrige
<ulink url="&lfs-ticket-root;2879">#2879</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
 
<listitem>
<para>31-05-2011</para>
<itemizedlist>
<listitem>
<para>[dj] - Passage à lfs-bootscripts-20110531.</para>
</listitem>
</itemizedlist>
</listitem>
 
<listitem>
<para>23-05-2011</para>
<itemizedlist>
<listitem>
/trunk/lfs/general.ent
1,7 → 1,7
<?xml version="1.0" encoding="ISO-8859-1"?>
 
<!ENTITY version "SVN-20110523">
<!ENTITY releasedate "23 mai 2011">
<!ENTITY version "SVN-20110605">
<!ENTITY releasedate "5 juin 2011">
<!ENTITY copyrightdate "1999&ndash;2011">
<!ENTITY milestone "6.9">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
/trunk/lfs/packages.ent
192,10 → 192,10
<!ENTITY gettext-ch6-du "125 Mio">
<!ENTITY gettext-ch6-sbu "5.8 SBU">
 
<!ENTITY glib-version "2.28.6">
<!ENTITY glib-size "6,793 Kio">
<!ENTITY glib-version "2.28.7">
<!ENTITY glib-size "6,809 Kio">
<!ENTITY glib-url "http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-&glib-version;.tar.bz2">
<!ENTITY glib-md5 "7d8fc15ae70d5111c0cf2a79d50ef717">
<!ENTITY glib-md5 "feda1650c8646ad39c7b01d95b03766b">
<!ENTITY glib-home "http://developer.gnome.org/glib/">
<!ENTITY glib-ch6-du "106 Mio">
<!ENTITY glib-ch6-sbu "1.5 SBU">
296,7 → 296,7
<!ENTITY less-ch6-du "2.9 Mio">
<!ENTITY less-ch6-sbu "moins de 0.1 SBU">
 
<!ENTITY lfs-bootscripts-version "20110424"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-version "20110531"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE Kio"> <!-- Updated in Makefile -->
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile -->
322,12 → 322,12
 
<!ENTITY linux-major-version "2.6">
<!ENTITY linux-minor-version "39">
<!ENTITY linux-patch-version "">
<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
<!ENTITY linux-size "74,313 Kio">
<!ENTITY linux-patch-version "1">
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
<!ENTITY linux-size "74,317 Kio">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
<!ENTITY linux-md5 "1aab7a741abe08d42e8eccf20de61e05">
<!ENTITY linux-md5 "983834b0138e102a3fb0098367c17150">
<!ENTITY linux-home "http://www.kernel.org/">
<!ENTITY linux-ch8-du "540 - 500 Mio">
<!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">
538,17 → 538,17
<!ENTITY texinfo-ch6-du "21 Mio">
<!ENTITY texinfo-ch6-sbu "0.3 SBU">
 
<!ENTITY udev-version "170">
<!ENTITY udev-version "171">
<!ENTITY udev-size "584 Kio">
<!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
<!ENTITY udev-md5 "6e132d1a3b4dae24dafd2726c5cdd982">
<!ENTITY udev-md5 "bdf4617284be2ecac11767437417e209">
<!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev.html">
<!ENTITY udev-ch6-du "9.3 Mio">
<!ENTITY udev-ch6-sbu "0.2 SBU">
 
<!ENTITY udev-testfiles-url "http://anduin.linuxfromscratch.org/sources/other/udev-&udev-version;-testfiles.tar.bz2">
<!ENTITY udev-testfiles-size "148 Kio">
<!ENTITY udev-testfiles-md5 "d0af45f57f7cfcd509fc07de2c6508ed">
<!ENTITY udev-testfiles-size "151 Kio">
<!ENTITY udev-testfiles-md5 "02664a8c4147b6f56b54697ada05f4c0">
<!ENTITY udev-testfiles-du "37 Mio">
 
<!ENTITY udev-config "udev-config-20100128"> <!-- Scripts depend on this format -->
576,10 → 576,10
<!ENTITY vim-ch6-du "87 Mio">
<!ENTITY vim-ch6-sbu "1.0 SBU">
<!ENTITY xz-version "5.0.2">
<!ENTITY xz-size "1,000 Kio">
<!ENTITY xz-version "5.0.3">
<!ENTITY xz-size "1,002 Kio">
<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.bz2">
<!ENTITY xz-md5 "ee05b17a4062bb55cba099ef46eca007">
<!ENTITY xz-md5 "8d900b742b94fa9e708ca4f5a4b29003">
<!ENTITY xz-home "http://tukaani.org/xz">
<!ENTITY xz-ch5-du "14 MB">
<!ENTITY xz-ch5-sbu "0.3 SBU">
/trunk/lfs/bootscripts/lfs/init.d/udev
65,7 → 65,8
 
# Now traverse /sys in order to "coldplug" devices that have
# already been discovered
/sbin/udevadm trigger --action=add
/sbin/udevadm trigger --action=add --type=subsystems
/sbin/udevadm trigger --action=add --type=devices
 
# Now wait for udevd to process the uevents we triggered
/sbin/udevadm settle
/trunk/lfs/bootscripts/ChangeLog
1,4 → 1,8
2011-04-19 Bruce Dubbs <bdubbs@linuxfromscratch.org>
2011-05-31 DJ Lucas <dj@linuxfromscratch.org>
* lfs/init.d/udev: Add multiple udev triggers for both subsystems and
devices per upstream recommendation.
 
2011-04-19 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* lfs/init.d/mountvirtfs: Add creation of /run/{var,lock,shm}.
* lfs/init.d/udev: Add /dev/shm -> /run/shm symlink.
 
/trunk/lfs/appendices/scripts.xml
7,6 → 7,8
<!ENTITY console SYSTEM "console.script">
<!ENTITY functions SYSTEM "functions.script">
<!ENTITY consolelog SYSTEM "consolelog.script">
<!ENTITY functions SYSTEM "functions.script">
<!ENTITY consolelog SYSTEM "consolelog.script">
<!ENTITY halt SYSTEM "halt.script">
<!ENTITY localnet SYSTEM "localnet.script">
<!ENTITY modules SYSTEM "modules.script">
26,7 → 28,6
<!ENTITY createfiles SYSTEM "createfiles.script">
<!ENTITY modules_sys SYSTEM "modules-sysinit.script">
<!ENTITY rc_sys SYSTEM "rc-sysinit.script">
<!ENTITY rc_site SYSTEM "rc-site.script">
<!ENTITY ifup SYSTEM "ifup.script">
<!ENTITY ifdown SYSTEM "ifdown.script">
<!ENTITY ipv4_static SYSTEM "ipv4-static.script">
63,6 → 64,21
<screen>&rc;</screen>
</sect1>
 
<sect1 id="functions" role="wrap">
<title>/etc/rc.d/init.d/functions</title>
<screen>&functions;</screen>
</sect1>
 
<sect1 id="mountvirtfs" role="wrap">
<title>/etc/rc.d/init.d/mountvirtfs</title>
<screen>&mountvirtfs;</screen>
</sect1>
<sect1 id="consolelog" role="wrap">
<title>/etc/rc.d/init.d/consolelog</title>
<screen>&consolelog;</screen>
</sect1>
 
<sect1 id="modules" role="wrap">
<title>/etc/rc.d/init.d/modules</title>
<screen>&modules;</screen>
/trunk/lfs/process-scripts.sh
1,20 → 1,20
#!/bin/bash
 
# Boot scripts
for s in lsb-bootscripts/etc/init.d/* \
lsb-bootscripts/etc/default/* \
lsb-bootscripts/sbin/* \
lsb-bootscripts/lib/network-services/*
for s in bootscripts/lfs/init.d/* \
bootscripts/lfs/sysconfig/* \
bootscripts/lfs/sysconfig/network-devices/* \
bootscripts/lfs/sysconfig/network-devices/services/*
do
script=$(basename $s)
# Skip directories
[ $script == 'sbin' ] && continue
[ $script == 'network-services' ] && continue
[ $script == 'network-devices' ] && continue
[ $script == 'services' ] && continue
 
# Disambiguate duplicate file names
[ $s == 'lsb-bootscripts/etc/default/rc' ] && script='rc-sysinit';
[ $s == 'lsb-bootscripts/etc/default/modules' ] && script='modules-sysinit';
[ $s == 'bootscripts/lfs/sysconfig/rc' ] && script='rc-sysinit';
[ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit';
sed -e 's/\&/\&amp\;/g' -e 's/</\&lt\;/g' -e 's/>/\&gt\;/g' \
-e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/ /g' \