From 93bc4a2875fdabce7ca6a338cfb04dc9aa04015f Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Wed, 4 Oct 2006 17:08:23 +0000 Subject: [PATCH] Replace the Linux-Libc-Headers package with the 'headers_install' target from the kernel Makefile git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7816 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 5 +++++ chapter03/packages.xml | 9 --------- chapter03/patches.xml | 15 ++++++++++++--- chapter05/chapter05.xml | 2 +- chapter06/chapter06.xml | 2 +- chapter06/util-linux.xml | 7 ++++--- packages.ent | 13 ++++--------- patches.ent | 15 +++++++++------ 8 files changed, 36 insertions(+), 32 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 44b049e10..cd527bc42 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -38,6 +38,11 @@ 2006-10-02 + + [matthew] - Remove Linux-Libc-Headers, replacing it with the + "make headers_install" target now available in the upstream + kernel sources. + [matthew] - Upgrade to Udev-101. diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 0b0a74a39..e2e0d7b48 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -328,15 +328,6 @@ - - Linux-Libc-Headers (&linux-libc-headers-version;) - &linux-libc-headers-size;: - - Home page: - Download: - MD5 sum: &linux-libc-headers-md5; - - - M4 (&m4-version;) - &m4-size;: diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 9610dd65f..5268eb9f5 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -171,10 +171,10 @@ - Linux Libc Headers Inotify Patch - &linux-inotify-patch-size;: + Linux Unifdef Patch - &linux-unifdef-patch-size;: - Download: - MD5 sum: &linux-inotify-patch-md5; + Download: + MD5 sum: &linux-unifdef-patch-md5; @@ -283,6 +283,15 @@ + + Util-linux Lseek Patch - &util-linux-lseek-patch-size;: + + Download: + MD5 sum: &util-linux-lseek-patch-md5; + + + + Vim Upstream Fixes Patch - &vim-fixes-patch-size;: diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index df3d854bb..05c68aa36 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -15,7 +15,7 @@ - + diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 6238aec11..8d759a775 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -17,7 +17,7 @@ - + diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 900c89e40..d951564d5 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -52,10 +52,11 @@ mkdir -p /var/lib/hwclock Installation of Util-linux - Util-linux fails to compile against newer versions of Linux-Libc-Headers. - The following patch properly fixes this issue: + Util-linux fails to compile against newer versions of Linux kernel + headers. The following patches properly fix the problems: -patch -Np1 -i ../&util-linux-cramfs-patch; +patch -Np1 -i ../&util-linux-cramfs-patch; +patch -Np1 -i ../&util-linux-lseek-patch; Prepare Util-linux for compilation: diff --git a/packages.ent b/packages.ent index 12c48d52c..56115726b 100644 --- a/packages.ent +++ b/packages.ent @@ -306,15 +306,10 @@ - - - - - - - - - + + + + diff --git a/patches.ent b/patches.ent index eb6d04db4..fe4656543 100644 --- a/patches.ent +++ b/patches.ent @@ -90,9 +90,9 @@ - - - + + + @@ -121,9 +121,9 @@ - - - + + + @@ -152,6 +152,9 @@ + + +