diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter05/linux-headers.xml | 14 | ||||
| -rw-r--r-- | chapter06/linux-headers.xml | 20 | ||||
| -rw-r--r-- | general.ent | 6 | ||||
| -rw-r--r-- | packages.ent | 14 |
5 files changed, 39 insertions, 25 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index fd6f2689f..ec69d4748 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,16 @@ --> <listitem> + <para>2019-09-24</para> + <itemizedlist> + <listitem> + <para>[pierre] - Update to linux-5.3.1. Fixes + <ulink url="&lfs-ticket-root;4528">#4528</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2019-09-14</para> <itemizedlist> <listitem> diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml index b5f134ee3..7a92b466f 100644 --- a/chapter05/linux-headers.xml +++ b/chapter05/linux-headers.xml @@ -53,12 +53,14 @@ <screen><userinput remap="pre">make mrproper</userinput></screen> <para>Now extract the user-visible kernel headers from the source. - They are placed in an intermediate local directory and copied to the needed - location because the extraction process removes any existing files in - the target directory.</para> - -<screen><userinput remap="make">make INSTALL_HDR_PATH=dest headers_install -</userinput><userinput remap="install">cp -rv dest/include/* /tools/include</userinput></screen> + The recommended make target <quote>headers_install</quote> cannot be + used, because it requires <application>rsync</application>, which may not + be available. The headers are first placed in + <filename class="directory">./usr</filename>, then copied to the needed + location.</para> + +<screen><userinput remap="make">make headers +</userinput><userinput remap="install">cp -rv usr/include/* /tools/include</userinput></screen> </sect2> diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml index 1bf45bff5..f1d4cb14e 100644 --- a/chapter06/linux-headers.xml +++ b/chapter06/linux-headers.xml @@ -53,15 +53,17 @@ <screen><userinput remap="pre">make mrproper</userinput></screen> <para>Now extract the user-visible kernel headers from the source. - They are placed in an intermediate local directory and copied to the needed - location because the extraction process removes any existing files in - the target directory. There are also some hidden files used by - the kernel developers and not needed by LFS that are removed from - the intermediate directory.</para> - -<screen><userinput remap="make">make INSTALL_HDR_PATH=dest headers_install -find dest/include \( -name .install -o -name ..install.cmd \) -delete -</userinput><userinput remap="install">cp -rv dest/include/* /usr/include</userinput></screen> + The recommended make target <quote>headers_install</quote> cannot be + used, because it requires <application>rsync</application>, which is + not available in <filename class="directory">/tools</filename>. The + headers are first placed in <filename class="directory">./usr</filename>, + then some files used by the kernel developers are removed, then + the files are copied to their final location.</para> + +<screen><userinput remap="make">make headers +find usr/include -name '.*' -delete +rm usr/include/Makefile +</userinput><userinput remap="install">cp -rv usr/include/* /usr/include</userinput></screen> </sect2> diff --git a/general.ent b/general.ent index c597e7369..e91b9b9ad 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20190914"> +<!ENTITY version "SVN-20190924"> <!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 "20190914-systemd"> +<!ENTITY versiond "20190924-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "September 14th, 2019"> +<!ENTITY releasedate "September 24th, 2019"> <!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "9.0"> diff --git a/packages.ent b/packages.ent index 33ce4f70d..5d686c2c5 100644 --- a/packages.ent +++ b/packages.ent @@ -421,13 +421,13 @@ <!ENTITY libtool-ch6-sbu "1.9 SBU"> <!ENTITY linux-major-version "5"> -<!ENTITY linux-minor-version "2"> -<!ENTITY linux-patch-version "14"> +<!ENTITY linux-minor-version "3"> +<!ENTITY linux-patch-version "1"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -<!ENTITY linux-size "104,567 KB"> +<!ENTITY linux-size "106,003 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> -<!ENTITY linux-md5 "b3ffd400c356a8b7a49db5eb90c38644"> +<!ENTITY linux-md5 "4c68633ce304b8fbc7be2d3452060c11"> <!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, @@ -435,10 +435,10 @@ <!ENTITY linux-ch8-du "960 - 4250 MB (typically about 1100 MB)"> <!ENTITY linux-ch8-sbu "4.4 - 66.0 SBU (typically about 6 SBU)"> -<!ENTITY linux-headers-ch5-du "960 MB"> +<!ENTITY linux-headers-ch5-du "1 GB"> <!ENTITY linux-headers-ch5-sbu "0.1 SBU"> -<!ENTITY linux-headers-ch6-du "960 MB"> -<!ENTITY linux-headers-ch6-sbu "less than 0.1 SBU"> +<!ENTITY linux-headers-ch6-du "1 GB"> +<!ENTITY linux-headers-ch6-sbu "0.1 SBU"> <!ENTITY m4-version "1.4.18"> <!ENTITY m4-size "1,180 KB"> |