aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2011-04-18 18:40:44 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2011-04-18 18:40:44 +0000
commit594959c77762c8ec5251cf5deb93c24d2694246b (patch)
treeb4c5b91c1debdfa1e2fdaef355c0aa0f44c91c62
parent2002e60464dbe0eab12667b4871d310dbf8bb182 (diff)
Upgrade to Udev-167. Fixes #2850.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9498 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml7
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/udev.xml6
-rw-r--r--general.ent4
-rw-r--r--packages.ent8
-rw-r--r--patches.ent5
7 files changed, 21 insertions, 27 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0649151d8..7919d29c8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2011-04-18</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgrade to Udev-167. Fixes
+ <ulink url="&lfs-ticket-root;2850">#2850</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2011-04-13</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 6ee8fa0db..8a6efc411 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -190,9 +190,9 @@
<!--<listitem>
<para>Texinfo &texinfo-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Udev &udev-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>&udev-config;</para>
</listitem>-->
@@ -230,9 +230,6 @@
<listitem>
<para>readline-&readline-version;-fixes-1.patch</para>
</listitem>
- <listitem>
- <para>udev-&udev-version;-v4l1-1.patch</para>
- </listitem>
</itemizedlist>
<itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4d70b0527..f2e6e6cb2 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -156,14 +156,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term>Udev V4L Patch - <token>&udev-v4l-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink url="&patches-root;&udev-v4l-patch;"/></para>
- <para>MD5 sum: <literal>&udev-v4l-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
<!-- <varlistentry>
<term>Shadow Useradd Patch - <token>&shadow-useradd-patch-size;</token>:</term>
<listitem>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 64d5ecc9d..96b1ee4eb 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -41,10 +41,10 @@
<sect2 role="installation">
<title>Installation of Udev</title>
- <para>Apply a patch to fix an issue caused by the removal of the Video for
- Linux 1 API from Linux-&linux-version;:</para>
+ <para>Fix a bug in the Makefile that prevents some tools from being built
+ and installed:</para>
-<screen><userinput remap="pre">patch -Np1 -i ../&udev-v4l-patch;</userinput></screen>
+<screen><userinput remap="pre">sed -i -e '228d' -e '317d' Makefile.am</userinput></screen>
<para>The udev-config tarball contains LFS-specific files used to configure
Udev. Unpack it into the Udev source directory:</para>
diff --git a/general.ent b/general.ent
index 08e23169f..f59736ef0 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110413">
-<!ENTITY releasedate "April 13, 2011">
+<!ENTITY version "SVN-20110418">
+<!ENTITY releasedate "April 18, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "6.9">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 6e0628206..71035f38b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -513,17 +513,17 @@
<!ENTITY texinfo-ch6-du "21 MB">
<!ENTITY texinfo-ch6-sbu "0.3 SBU">
-<!ENTITY udev-version "166">
-<!ENTITY udev-size "573 KB">
+<!ENTITY udev-version "167">
+<!ENTITY udev-size "581 KB">
<!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "4db27d73fdbe94f47fd89fdd105c2dfb">
+<!ENTITY udev-md5 "4b37e1222f06c14c24147de346aa0bad">
<!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev.html">
<!ENTITY udev-ch6-du "9.3 MB">
<!ENTITY udev-ch6-sbu "0.2 SBU">
<!ENTITY udev-testfiles-url "http://anduin.linuxfromscratch.org/sources/other/udev-&udev-version;-testfiles.tar.bz2">
<!ENTITY udev-testfiles-size "150 KB">
-<!ENTITY udev-testfiles-md5 "64ada14e464dee3388787e3aebf2ac34">
+<!ENTITY udev-testfiles-md5 "7f8d2e479254c10592091580b736b0e9">
<!ENTITY udev-testfiles-du "37 MB">
<!ENTITY udev-config "udev-config-20100128"> <!-- Scripts depend on this format -->
diff --git a/patches.ent b/patches.ent
index 060023ff8..79f047b0c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -94,8 +94,3 @@
<!ENTITY tar-overflow-patch "tar-&tar-version;-overflow_fix-1.patch">
<!ENTITY tar-overflow-patch-md5 "1912ec36d2a0e2b96678651cf583ce6f">
<!ENTITY tar-overflow-patch-size "1.7 KB">
-
-
-<!ENTITY udev-v4l-patch "udev-&udev-version;-v4l1-1.patch">
-<!ENTITY udev-v4l-patch-md5 "f927b1454df38902303ad86aed65e0af">
-<!ENTITY udev-v4l-patch-size "1.6 KB">