From 6bd5f1124176506262ea32a688c6ce295e8781ac Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 8 Jul 2014 16:36:46 +0000 Subject: Removed references to /lib/udev/devices. Update to linux-3.15.4. Removed systemd references in bootscripts. Simlify lto instructions in chapter 6 gcc. Update XML-Parser source location. Update to eudev-1.9. Update to kbd-2.0.2. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10626 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- bootscripts/ChangeLog | 3 +++ bootscripts/Makefile | 1 - bootscripts/lfs/lib/systemd/ifupdown@.service | 12 ---------- bootscripts/lfs/units/ifupdownat.service | 12 ---------- chapter01/changelog.xml | 34 +++++++++++++++++++++++++++ chapter01/whatsnew.xml | 4 ++-- chapter06/eudev.xml | 2 +- chapter06/gcc.xml | 10 +------- chapter07/usage.xml | 12 ---------- general.ent | 4 ++-- packages.ent | 22 ++++++++--------- 11 files changed, 54 insertions(+), 62 deletions(-) delete mode 100644 bootscripts/lfs/lib/systemd/ifupdown@.service delete mode 100644 bootscripts/lfs/units/ifupdownat.service 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 + * Remove systemd references and files + 2014-03-31 Bruce Dubbs * 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 @@ -35,6 +35,40 @@ --> + + 2014-07-08 + + + [bdubbs] - Removed references to /lib/udev/devices. Fixes + #3620. + + + [bdubbs] - Update to linux-3.15.4. Fixes + #3623. + + + [bdubbs] - Removed systemd references in bootscripts. Fixes + #3624. + + + [bdubbs] - Simlify lto instructions in chapter 6 gcc. Fixes + #3626. + + + [bdubbs] - Update XML-Parser source location. Fixes + #3628. + + + [bdubbs] - Update to eudev-1.9. Fixes + #3630. + + + [bdubbs] - Update to kbd-2.0.2. Fixes + #3631. + + + + 2014-07-02 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 @@ IPRoute2 &iproute2-version; - + Kmod &kmod-version; 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' \ Create some directories now that are needed for tests, but will also be used as a part of installation: -mkdir -pv /lib/{firmware,udev/devices/pts} +mkdir -pv /lib/{firmware,udev} mkdir -pv /lib/udev/rules.d mkdir -pv /etc/udev/rules.d 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 Link Time Optimization (LTO): 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 +ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so 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 Udev Bootscripts - The first LFS bootscript, - /etc/init.d/mountvirtfs will copy any devices - located in /lib/udev/devices to - /dev. 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 udevd itself. - Creating static device nodes in /lib/udev/devices also provides an easy - workaround for devices that are not supported by the dynamic device - handling infrastructure. - The /etc/rc.d/init.d/udev initscript starts udevd, 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 @@ - + - + diff --git a/packages.ent b/packages.ent index 0e9cdbacc..178a906f3 100644 --- a/packages.ent +++ b/packages.ent @@ -147,10 +147,10 @@ - - + + - + @@ -346,10 +346,10 @@ - - + + - + @@ -370,7 +370,7 @@ - + @@ -407,12 +407,12 @@ - + - + - +