diff options
-rw-r--r-- | bootscripts/ChangeLog | 3 | ||||
-rw-r--r-- | bootscripts/Makefile | 1 | ||||
-rw-r--r-- | bootscripts/lfs/lib/systemd/ifupdown@.service | 12 | ||||
-rw-r--r-- | bootscripts/lfs/units/ifupdownat.service | 12 | ||||
-rw-r--r-- | chapter01/changelog.xml | 34 | ||||
-rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
-rw-r--r-- | chapter06/eudev.xml | 2 | ||||
-rw-r--r-- | chapter06/gcc.xml | 10 | ||||
-rw-r--r-- | chapter07/usage.xml | 12 | ||||
-rw-r--r-- | general.ent | 4 | ||||
-rw-r--r-- | packages.ent | 22 |
11 files changed, 54 insertions, 62 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 1a688b609..bff8db335 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,6 @@ +2014-06-29 Bruce Dubbs <bdubbs@linuxfromscratch.org> + * Remove systemd references and files + 2014-03-31 Bruce Dubbs <bdubbs@linuxfromscratch.org> * Changes made to be consistent with common systemd functions diff --git a/bootscripts/Makefile b/bootscripts/Makefile index 275761c63..4686c6ff2 100644 --- a/bootscripts/Makefile +++ b/bootscripts/Makefile @@ -1,7 +1,6 @@ ETCDIR=${DESTDIR}/etc LIBDIR=${DESTDIR}/lib SERVICEDIR=${LIBDIR}/services -UNITDIR=${LIBDIR}/systemd/system MAN8=${DESTDIR}/usr/share/man/man8 SBIN=${DESTDIR}/sbin MODE=754 diff --git a/bootscripts/lfs/lib/systemd/ifupdown@.service b/bootscripts/lfs/lib/systemd/ifupdown@.service deleted file mode 100644 index 963b8731c..000000000 --- a/bootscripts/lfs/lib/systemd/ifupdown@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Start ifupdown for %I -BindTo=sys-subsystem-net-devices-%i.device -ConditionPathExists=/etc/sysconfig/ifconfig.%i - -[Service] -ExecStart=/sbin/ifup %I -ExecStop=/sbin/ifdown %I -RemainAfterExit=true - -[Install] -WantedBy=multi-user.target diff --git a/bootscripts/lfs/units/ifupdownat.service b/bootscripts/lfs/units/ifupdownat.service deleted file mode 100644 index 963b8731c..000000000 --- a/bootscripts/lfs/units/ifupdownat.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Start ifupdown for %I -BindTo=sys-subsystem-net-devices-%i.device -ConditionPathExists=/etc/sysconfig/ifconfig.%i - -[Service] -ExecStart=/sbin/ifup %I -ExecStop=/sbin/ifdown %I -RemainAfterExit=true - -[Install] -WantedBy=multi-user.target diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7d2ecb10d..f594b8bc2 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,40 @@ </listitem> --> <listitem> + <para>2014-07-08</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Removed references to /lib/udev/devices. Fixes + <ulink url="&lfs-ticket-root;3620">#3620</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to linux-3.15.4. Fixes + <ulink url="&lfs-ticket-root;3623">#3623</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Removed systemd references in bootscripts. Fixes + <ulink url="&lfs-ticket-root;3624">#3624</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Simlify lto instructions in chapter 6 gcc. Fixes + <ulink url="&lfs-ticket-root;3626">#3626</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update XML-Parser source location. Fixes + <ulink url="&lfs-ticket-root;3628">#3628</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to eudev-1.9. Fixes + <ulink url="&lfs-ticket-root;3630">#3630</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to kbd-2.0.2. Fixes + <ulink url="&lfs-ticket-root;3631">#3631</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2014-07-02</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 7b0d9d188..d5752e0c6 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -112,9 +112,9 @@ <listitem> <para>IPRoute2 &iproute2-version;</para> </listitem> - <!--<listitem> + <listitem> <para>Kbd &kbd-version;</para> - </listitem>--> + </listitem> <listitem> <para>Kmod &kmod-version;</para> </listitem> diff --git a/chapter06/eudev.xml b/chapter06/eudev.xml index b0fd145b3..58acd5a03 100644 --- a/chapter06/eudev.xml +++ b/chapter06/eudev.xml @@ -73,7 +73,7 @@ BLKID_LIBS='-L/tools/lib -lblkid' \ <para>Create some directories now that are needed for tests, but will also be used as a part of installation:</para> -<screen><userinput remap="install">mkdir -pv /lib/{firmware,udev/devices/pts} +<screen><userinput remap="install">mkdir -pv /lib/{firmware,udev} mkdir -pv /lib/udev/rules.d mkdir -pv /etc/udev/rules.d</userinput></screen> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 9ab97ea22..73ea27b63 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -154,15 +154,7 @@ cd ../gcc-build</userinput></screen> Link Time Optimization (LTO):</para> <screen><userinput remap="install">install -dm755 /usr/lib/bfd-plugins -pushd /usr/lib/bfd-plugins - -if [ $(uname -m) == "i686" ]; then - ln -sfv ../../libexec/gcc/i686-pc-linux-gnu/&gcc-version;/liblto_plugin.so -else - ln -sfv ../../libexec/gcc/x86_64-unknown-linux-gnu/&gcc-version;/liblto_plugin.so -fi - -popd</userinput></screen> +ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so</userinput></screen> <para>Now that our final toolchain is in place, it is important to again ensure that compiling and linking will work as expected. We do this by performing diff --git a/chapter07/usage.xml b/chapter07/usage.xml index 056102515..6d2779e90 100644 --- a/chapter07/usage.xml +++ b/chapter07/usage.xml @@ -210,18 +210,6 @@ EOF</userinput></screen> <sect2> <title>Udev Bootscripts</title> - <para>The first LFS bootscript, - <filename>/etc/init.d/mountvirtfs</filename> will copy any devices - located in <filename class="directory">/lib/udev/devices</filename> to - <filename class="directory">/dev</filename>. This is necessary because - some devices, directories, and symlinks are needed before the dynamic - device handling processes are available during the early stages of - booting a system, or are required by <command>udevd</command> itself. - Creating static device nodes in <filename - class="directory">/lib/udev/devices</filename> also provides an easy - workaround for devices that are not supported by the dynamic device - handling infrastructure.</para> - <para>The <filename>/etc/rc.d/init.d/udev</filename> initscript starts <command>udevd</command>, triggers any "coldplug" devices that have already been created by the kernel and waits for any rules to complete. diff --git a/general.ent b/general.ent index bde72e71d..96232a462 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ -<!ENTITY version "SVN-20140702"> +<!ENTITY version "SVN-20140708"> <!ENTITY short-version "svn"> <!-- Used in dbus chapter, change to x.y for release --> -<!ENTITY releasedate "July 02, 2014"> +<!ENTITY releasedate "July 8, 2014"> <!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.6"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index 0e9cdbacc..178a906f3 100644 --- a/packages.ent +++ b/packages.ent @@ -147,10 +147,10 @@ <!ENTITY e2fsprogs-ch6-du "64 MB"> <!ENTITY e2fsprogs-ch6-sbu "1.7 SBU"> -<!ENTITY eudev-version "1.8"> -<!ENTITY eudev-size "1,716 KB"> +<!ENTITY eudev-version "1.9"> +<!ENTITY eudev-size "1,722 KB"> <!ENTITY eudev-url "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz"> -<!ENTITY eudev-md5 "4520cf7ba2ec4be1bd0ac5ff75c8b315"> +<!ENTITY eudev-md5 "da8083b30b44177445b21e8299af23a1"> <!ENTITY eudev-manpages-size "9 KB"> <!ENTITY eudev-manpages-url "&anduin-other;eudev-&eudev-version;-manpages.tar.bz2"> <!ENTITY eudev-manpages-md5 "9742236280dfc34ba034173efd69f5cf"> @@ -346,10 +346,10 @@ <!ENTITY iproute2-ch6-du "7.3 MB"> <!ENTITY iproute2-ch6-sbu "0.1 SBU"> -<!ENTITY kbd-version "2.0.1"> -<!ENTITY kbd-size "1,962 KB"> +<!ENTITY kbd-version "2.0.2"> +<!ENTITY kbd-size "2,105 KB"> <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.gz"> -<!ENTITY kbd-md5 "e9f2b7046312c11cec9e52e22f307b6a"> +<!ENTITY kbd-md5 "ba56fb5bfd44acea83fc5dac4a9b7f15"> <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd"> <!ENTITY kbd-ch6-du "20 MB"> <!ENTITY kbd-ch6-sbu "0.1 SBU"> @@ -370,7 +370,7 @@ <!ENTITY less-ch6-du "3.6 MB"> <!ENTITY less-ch6-sbu "less than 0.1 SBU"> -<!ENTITY lfs-bootscripts-version "20140511"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20140629"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- 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 --> @@ -407,12 +407,12 @@ <!ENTITY linux-major-version "3"> <!ENTITY linux-minor-version "15"> -<!ENTITY linux-patch-version "1"> +<!ENTITY linux-patch-version "4"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> -<!ENTITY linux-size "77,813 KB"> +<!ENTITY linux-size "77,793 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> -<!ENTITY linux-md5 "72bd0bf0e773963217c89cddbf3e0048"> +<!ENTITY linux-md5 "5525ef4f6f577682d7ea2bf992aa6bcf"> <!ENTITY linux-home "http://www.kernel.org/"> <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is allnoconfig extended for a hopefully-bootable build on desktop machine, @@ -649,7 +649,7 @@ <!ENTITY xml-parser-version "2.42_01"> <!ENTITY xml-parser-size "236 KB"> -<!ENTITY xml-parser-url "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz"> +<!ENTITY xml-parser-url "http://cpan.metacpan.org/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"> |