diff options
| -rw-r--r-- | chapter01/changelog.xml | 34 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 22 | ||||
| -rw-r--r-- | chapter05/chapter05.xml | 3 | ||||
| -rw-r--r-- | chapter05/make.xml | 2 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 21 | ||||
| -rw-r--r-- | chapter06/createfiles.xml | 51 | ||||
| -rw-r--r-- | chapter06/e2fsprogs.xml | 10 | ||||
| -rw-r--r-- | chapter06/libelf.xml | 2 | ||||
| -rw-r--r-- | chapter06/make.xml | 2 | ||||
| -rw-r--r-- | general.ent | 6 | ||||
| -rw-r--r-- | packages.ent | 33 |
11 files changed, 108 insertions, 78 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 73e81216c..ac0aa8d8b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,40 @@ --> <listitem> + <para>2018-09-20</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Clean up of unneeded symbolic links. + Reordered packages so version specific packages are + built as late as possible in Chapter 6. Now building + util-linux in Chapter 5 is unneeded and has been removed. + Fixes <ulink url="&lfs-ticket-root;4345">#4345</ulink> and + <ulink url="&lfs-ticket-root;4349">#4349</ulink>.</para> + </listitem> + <listitem revision='sysv'> + <para>[bdubbs] - Update to eudev-3.2.6. Fixes + <ulink url="&lfs-ticket-root;4350">#4350</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to elfutils-0.174 (libelf). Fixes + <ulink url="&lfs-ticket-root;4348">#4348</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to psmisc-23.2. Fixes + <ulink url="&lfs-ticket-root;4347">#4347</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to openssl-1.1.1. Fixes + <ulink url="&lfs-ticket-root;4346">#4346</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to linux-4.18.9. Fixes + <ulink url="&lfs-ticket-root;4344">#4344</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2018-09-02</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 44d68ccd9..9b33722de 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -68,9 +68,9 @@ <!--<listitem> <para>Diffutils-&diffutils-version;</para> </listitem>--> - <!--<listitem revision="sysv"> + <listitem revision="sysv"> <para>Eudev-&eudev-version;</para> - </listitem>--> + </listitem> <listitem> <para>E2fsprogs-&e2fsprogs-version;</para> </listitem> @@ -149,18 +149,18 @@ <!--<listitem> <para>Libcap-&libcap-version;</para> </listitem>--> - <!--<listitem> - <para>Libelf-&elfutils-version;</para> - </listitem>--> + <listitem> + <para>Libelf-&elfutils-version; (from elfutils)</para> + </listitem> <!--<listitem> <para>Libpipeline-&libpipeline-version;</para> </listitem>--> <!--<listitem> <para>Libtool-&libtool-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Linux-&linux-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>M4-&m4-version;</para> </listitem>--> @@ -185,9 +185,9 @@ <!--<listitem> <para>Ncurses-&ncurses-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Openssl-&openssl-version;</para> - </listitem>--> + </listitem> <!-- <listitem> <para>Patch-&patch-version;</para> </listitem>--> @@ -200,9 +200,9 @@ <!--<listitem> <para>Procps-ng-&procps-ng-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Psmisc-&psmisc-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Python-&python-version;</para> </listitem>--> diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 7b215ba49..1951fde7e 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -24,7 +24,6 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/> -<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/> --> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/> @@ -44,7 +43,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/> +<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>--> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changingowner.xml"/> diff --git a/chapter05/make.xml b/chapter05/make.xml index ec2a6e8d4..1ccc60ece 100644 --- a/chapter05/make.xml +++ b/chapter05/make.xml @@ -42,7 +42,7 @@ <sect2 role="installation"> <title>Installation of Make</title> - <para>First, work around an error caused by glibc-2.27:</para> + <para>First, work around an error caused by glibc-2.27 and later:</para> <screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index cd152491d..79212653c 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -39,7 +39,6 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/> -<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>--> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/> @@ -65,12 +64,6 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/> - - <!-- systemd only --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/> @@ -85,20 +78,24 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/> <!-- systemd only --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/> + <!-- props needs libsystemd --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/> <!-- sysv only --> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/> diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index cd90477df..0f7b7e0ac 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -39,40 +39,27 @@ will be replaced by real files throughout the course of this chapter after the software has been installed:</para> -<!-- -<screen revision="sysv"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin -ln -sv /tools/bin/{install,perl} /usr/bin -ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib -ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib -ln -sv bash /bin/sh +<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin +ln -sv /tools/bin/{env,install,perl} /usr/bin +ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib +ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib +install -vdm755 /usr/lib/pkgconfig -</userinput></screen> ---> -<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la --> +ln -sv bash /bin/sh</userinput></screen> -<!--<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin--> -<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin -ln -sv /tools/bin/{env,install,perl} /usr/bin -ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib -ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib -for lib in blkid lzma mount uuid +<!--for lib in blkid lzma mount uuid do ln -sv /tools/lib/lib$lib.so* /usr/lib -done -ln -svf /tools/include/blkid /usr/include +done--> +<!--ln -svf /tools/include/blkid /usr/include ln -svf /tools/include/libmount /usr/include -ln -svf /tools/include/uuid /usr/include -install -vdm755 /usr/lib/pkgconfig -for pc in blkid mount uuid +ln -svf /tools/include/uuid /usr/include--> +<!--for pc in blkid mount uuid do sed 's@tools@usr@g' /tools/lib/pkgconfig/${pc}.pc \ > /usr/lib/pkgconfig/${pc}.pc -done -ln -sv bash /bin/sh</userinput></screen> - -<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la - sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la--> +done--> <variablelist> <title>The purpose of each link:</title> @@ -108,6 +95,14 @@ ln -sv bash /bin/sh</userinput></screen> </varlistentry> <varlistentry> + <term><parameter><filename>/usr/bin/env</filename></parameter></term> + <listitem> + <para>This pathname is hard-coded into some packages build procedures. + <!-- systemd This may not be needed if we move sysd to the end--></para> + </listitem> + </varlistentry> + + <varlistentry> <term><parameter><filename>/usr/bin/install</filename></parameter></term> <listitem> <para>The path to <filename>install</filename> will be hard-coded into @@ -182,14 +177,14 @@ ln -sv bash /bin/sh</userinput></screen> </varlistentry> --> <!--<varlistentry revision="systemd">--> - <varlistentry> +<!-- <varlistentry> <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term> <listitem> - <para>These links prevent <!--systemd--> utilities from acquiring an + <para>These links prevent utilities from acquiring an unnecessary reference to the <filename class="directory">/tools</filename> directory.</para> </listitem> - </varlistentry> + </varlistentry>--> <varlistentry> <term><parameter><filename>/bin/sh</filename></parameter></term> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 6b935a265..76bb1db15 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -117,13 +117,17 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \ <para>Compile the package:</para> <screen><userinput remap="make">make</userinput></screen> - +<!-- <para>To set up and run the test suite we need to first link some libraries from /tools/lib to a location where the test programs look. To run the tests, issue:</para> +--> + + <para>To run the tests, issue:</para> -<screen><userinput remap="test">ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib -make LD_LIBRARY_PATH=/tools/lib check</userinput></screen> +<screen><userinput remap="test">make check</userinput></screen> +<!--ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib --> +<!--make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>--> <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory. If you do not have significantly more RAM than this, be sure to enable diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml index 7166dd48f..280d1fe66 100644 --- a/chapter06/libelf.xml +++ b/chapter06/libelf.xml @@ -14,7 +14,7 @@ <address>&elfutils-url;</address> </sect1info> - <title>Libelf &elfutils-version;</title> + <title>Libelf from Elfutils-&elfutils-version;</title> <indexterm zone="ch-system-libelf"> <primary sortas="a-Libelf">Libelf</primary> diff --git a/chapter06/make.xml b/chapter06/make.xml index bf57ce74c..e2792976b 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -40,7 +40,7 @@ <sect2 role="installation"> <title>Installation of Make</title> - <para>Again, work around an error caused by glibc-2.27:</para> + <para>Again, work around an error caused by glibc-2.27 and later:</para> <screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen> <para>Prepare Make for compilation:</para> diff --git a/general.ent b/general.ent index 76d72f81e..293f0639f 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20180902"> +<!ENTITY version "SVN-20180920"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; Change to x.y for release but not -rc releases --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> -<!ENTITY versiond "20180902-systemd"> +<!ENTITY versiond "20180920-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "September 2, 2018"> +<!ENTITY releasedate "September 20, 2018"> <!ENTITY copyrightdate "1999-2018"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "8.3"> diff --git a/packages.ent b/packages.ent index 8d6cb6f7d..2ea26a333 100644 --- a/packages.ent +++ b/packages.ent @@ -142,18 +142,18 @@ <!ENTITY e2fsprogs-ch6-du "96 MB"> <!ENTITY e2fsprogs-ch6-sbu "1.6 SBU"> -<!ENTITY elfutils-version "0.173"> -<!ENTITY elfutils-size "8,482 KB"> +<!ENTITY elfutils-version "0.174"> +<!ENTITY elfutils-size "8,497 KB"> <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2"> -<!ENTITY elfutils-md5 "35decb1ebfb90d565e4c411bee4185cc"> +<!ENTITY elfutils-md5 "48bec24c0c8b2c16820326956dff9378"> <!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/"> <!ENTITY elfutils-ch6-du "91 MB"> <!ENTITY elfutils-ch6-sbu "1.0 SBU"> -<!ENTITY eudev-version "3.2.5"> -<!ENTITY eudev-size "1,814 KB"> +<!ENTITY eudev-version "3.2.6"> +<!ENTITY eudev-size "1,849 KB"> <!ENTITY eudev-url "https://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz"> -<!ENTITY eudev-md5 "6ca08c0e14380f87df8e8aceac123671"> +<!ENTITY eudev-md5 "902c4cdc9235838067cc69978a780e72"> <!ENTITY eudev-ch6-du "81 MB"> <!ENTITY eudev-ch6-sbu "0.2 SBU"> @@ -413,12 +413,12 @@ <!ENTITY linux-major-version "4"> <!ENTITY linux-minor-version "18"> -<!ENTITY linux-patch-version "5"> +<!ENTITY linux-patch-version "9"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> --> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -<!ENTITY linux-size "99,411 KB"> +<!ENTITY linux-size "99,413 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> -<!ENTITY linux-md5 "22851fe6c82db6673a844bbb7c62df67"> +<!ENTITY linux-md5 "6f082741ab20f03a334fe533d533880e"> <!ENTITY linux-home "https://www.kernel.org/"> <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is allnoconfig extended for a hopefully-bootable build on desktop machine, @@ -509,10 +509,10 @@ <!ENTITY ninja-ch6-du "83 MB"> <!ENTITY ninja-ch6-sbu "0.2 SBU"> -<!ENTITY openssl-version "1.1.0i"> -<!ENTITY openssl-size "5,326 KB"> +<!ENTITY openssl-version "1.1.1"> +<!ENTITY openssl-size "8,143 KB"> <!ENTITY openssl-url "https://openssl.org/source/openssl-&openssl-version;.tar.gz"> -<!ENTITY openssl-md5 "9495126aafd2659d357ea66a969c3fe1"> +<!ENTITY openssl-md5 "7079eb017429e0ffb9efb42bf80ccb21"> <!ENTITY openssl-home "https://www.openssl.org/"> <!ENTITY openssl-ch6-du "75 MB"> <!ENTITY openssl-ch6-sbu "1.7 SBU"> @@ -553,10 +553,11 @@ <!ENTITY procps-ng-ch6-du "17 MB"> <!ENTITY procps-ng-ch6-sbu "0.1 SBU"> -<!ENTITY psmisc-version "23.1"> -<!ENTITY psmisc-size "290 KB"> -<!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-&psmisc-version;.tar.xz"> -<!ENTITY psmisc-md5 "bbba1f701c02fb50d59540d1ff90d8d1"> +<!ENTITY psmisc-version "23.2"> +<!ENTITY psmisc-size "292 KB"> +<!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc%20devel/psmisc-&psmisc-version;.tar.xz"> +<!-- % is a percent sign - results in %20 (a space in a URL --> +<!ENTITY psmisc-md5 "17b72c193b090f379fedf573123e89b8"> <!ENTITY psmisc-home "http://psmisc.sourceforge.net/"> <!ENTITY psmisc-ch6-du "4.3 MB"> <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU"> |