gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-09 23:49:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from trunk

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11606 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2019-05-16 06:29:32 +00:00 committed by Xℹ Ruoyao
parent cad96bf236
commit f5ae110a14
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
8 changed files with 48 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chapter01/changelog.xml
View File

@ -45,6 +45,16 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem revision="systemd">
<para>2019-05-11</para>
<itemizedlist>
<listitem>
<para>[pierre] - Fix a hardcoded path to /usr/bin/find in the
systemd unit of man-db.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2019-05-03</para>
<itemizedlist>

34
chapter05/gcc-pass1.xml
View File

@ -155,31 +155,10 @@ cd build</userinput></screen>
<para>Prepare GCC for compilation:</para>
<screen arch="default"><userinput remap="configure">../configure \
--target=$LFS_TGT \
--prefix=/tools \
--with-glibc-version=2.11 \
--with-sysroot=$LFS \
--with-newlib \
--without-headers \
--with-local-prefix=/tools \
--with-native-system-header-dir=/tools/include \
--disable-nls \
--disable-shared \
--disable-multilib \
--disable-decimal-float \
--disable-threads \
--disable-libatomic \
--disable-libgomp \
--disable-libquadmath \
--disable-libssp \
--disable-libvtv \
--disable-libstdcxx \
--enable-languages=c,c++</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">mlist="m64"</userinput>
<userinput arch="ml_32,ml_all" remap="configure">mlist="$mlist,m32"</userinput>
<userinput arch="ml_x32,ml_all" remap="configure">mlist="$mlist,mx32"</userinput>
<screen><userinput arch="default" remap="configure">mloptions="--disable-multilib"</userinput>
<userinput arch="ml_32,ml_x32,ml_all" remap="configure">mloptions="--enable-multilib --with-multilib-list=m64"</userinput>
<userinput arch="ml_32,ml_all" remap="configure">mloptions="$mloptions,m32"</userinput>
<userinput arch="ml_x32,ml_all" remap="configure">mloptions="$mloptions,mx32"</userinput>
<userinput remap="configure">../configure \
--target=$LFS_TGT \
--prefix=/tools \
@ -191,8 +170,6 @@ cd build</userinput></screen>
--with-native-system-header-dir=/tools/include \
--disable-nls \
--disable-shared \
--enable-multilib \
--with-multilib-list=$mlist \
--disable-decimal-float \
--disable-threads \
--disable-libatomic \
@ -201,7 +178,8 @@ cd build</userinput></screen>
--disable-libssp \
--disable-libvtv \
--disable-libstdcxx \
--enable-languages=c,c++</userinput></screen>
--enable-languages=c,c++ \
$mloptions</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

27
chapter05/gcc-pass2.xml
View File

@ -139,23 +139,10 @@ cd build</userinput></screen>
<para>Now prepare GCC for compilation:</para>
<screen arch="default"><userinput remap="configure">CC=$LFS_TGT-gcc \
CXX=$LFS_TGT-g++ \
AR=$LFS_TGT-ar \
RANLIB=$LFS_TGT-ranlib \
../configure \
--prefix=/tools \
--with-local-prefix=/tools \
--with-native-system-header-dir=/tools/include \
--enable-languages=c,c++ \
--disable-libstdcxx-pch \
--disable-multilib \
--disable-bootstrap \
--disable-libgomp</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">mlist="m64"</userinput>
<userinput arch="ml_32,ml_all" remap="configure">mlist="$mlist,m32"</userinput>
<userinput arch="ml_x32,ml_all" remap="configure">mlist="$mlist,mx32"</userinput>
<screen><userinput arch="default" remap="configure">mloptions="--disable-multilib"</userinput>
<userinput arch="ml_32,ml_x32,ml_all" remap="configure">mloptions="--with-system-zlib --enable-multilib --with-multilib-list=m64"</userinput>
<userinput arch="ml_32,ml_all" remap="configure">mloptions="$mloptions,m32"</userinput>
<userinput arch="ml_x32,ml_all" remap="configure">mloptions="$mloptions,mx32"</userinput>
<userinput remap="configure">CC=$LFS_TGT-gcc \
CXX=$LFS_TGT-g++ \
AR=$LFS_TGT-ar \
@ -166,11 +153,9 @@ RANLIB=$LFS_TGT-ranlib \
--with-native-system-header-dir=/tools/include \
--enable-languages=c,c++ \
--disable-libstdcxx-pch \
--enable-multilib \
--with-multilib-list=$mlist \
--with-system-zlib \
--disable-bootstrap \
--disable-libgomp</userinput></screen>
--disable-libgomp \
$mloptions</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>

2
chapter06/eudev.xml
View File

@ -49,7 +49,7 @@
<screen><userinput remap="pre">sed -i '/keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c</userinput></screen>
-->
<para>Next, add a workaround to prevent the /tools directory from being
<para>First, add a workaround to prevent the /tools directory from being
hard coded into Eudev binary files library locations:</para>
<screen><userinput remap="pre">cat &gt; config.cache &lt;&lt; "EOF"

31
chapter06/gcc.xml
View File

@ -76,33 +76,16 @@ cd build</userinput></screen>
<para>Prepare GCC for compilation:</para>
<screen arch="default"><userinput remap="configure">SED=sed \
<screen><userinput arch="default" remap="configure">mloptions="--disable-multilib"</userinput>
<userinput arch="ml_32,ml_x32,ml_all" remap="configure">mloptions="--enable-multilib --with-multilib-list=m64"</userinput>
<userinput arch="ml_32,ml_all" remap="configure">mloptions="$mloptions,m32"</userinput>
<userinput arch="ml_x32,ml_all" remap="configure">mloptions="$mloptions,mx32"</userinput>
<userinput remap="configure">SED=sed \
../configure --prefix=/usr \
--enable-languages=c,c++ \
--disable-multilib \
--disable-bootstrap \
--with-system-zlib</userinput></screen>
<screen arch="ml_32"><userinput remap="configure">SED=sed \
../configure --prefix=/usr \
--enable-languages=c,c++ \
--enable-multilib \
--with-multilib-list=m32,m64 \
--disable-bootstrap \
--with-system-zlib</userinput></screen>
<screen arch="ml_x32"><userinput remap="configure">SED=sed \
../configure --prefix=/usr \
--enable-languages=c,c++ \
--enable-multilib \
--with-multilib-list=mx32,m64 \
--disable-bootstrap \
--with-system-zlib</userinput></screen>
<screen arch="ml_all"><userinput remap="configure">SED=sed \
../configure --prefix=/usr \
--enable-languages=c,c++ \
--enable-multilib \
--with-multilib-list=m32,mx32,m64 \
--disable-bootstrap \
--with-system-zlib</userinput></screen>
--with-system-zlib \
$mloptions</userinput></screen>
<para>Note that for other languages, there are some prerequisites that
are not yet available. See the

13
chapter06/man-db.xml
View File

@ -43,7 +43,9 @@
<para>Prepare Man-DB for compilation:</para>
<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr \
<screen revision="systemd"><userinput remap="configure">sed -i '/find/s@/usr@@' init/systemd/man-db.service.in
./configure --prefix=/usr \
--docdir=/usr/share/doc/man-db-&man-db-version; \
--sysconfdir=/etc \
--disable-setuid \
@ -66,6 +68,15 @@
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry revision="systemd">
<term><command>sed -i '/find/s@/usr@@' init/systemd/man-db.service.in</command></term>
<listitem>
<para>This changes a harcoded path to the <command>find</command>
utility, which we install in
<filename class="directory">/bin</filename>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--disable-setuid</parameter></term>
<listitem>

10
chapter06/systemd.xml
View File

@ -198,15 +198,11 @@ rm -f /usr/bin/xsltproc</userinput></screen>
<screen><userinput remap="adjust">systemd-machine-id-setup</userinput></screen>
<para>Create the <filename>/lib/systemd/systemd-user-sessions</filename>
script to allow unprivileged user logins without
<para>Prevent systemd from creating <filename>/run/nologin</filename>
to allow unprivileged user logins without
<application>systemd-logind</application>:</para>
<screen><userinput remap="adjust">cat &gt; /lib/systemd/systemd-user-sessions &lt;&lt; "EOF"
#!/bin/bash
rm -f /run/nologin
EOF
chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
<screen><userinput remap="adjust">rm -f /usr/lib/tmpfiles.d/systemd-nologin.conf</userinput></screen>
</sect2>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20190503">
<!ENTITY version "SVN-20190511">
<!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 "20190503-systemd">
<!ENTITY versiond "20190511-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "May 3, 2019">
<!ENTITY releasedate "May 11, 2019">
<!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.5">