gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-09 22:04:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync to LFS r10986.

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10987 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
DJ Lucas 2016-01-17 22:56:35 +00:00
parent 26ae89aa60
commit ee46f608ef
4 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
chapter01/changelog.xml
View File

@ -36,6 +36,21 @@
</listitem> </listitem>
--> -->
<listitem>
<para>2016-01-17</para>
<itemizedlist>
<listitem>
<para>[dj] - Sync to LFS r10986.</para>
</listitem>
<listitem>
<para>[dj] - Update to linux-4.4 - Merged from trunk.</para>
</listitem>
<listitem>
<para>[dj] - Update to iproute2-4.4.0 - Merged from trunk.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2016-01-02</para> <para>2016-01-02</para>
<itemizedlist> <itemizedlist>

33
chapter06/iproute2.xml
View File

@ -41,32 +41,19 @@
<sect2 role="installation"> <sect2 role="installation">
<title>Installation of IPRoute2</title> <title>Installation of IPRoute2</title>
<para>The <command>arpd</command> binary included in this package is <para>The <command>arpd</command> program included in this package will not
dependent on Berkeley DB. Because <command>arpd</command> is not a very be built since it is dependent on Berkeley DB, which is not installed in
common requirement on a base Linux system, remove the dependency on Berkeley LFS. However, documentation files and a directory for
DB by applying the commands below. If the <command>arpd</command> binary is <command>arpd</command> will still be installed. Prevent this by running
needed, instructions for compiling Berkeley DB can be found in the BLFS Book the commands below. If the <command>arpd</command> binary is needed,
at <ulink url="&blfs-book;server/databases.html#db"/>. instructions for compiling Berkeley DB can be found in the BLFS Book at
<ulink url="&blfs-book;server/databases.html#db"/>.
</para> </para>
<screen><userinput remap="pre">sed -i '/^TARGETS/s@arpd@@g' misc/Makefile <screen><userinput remap="pre">sed -i /ARPD/d Makefile
sed -i /ARPD/d Makefile sed -i 's/arpd.8//' man/man8/Makefile
sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen> rm -v doc/arpd.sgml</userinput></screen>
<!-- Save as comments for now
<para>Remove a compiler flag that causes the compilation to fail:</para>
<screen><userinput remap="pre">sed -i 's/-Werror//' Makefile</userinput></screen>
-->
<!--
<para>Do not build the unneeded tipc program. Transparent Inter-process
Communication (TIPC) is a network communications protocol for Inter-process
communication (IPC) that was designed for intra-cluster
communication.</para>
<screen><userinput remap="pre">sed -i 's/tipc //' Makefile</userinput></screen>
-->
<para>Compile the package:</para> <para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen> <screen><userinput remap="make">make</userinput></screen>

4
general.ent
View File

@ -1,6 +1,6 @@
<!ENTITY version "20160102-systemd"> <!ENTITY version "20160117-systemd">
<!ENTITY short-version "systemd"> <!-- Used in dbus chapter, change to x.y for release --> <!ENTITY short-version "systemd"> <!-- Used in dbus chapter, change to x.y for release -->
<!ENTITY releasedate "January 2, 2016"> <!ENTITY releasedate "January 17, 2016">
<!ENTITY copyrightdate "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.9"> <!ENTITY milestone "7.9">
<!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

18
packages.ent
View File

@ -317,10 +317,10 @@
<!ENTITY intltool-ch6-du "1.2 MB"> <!ENTITY intltool-ch6-du "1.2 MB">
<!ENTITY intltool-ch6-sbu "less than 0.1 SBU"> <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
<!ENTITY iproute2-version "4.3.0"> <!ENTITY iproute2-version "4.4.0">
<!ENTITY iproute2-size "514 KB"> <!ENTITY iproute2-size "517 KB">
<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz"> <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
<!ENTITY iproute2-md5 "1a2bbb80cfc7ab3f3e987e18b3207c2f"> <!ENTITY iproute2-md5 "d762653ec3e1ab0d4a9689e169ca184f">
<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/"> <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
<!ENTITY iproute2-ch6-du "10 MB"> <!ENTITY iproute2-ch6-du "10 MB">
<!ENTITY iproute2-ch6-sbu "0.2 SBU"> <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@ -374,13 +374,13 @@
<!ENTITY libtool-ch6-sbu "2.3 SBU"> <!ENTITY libtool-ch6-sbu "2.3 SBU">
<!ENTITY linux-major-version "4"> <!ENTITY linux-major-version "4">
<!ENTITY linux-minor-version "3"> <!ENTITY linux-minor-version "4">
<!ENTITY linux-patch-version "3"> <!ENTITY linux-patch-version "0">
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
<!ENTITY linux-size "84,888 KB"> <!ENTITY linux-size "85,250 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "f3068333fa524ff98914cf751d0b5710"> <!ENTITY linux-md5 "9a78fa2eb6c68ca5a40ed5af08142599">
<!ENTITY linux-home "http://www.kernel.org/"> <!ENTITY linux-home "http://www.kernel.org/">
<!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine, allnoconfig extended for a hopefully-bootable build on desktop machine,