From 96e154983a88c62e539c56d25ad08fe777480ff6 Mon Sep 17 00:00:00 2001 From: Jim Gifford Date: Sat, 12 Mar 2005 01:42:42 +0000 Subject: Reverted changes from 4729 and 4730 git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4731 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 16 ++++++---------- chapter03/patches.xml | 14 ++++++++++++++ chapter06/hotplug.xml | 36 +----------------------------------- general.ent | 14 +++++++------- 4 files changed, 28 insertions(+), 52 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 8f4c138d7..84307c6a0 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -26,31 +26,30 @@ first a summary, then a detailed log. E2fsprogs 1.36 Expect 5.43.0 File 4.13 -Findutils 4.2.19 +Findutils 4.2.18 GCC 3.4.3 Gettext 0.14.2 -Glibc 2.3.4 +Glibc 20041011 Grep 2.5.1a Grub 0.96 Iana-Etc 1.04 Iproute2 2.6.9-041019 LFS-Bootscripts 3.1.0 Libtool 1.5.14 -Linux 2.6.11.2 +Linux 2.6.10 Linux-libc-headers 2.6.10.0 Man 1.5p Man-pages 2.01 Module-init-tools 3.1 Perl 5.8.6 Procps 3.2.5 -Psmisc 21.6 Sed 4.1.4 Shadow 4.0.7 Sysvinit 2.86 Tar 1.15.1 Texinfo 4.8 Tcl 8.4.9 -Udev 054 +Udev 050 Util-linux 2.12q Zlib 1.2.2 @@ -61,7 +60,9 @@ first a summary, then a detailed log. bash-3.0-fixes-3.patch bash-3.0-avoid_WCONTINUED-1.patch Hotplug 2004_09_23 +iproute2-2.6.9_041019-find_update-1.patch Libol 0.3.15 +linux-2.6.10-security_fix-1.patch Syslog-ng 1.6.6 util-linux-2.12p-cramfs-1.patch vim-6.0-security_fix-1.patch @@ -80,11 +81,6 @@ first a summary, then a detailed log. -March 11, 2005 [jim]: Added /var/log/hotplug for capturing -of hotplug events. Added /lib/firmware for firmware loading with hotplug -Upgrades psmisc to 21.6. Upgraded Kernel to 2.6.11.2. Upgraded IPRoute2 -to 2.6.11-050310. Removed unused patches from patches list - March 10, 2005 [matt]: gettext no longer installs libgettext{lib,src}.a (Jack Brown) diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 262bcbedc..71cabfc5f 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -99,6 +99,20 @@ needed to build an LFS system: + +IPRoute2 Find Update Patch - 1 KB: + + + + + + +Linux 2.6.10 Security Vulnerability Patch - 1 KB: + + + + + Mktemp Tempfile Patch - 3 KB: diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml index f099482d5..b4d40583d 100644 --- a/chapter06/hotplug.xml +++ b/chapter06/hotplug.xml @@ -49,18 +49,6 @@ using the script included with LFS-Bootscripts: that reason, remove the network hotplug agent: rm -f /etc/hotplug/net.agent - -For logging of hotplug events we will create a directory and a -blank file. This file will show all the information passed to hotplug: - -mkdir /var/log/hotplug -touch /var/log/hotplug/events - -For firmware to be loaded by hotplug we will create the necessary -directory: - -mkdir /lib/firmware - @@ -73,7 +61,7 @@ directory: hotplug /etc/hotplug/*.rc, /etc/hotplug/*.agent /etc/hotplug/hotplug.functions, /etc/hotplug/blacklist, /etc/hotplug/{pci,usb}, -/etc/hotplug/usb.usermap, /etc/hotplug.d, /var/log/hotplug/events +/etc/hotplug/usb.usermap, /etc/hotplug.d Short Descriptions @@ -163,16 +151,6 @@ call for each USB device, based on its vendor, id and other attributes. - -/var/log/hotplug/events - -/var/log/hotplug/events -This file contains all the events since bootup that hotplug has called. - - - - /etc/hotplug.d @@ -184,18 +162,6 @@ that are interested in receiving hotplug events. E.g., - - -/lib/firmware - -/lib/firmware -This directory contains the firmware for devices that -need to have there firmware loaded before use. - - - - diff --git a/general.ent b/general.ent index 323a0cc53..92ca8305a 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - + @@ -32,7 +32,7 @@ - + @@ -45,15 +45,15 @@ - - + + - + @@ -66,7 +66,7 @@ - + @@ -76,7 +76,7 @@ - + -- cgit v1.2.3-54-g00ecf