Changeset d82ab5d


Ignore:
Timestamp:
03/31/2021 10:41:34 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
297d9f78
Parents:
9b4ca9a
git-author:
Thomas Trepl <thomas@…> (04/22/2019 06:40:16 AM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:34 AM)
Message:

Merge trunk; Add a note about kernel config to hostreqs.xml

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11584 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r9b4ca9a rd82ab5d  
    4646    -->
    4747
     48    <listitem revision="systemd">
     49      <para>2019-04-20</para>
     50      <itemizedlist>
     51        <listitem>
     52          <para>[bdubbs] - Update to perl-5.28.2. Fixes
     53          <ulink url="&lfs-ticket-root;4460">#4460</ulink>.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[bdubbs] - Update to meson-0.50.1. Fixes
     57          <ulink url="&lfs-ticket-root;4459">#4459</ulink>.</para>
     58        </listitem>
     59        <listitem>
     60          <para>[bdubbs] - Update to linux-5.0.9. Fixes
     61          <ulink url="&lfs-ticket-root;4458">#4458</ulink>.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[bdubbs] - Update to libcap-2.27. Fixes
     65          <ulink url="&lfs-ticket-root;4457">#4457</ulink>.</para>
     66        </listitem>
     67        <listitem>
     68          <para>[renodr] - Fix the syntax used for configuring automatic file
     69          creation and deletion.</para>
     70        </listitem>
     71      </itemizedlist>
     72    </listitem>
     73
    4874    <listitem>
    4975      <para>2019-04-15</para>

  • chapter01/whatsnew.xml

    r9b4ca9a rd82ab5d  
    147147      <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
    148148    </listitem>-->
    149     <!--<listitem>
     149    <listitem>
    150150      <para>Libcap-&libcap-version;</para>
    151     </listitem>-->
     151    </listitem>
    152152    <!--<listitem>
    153153      <para>Libelf-&elfutils-version; (from elfutils)</para>
    … …  
    198198      <para>Patch-&patch-version;</para>
    199199   </listitem>-->
    200    <!--<listitem>
     200   <listitem>
    201201      <para>Perl-&perl-version;</para>
    202    </listitem>-->
     202   </listitem>
    203203    <!--<listitem>
    204204      <para>Pkg-config-&pkgconfig-version;</para>

  • chapter02/hostreqs.xml

    r9b4ca9a rd82ab5d  
    235235-->
    236236
     237    <para arch="ml_32,ml_x32,ml_all">
     238      Building multilib support requires the kernel of the host system
     239      to have 32-bit emulation support included.
     240    </para>
     241<screen arch="ml_32,ml_x32,ml_all">Binary Emulations  ---&gt;
     242    [*] IA32 Emulation
     243    &lt;M&gt;   IA32 a.out support
     244    [*] x32 ABI for 64-bit mode
     245</screen>
     246    <para arch="ml_32,ml_x32,ml_all">The option 'IA32 a.out support' is
     247      optional. In case your kernel does not have 'x32 ABI for 64-bit mode'
     248      enabled but only 'IA32 Emulation', you can continue to build your
     249      system but you have to leave out any sections showing instructions
     250      for building x32 objects. If neither 'IA32 Emulation' nor
     251      'x32 ABI for 64-bit mode' is enabled, you will run in errors
     252      latest when building <application>glibc</application> in Chapter 6,
     253      so an upgrade of your host system is required.
     254    </para>
     255   
    237256</sect1>

  • chapter06/glibc-32.xml

    r9b4ca9a rd82ab5d  
    2020    <primary sortas="a-Glibc-32">Glibc-32</primary>
    2121  </indexterm>
    22 <!--
    23   <sect2 role="package">
    24     <title/>
    2522
    26     <para>The Glibc package contains the main C library. This library provides
    27     the basic routines for allocating memory, searching directories, opening and
    28     closing files, reading and writing files, string handling, pattern matching,
    29     arithmetic, and so on.</para>
    30 
    31     <segmentedlist>
    32       <segtitle>&buildtime;</segtitle>
    33       <segtitle>&diskspace;</segtitle>
    34 
    35       <seglistitem>
    36         <seg>&glibc-ch6-sbu;</seg>
    37         <seg>&glibc-ch6-du;</seg>
    38       </seglistitem>
    39     </segmentedlist>
    40 
    41   </sect2>
    42 -->
    43 
    44   <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
    45  
    46   <sect2 arch="ml_32,ml_all" role="installation">
    47     <title>Installation of Glibc - 32-bit</title>
     23  <sect2 role="installation">
     24    <title>Preparation to install of ML-Glibc</title>
    4825
    4926<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
    … …  
    5229
    5330<screen><userinput remap="pre">mv /usr/include/limits.h{,.backup} </userinput></screen>
     31
     32  </sect2>
     33
     34  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     35 
     36  <sect2 arch="ml_32,ml_all" role="installation">
     37    <title>Installation of Glibc - 32-bit</title>
    5438
    5539    <para>The Glibc documentation recommends building Glibc
    … …  
    6145    <para>Prepare Glibc for compilation:</para>
    6246
    63 <screen><userinput remap="configure">CC="gcc -m32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
    64 CXX="g++ -m32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
     47<screen><userinput remap="configure">CC="gcc -m32 -ffile-prefix-map=/tools=/usr" \
     48CXX="g++ -m32 -ffile-prefix-map=/tools=/usr" \
    6549../configure --prefix=/usr                          \
    6650             --disable-werror                       \
    … …  
    10286
    10387  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     88
     89<!--
     90In case the compilation ends with
     91
     92...
     93if test -r /autolfs/sources/glibc-2.29/build/DESTDIR/usr/include/gnu/stubs-x32.h && cmp -s /autolfs/sources/glibc-2.29/build/stubs.h /autolfs/sources/glibc-2.29/build/DESTDIR/usr/include/gnu/stubs-x32.h; \
     94then echo 'stubs.h unchanged'; \
     95else /usr/bin/install -c -m 644 /autolfs/sources/glibc-2.29/build/stubs.h /autolfs/sources/glibc-2.29/build/DESTDIR/usr/include/gnu/stubs-x32.h; fi
     96rm -f /autolfs/sources/glibc-2.29/build/stubs.h
     97/autolfs/sources/glibc-2.29/build/elf/sln /autolfs/sources/glibc-2.29/build/elf/symlink.list
     98/autolfs/sources/glibc-2.29/build/elf/sln: /autolfs/sources/glibc-2.29/build/elf/sln: cannot execute binary file
     99make[1]: *** [Makefile:106: install-symbolic-link] Error 126
     100make[1]: Leaving directory '/autolfs/sources/glibc-2.29'
     101make: *** [Makefile:12: install] Error 2
     102
     103it is a good sign that the actually running kernel isn't ML-enabled.
     104ArchLinux's kernels are configured like
     105
     106CONFIG_IA32_EMULATION=y
     107# CONFIG_IA32_AOUT is not set
     108# CONFIG_X86_X32 is not set
     109
     110It isn't x32-enabled ==> Error when building x32 stuff
     111-->
    104112 
    105113  <sect2 arch="ml_x32,ml_all" role="installation">
    … …  
    114122      <para>Prepare Glibc for compilation:</para>
    115123
    116 <screen><userinput remap="configure">CC="gcc -mx32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
    117 CXX="g++ -mx32 -ffile-prefix-map=/tools=/usr -isystem /usr/include" \
     124<screen><userinput remap="configure">CC="gcc -mx32 -ffile-prefix-map=/tools=/usr" \
     125CXX="g++ -mx32 -ffile-prefix-map=/tools=/usr" \
    118126../configure --prefix=/usr                          \
    119127             --disable-werror                       \
    … …  
    154162rm -rf build</userinput></screen>
    155163
     164  </sect2>
     165
     166  <!-- ~~~~~~~~~~~~~~~~~~~~ Cleanup ~~~~~~~~~~~~~~~~~~~~ -->
     167
     168  <sect2 role="installation">
     169    <title>Cleanup</title>
     170
    156171    <para>Restore the file we moved temporarily away:</para>
    157172
    … …  
    159174
    160175  </sect2>
    161 
     176 
    162177</sect1>
    163 

  • chapter07/systemd-custom.xml

    r9b4ca9a rd82ab5d  
    113113      and edited as desired.  For example:
    114114
    115 <screen role="nodump"><userinput>mkdir -p /etc/tempfiles.d
    116 cp /usr/lib/tmpfiles.d/tmp.conf /etc/tempfiles.d</userinput></screen>
     115<screen role="nodump"><userinput>mkdir -p /etc/tmpfiles.d
     116cp /usr/lib/tmpfiles.d/tmp.conf /etc/tmpfiles.d</userinput></screen>
    117117     </para>
    118118

  • general.ent

    r9b4ca9a rd82ab5d  
    1 <!ENTITY version         "SVN-20190415">
     1<!ENTITY version         "SVN-20190420">
    22<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
    33                                      Change to x.y for release but not -rc releases -->
    44<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    55
    6 <!ENTITY versiond        "20190415-systemd">
     6<!ENTITY versiond        "20190420-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "April 15, 2019">
     10<!ENTITY releasedate     "April 20, 2019">
    1111
    1212<!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->

  • packages.ent

    r9b4ca9a rd82ab5d  
    398398<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
    399399
    400 <!ENTITY libcap-version "2.26">
    401 <!ENTITY libcap-size "66 KB">
     400<!ENTITY libcap-version "2.27">
     401<!ENTITY libcap-size "67 KB">
    402402<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
    403 <!ENTITY libcap-md5 "968ac4d42a1a71754313527be2ab5df3">
     403<!ENTITY libcap-md5 "2e8f9fab32eb5ccb37969fe317fd17aa">
    404404<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
    405405<!ENTITY libcap-ch6-du "1.4 MB">
    … …  
    432432<!ENTITY linux-major-version "5">
    433433<!ENTITY linux-minor-version "0">
    434 <!ENTITY linux-patch-version "7">
     434<!ENTITY linux-patch-version "9">
    435435<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    436436<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    437 <!ENTITY linux-size "102,779 KB">
     437<!ENTITY linux-size "102,789 KB">
    438438<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    439 <!ENTITY linux-md5 "e4eb618cafb57cf25b8ff28f923d0319">
     439<!ENTITY linux-md5 "f96df26d67d80f4359a93beead476da4">
    440440<!ENTITY linux-home "https://www.kernel.org/">
    441441<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
    … …  
    494494<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
    495495
    496 <!ENTITY meson-version "0.49.2">
    497 <!ENTITY meson-size "1,310 KB">
     496<!ENTITY meson-version "0.50.1">
     497<!ENTITY meson-size "1,370 KB">
    498498<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    499 <!ENTITY meson-md5 "0267b0871266056184c484792572c682">
     499<!ENTITY meson-md5 "24a6527796115828d2ebc75880e18d62">
    500500<!ENTITY meson-home "https://mesonbuild.com">
    501501<!ENTITY meson-ch6-du "24 MB">
    … …  
    554554<!ENTITY patch-ch6-sbu "0.2 SBU">
    555555
    556 <!ENTITY perl-version "5.28.1">
    557 <!ENTITY perl-size "12,083 KB">
     556<!ENTITY perl-version "5.28.2">
     557<!ENTITY perl-size "12,085 KB">
    558558<!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
    559 <!ENTITY perl-md5 "fbb590c305f2f88578f448581b8cf9c4">
     559<!ENTITY perl-md5 "6bb75770e9ba085b32bf13e4be71e4ac">
    560560<!ENTITY perl-home "https://www.perl.org/">
    561561<!ENTITY perl-ch5-du "275 MB">
Note: See TracChangeset for help on using the changeset viewer.