Subversion Repositories svn LFS-FR

Compare Revisions

Ignore whitespace Rev 5809 → Rev 5810

/branches/LFS_7.5_Systemd/make-aux-files.sh
1,22 → 1,11
#!/bin/bash
 
rm -f lfs-bootscripts*.tar.bz2
rm -f lfs-network-scripts*.tar.bz2
 
# Get base file name and move bootscripts directory to that name
version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2`
mv bootscripts lfs-bootscripts-$version
version=`grep "ENTITY lfs-network-scripts-version" packages.ent |cut -d'"' -f2`
mv network-scripts lfs-network-scripts-$version
 
# Create the tarball and clean up
tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version
mv lfs-bootscripts-$version bootscripts
 
#rm -f udev-config*.bz2
 
# Get file name and move udev config directory to that name
#version=`grep "ENTITY udev-config " packages.ent |cut -d'"' -f2`
#mv udev-config $version
 
# Create the tarball and clean up
#tar -cjf $version.tar.bz2 --exclude .svn $version
#mv $version udev-config
 
tar -cjf lfs-network-scripts-$version.tar.bz2 --exclude .svn lfs-network-scripts-$version
mv lfs-network-scripts-$version network-scripts
/branches/LFS_7.5_Systemd/aux-file-data.sh
10,7 → 10,7
./make-aux-files.sh
 
# Bootscript data
bootscripts=$(ls lfs-bootscripts*.bz2)
bootscripts=$(ls lfs-network-scripts*.bz2)
base=$(basename $bootscripts .tar.bz2)
bootsize=$(ls -l --block-size=1024 $bootscripts | cut -f5 -d" ")
bootmd5=$(md5sum $bootscripts | cut -f1 -d" ")
24,7 → 24,7
popd > /dev/null
rm -rf $TMP_DIR
 
sed -i -e s/BOOTSCRIPTS-SIZE/$bootsize/ \
-e s/BOOTSCRIPTS-INSTALL-KB/$bootinstallsize/ \
-e s/BOOTSCRIPTS-MD5SUM/$bootmd5/ $FILE
sed -i -e s/LFS-NETSCRIPTS-SIZE/$bootsize/ \
-e s/LFS-NETSCRIPTS-INSTALL-KB/$bootinstallsize/ \
-e s/LFS-NETSCRIPTS-MD5SUM/$bootmd5/ $FILE
 
/branches/LFS_7.5_Systemd/general.ent
1,9 → 1,9
<?xml version="1.0" encoding="ISO-8859-1"?>
<!ENTITY version "7.5">
<!ENTITY version "7.5-systemd">
<!ENTITY releasedate "2 mars 2014">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.5">
<!ENTITY generic-version "7.5"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
<!ENTITY generic-version "7.5-systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
<!ENTITY blfs-root "http://lfs.traduc.org/view/blfs-svn/">
/branches/LFS_7.5_Systemd/packages.ent
7,6 → 7,22
Allowed deviation in disk usage : 2% -->
 
 
<!ENTITY attr-version "2.4.47">
<!ENTITY attr-size "336 KO">
<!ENTITY attr-url "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
<!ENTITY attr-home " ">
<!ENTITY attr-ch6-du "3.5 MB">
<!ENTITY attr-ch6-sbu "0.1 SBU">
 
<!ENTITY acl-version "2.2.52">
<!ENTITY acl-size "380 KO">
<!ENTITY acl-url "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
<!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
<!ENTITY acl-home " ">
<!ENTITY acl-ch6-du "5.4 MB">
<!ENTITY acl-ch6-sbu "0.2 SBU">
 
<!ENTITY autoconf-version "2.69">
<!ENTITY autoconf-size "1,186 Ko">
<!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz">
94,6 → 110,14
<!ENTITY coreutils-ch6-du "116 Mo">
<!ENTITY coreutils-ch6-sbu "3.4 SBU">
 
<!ENTITY dbus-version "1.8.0">
<!ENTITY dbus-size "1,820 KO">
<!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
<!ENTITY dbus-md5 "059fbe84e39fc99c67a14f15b1f39dff">
<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
<!ENTITY dbus-ch6-du "35 MB">
<!ENTITY dbus-ch6-sbu "less than 0.4 SBU">
 
<!ENTITY dejagnu-version "1.5.1">
<!ENTITY dejagnu-size "566 Ko">
<!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
123,6 → 147,14
<!ENTITY e2fsprogs-ch6-du "64 Mo">
<!ENTITY e2fsprogs-ch6-sbu "1.7 SBU">
 
<!ENTITY expat-version "2.1.0">
<!ENTITY expat-size "552 KO">
<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.gz">
<!ENTITY expat-md5 "dd7dab7a5fea97d2a6a43f511449b7cd">
<!ENTITY expat-home "http://expat.sourceforge.net/">
<!ENTITY expat-ch6-du "7.5 MB">
<!ENTITY expat-ch6-sbu "0.1 SBU">
 
<!ENTITY expect-version "5.45">
<!ENTITY expect-lib-version "5.45">
<!ENTITY expect-size "614 Ko">
226,6 → 258,14
<!ENTITY gmp-ch6-du "50 Mo">
<!ENTITY gmp-ch6-sbu "1.2 SBU">
 
<!ENTITY gperf-version "3.0.4">
<!ENTITY gperf-size "960 KO">
<!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
<!ENTITY gperf-md5 "c1f1db32fb6598d6a93e6e88796a8632">
<!ENTITY gperf-home "&gnu-software;gperf/">
<!ENTITY gperf-ch6-du "6.5 MB">
<!ENTITY gperf-ch6-sbu "0.1 SBU">
 
<!ENTITY grep-version "2.16">
<!ENTITY grep-size "1,184 Ko">
<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
278,6 → 318,14
<!ENTITY inetutils-ch6-du "27 Mo">
<!ENTITY inetutils-ch6-sbu "0.4 SBU">
 
<!ENTITY intltool-version "0.50.2">
<!ENTITY intltool-size "185 KO">
<!ENTITY intltool-url "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
<!ENTITY intltool-md5 "23fbd879118253cb99aeac067da5f591">
<!ENTITY intltool-home "http://freedesktop.org/wiki/Software/intltool">
<!ENTITY intltool-ch6-du "1.4 MB">
<!ENTITY intltool-ch6-sbu "0.1 SBU">
 
<!ENTITY iproute2-version "3.12.0">
<!ENTITY iproute2-size "415 Ko">
<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
310,14 → 358,19
<!ENTITY less-ch6-du "3.6 Mo">
<!ENTITY less-ch6-sbu "moins de 0.1 SBU">
 
<!ENTITY lfs-bootscripts-version "20130881">
<!ENTITY lfs-bootscripts-size "34 Ko"> <!-- Updated in Makefile (svn only)-->
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "e908023fc44e613ad0c81241781289e7">
<!ENTITY lfs-bootscripts-home " ">
<!ENTITY lfs-bootscripts-ch7-du "260 Ko"> <!-- Updated in Makefile (svn only)-->
<!ENTITY lfs-bootscripts-ch7-sbu "moins de 0.1 SBU">
<!ENTITY lfs-network-scripts-md5 "3f25106ace9c17b7fe759076b482e321">
<!ENTITY lfs-network-scripts-home " ">
<!ENTITY lfs-network-scripts-ch7-du "244 KO">
<!ENTITY lfs-network-scripts-ch7-sbu "moins de 0.1 SBU">
 
<!ENTITY libcap-version "2.24">
<!ENTITY libcap-size "64 KO">
<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
<!ENTITY libcap-md5 "d43ab9f680435a7fff35b4ace8d45b80">
<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
<!ENTITY libcap-ch6-du "1.7 MB">
<!ENTITY libcap-ch6-sbu "0.1 SBU">
 
<!ENTITY libpipeline-version "1.2.6">
<!ENTITY libpipeline-size "761 Ko">
<!ENTITY libpipeline-url "http://download.savannah.gnu.org/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
490,22 → 543,6
<!ENTITY shadow-ch6-du "42 Mo">
<!ENTITY shadow-ch6-sbu "0.2 SBU">
 
<!ENTITY sysklogd-version "1.5">
<!ENTITY sysklogd-size "85 Ko">
<!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
<!ENTITY sysklogd-md5 "e053094e8103165f98ddafe828f6ae4b">
<!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
<!ENTITY sysklogd-ch6-du "0.6 Mo">
<!ENTITY sysklogd-ch6-sbu "moins de 0.1 SBU">
 
<!ENTITY sysvinit-version "2.88dsf">
<!ENTITY sysvinit-size "108 Ko">
<!ENTITY sysvinit-url "http://download.savannah.gnu.org/releases/sysvinit/sysvinit-&sysvinit-version;.tar.bz2">
<!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
<!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
<!ENTITY sysvinit-ch6-du "1.4 Mo">
<!ENTITY sysvinit-ch6-sbu "moins de 0.1 SBU">
 
<!ENTITY tar-version "1.27.1">
<!ENTITY tar-size "1,835 Ko">
<!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.xz">
551,12 → 588,6
<!ENTITY tzdata-ch6-du "6.4 Mo">
<!ENTITY tzdata-ch6-sbu "moins de 0.1 SBU">
 
<!ENTITY udev-lfs "udev-lfs-&systemd-version;-3">
<!ENTITY udev-lfs-size "29 Ko">
<!ENTITY udev-lfs-url "&anduin-other;&udev-lfs;.tar.bz2">
<!ENTITY udev-lfs-md5 "c0231ff619e567a9b11f912d8a7a404a">
<!ENTITY udev-lfs-home " ">
 
<!ENTITY util-linux-version "2.24.1">
<!ENTITY util-linux-size "3,461 Ko">
<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.24/util-linux-&util-linux-version;.tar.xz">
576,6 → 607,14
<!ENTITY vim-ch6-du "121 Mo">
<!ENTITY vim-ch6-sbu "1.4 SBU">
 
<!ENTITY xml-parser-version "2.42_01">
<!ENTITY xml-parser-size "236 KO">
<!ENTITY xml-parser-url "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
<!ENTITY xml-parser-md5 "a4650aebcc464bb91113c2c356da8210">
<!ENTITY xml-parser-home "https://github.com/chorny/XML-Parser">
<!ENTITY xml-parser-ch6-du "2.5 MB">
<!ENTITY xml-parser-ch6-sbu "0.1 SBU">
 
<!ENTITY xz-version "5.0.5">
<!ENTITY xz-size "894 Ko">
<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
/branches/LFS_7.5_Systemd/index.xml
41,8 → 41,6
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acknowledgments.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/udev-rules.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
</part>
 
/branches/LFS_7.5_Systemd/patches.ent
30,10 → 30,6
<!ENTITY readline-fixes-patch-md5 "b793b2bf1306bc62e5f1e7ebbdae2f35">
<!ENTITY readline-fixes-patch-size "3.3 Ko">
 
<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
<!ENTITY sysvinit-consolidated-patch-md5 "0b7b5ea568a878fdcc4057b2bf36e5cb">
<!ENTITY sysvinit-consolidated-patch-size "3.9 Ko">
 
<!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch">
<!ENTITY tar-manpage-patch-md5 "321f85ec32733b1a9399e788714a5156">
<!ENTITY tar-manpage-patch-size "7.8 Ko">
/branches/LFS_7.5_Systemd/process-scripts.sh
1,24 → 1,16
#!/bin/bash
 
# Boot scripts
for s in bootscripts/lfs/init.d/* \
bootscripts/lfs/sysconfig/* \
bootscripts/lfs/lib/services/* \
bootscripts/lfs/sbin/* \
udev-lfs/*.rules
for s in network-scripts/lfs/lib/services/* \
network-scripts/lfs/sbin/* \
network-scripts/lfs/units/*
do
script=$(basename $s)
 
# Skip directories
[ $script == 'network-devices' ] && continue
#[ $script == 'services' ] && continue
 
# Disambiguate duplicate file names
[ $s == 'bootscripts/lfs/sysconfig/rc' ] && script='rc-sysinit';
[ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit';
[ $s == 'bootscripts/lfs/sysconfig/udev_retry' ] && script='config-udev-retry';
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' \
$s > appendices/${script}.script
$s > appendices/${script}.script
done
/branches/LFS_7.5_Systemd/Makefile
113,7 → 113,7
$(Q)xsltproc --xinclude --nonet --output $(BASEDIR)/md5sums \
stylesheets/md5sum.xsl chapter03/chapter03.xml
$(Q)sed -i -e \
"s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
"s/LFS-NETSCRIPTS-MD5SUM/$(shell md5sum lfs-network-scripts*.tar.bz2 | cut -d' ' -f1)/" \
$(BASEDIR)/md5sums
 
dump-commands: validate