Remove Libnl as IPRoute2 doesn't need it.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9707 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

8 files changed, 18 insertions, 162 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d48d46148..64e9ab82c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,17 @@
 -->
 
     <listitem>
+      <para>2012-01-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Remove Libnl, as it's not actually required by
+          IPRoute2 after all. Thanks to Markku Pesonen for the pointer to the
+          upstream fix.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2012-01-08</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 2100cf1e6..c42717977 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -118,9 +118,6 @@
     <!--<listitem>
       <para>LFS-Bootscripts &lfs-bootscripts-version;</para>
     </listitem>-->
-    <listitem>
-      <para>Libnl &libnl-version;</para>
-    </listitem>
     <!--<listitem>
       <para>Libpipeline &libpipeline-version;</para>
     </listitem>-->
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 4d665fbd8..85282509b 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -303,15 +303,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Libnl (&libnl-version;) - <token>&libnl-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libnl-home;"/></para>
-        <para>Download: <ulink url="&libnl-url;"/></para>
-        <para>MD5 sum: <literal>&libnl-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Libpipeline (&libpipeline-version;) - <token>&libpipeline-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&libpipeline-home;"/></para>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index b95ae37fe..b17c3695a 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -56,7 +56,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 4a95145f7..5a69518e9 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -53,6 +53,11 @@
 sed -i /ARPD/d Makefile
 rm man/man8/arpd.8</userinput></screen>
 
+    <para>Remove references to some Libnl headers that are not required by
+    IPRoute2:</para>
+
+<screen><userinput remap="pre">sed -i -e '/netlink\//d' ip/ipl2tp.c</userinput></screen>
+
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make DESTDIR=</userinput></screen>
diff --git a/chapter06/libnl.xml b/chapter06/libnl.xml
deleted file mode 100644
index ed4d8b738..000000000
--- a/chapter06/libnl.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libnl" role="wrap">
-  <?dbhtml filename="libnl.html"?>
-
-  <sect1info condition="script">
-    <productname>libnl</productname>
-    <productnumber>&libnl-version;</productnumber>
-    <address>&libnl-url;</address>
-  </sect1info>
-
-  <title>Libnl-&libnl-version;</title>
-
-  <indexterm zone="ch-system-libnl">
-    <primary sortas="a-Libnl">Libnl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Libnl package contains a collection of libraries providing APIs to netlink protocol based
-    Linux kernel interfaces.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&libnl-ch6-sbu;</seg>
-        <seg>&libnl-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libnl</title>
-
-    <para>Prepare Libnl for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr --sysconfdir=/etc \
-  --disable-static</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-libnl" role="content">
-    <title>Contents of Libnl</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>libnl-cli.so,libnl-genl.so,libnl-nf.so,libnl-route.so,
-        libnl.so</seg>
-        <seg>/etc/libnl,/usr/include/netlink,/usr/include/netlink/genl,
-        /usr/include/netlink/netfilter,/usr/include/netlink/route</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnl-cli">
-        <term><filename class="libraryfile">libnl-cli</filename></term>
-        <listitem>
-          <para></para>
-          <indexterm zone="ch-system-libnl">
-            <primary sortas="c-libnl-cli">libnl-cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnl-genl">
-        <term><filename class="libraryfile">libnl-genl</filename></term>
-        <listitem>
-          <para>Contains support for the generic netlink protocol, an extended version of the netlink
-          protocol</para>
-          <indexterm zone="ch-system-libnl">
-            <primary sortas="c-libnl-genl">libnl-genl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnl-nf">
-        <term><filename class="libraryfile">libnl-nf</filename></term>
-        <listitem>
-          <para>Contains support for netlink based netfilter configuration and monitoring interfaces
-          (conntrack, log, queue)</para>
-          <indexterm zone="ch-system-libnl">
-            <primary sortas="c-libnl-nf">libnl-nf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnl-route">
-        <term><filename class="libraryfile">libnl-route</filename></term>
-        <listitem>
-          <para>Contains support for the configuration of interfaces of the NETLINK_ROUTE family including
-          network interfaces, routes, addresses, neighbours, and traffic control</para>
-          <indexterm zone="ch-system-libnl">
-            <primary sortas="c-libnl-route">libnl-route</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnl">
-        <term><filename class="libraryfile">libnl</filename></term>
-        <listitem>
-          <para>Contains support for implementing the fundamentals required to use the netlink protocol
-          such as socket handling, message construction and parsing, and sending and receiving of
-          data.</para>
-          <indexterm zone="ch-system-libnl">
-            <primary sortas="c-libnl">libnl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
diff --git a/general.ent b/general.ent
index e2d5cbee2..31663409d 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120108">
-<!ENTITY releasedate "Jan 8, 2012">
+<!ENTITY version "SVN-20120111">
+<!ENTITY releasedate "Jan 11, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.1">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 9c92c46c9..a55a6d71a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -305,14 +305,6 @@
 <!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
-<!ENTITY libnl-version "2.0">
-<!ENTITY libnl-size "650 KB">
-<!ENTITY libnl-url "http://www.infradead.org/~tgr/libnl/files/libnl-&libnl-version;.tar.gz">
-<!ENTITY libnl-md5 "6aaf1e9802a17a7d702bb0638044ffa7">
-<!ENTITY libnl-home "http://www.infradead.org/~tgr/libnl/">
-<!ENTITY libnl-ch6-du "22.0 MB">
-<!ENTITY libnl-ch6-sbu "0.1 SBU">
-
 <!ENTITY libpipeline-version "1.2.0">
 <!ENTITY libpipeline-size "670 KB">
 <!ENTITY libpipeline-url "http://download.savannah.gnu.org/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">