gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-18 19:29:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'multilib' into multilib_linux-patch

Browse Source
This commit is contained in:
Thomas Trepl 2025-01-04 18:42:36 +01:00
commit c5f9afe7aa
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chapter01/changelog.xml
View File

@ -116,7 +116,7 @@
<ulink url='&lfs-ticket-root;5559'>#5559</ulink>.</para> <ulink url='&lfs-ticket-root;5559'>#5559</ulink>.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>[bdubbs] - Update to Python-3.13.1. Fixes <para>[bdubbs] - Update to Python-3.13.1 (Security Update). Fixes
<ulink url='&lfs-ticket-root;5605'>#5605</ulink>.</para> <ulink url='&lfs-ticket-root;5605'>#5605</ulink>.</para>
</listitem> </listitem>
<listitem> <listitem>

12
chapter04/addinguser.xml
View File

@ -20,8 +20,8 @@
the installation process. As <systemitem class="username">root</systemitem>, the installation process. As <systemitem class="username">root</systemitem>,
issue the following commands to add the new user:</para> issue the following commands to add the new user:</para>
<screen><userinput>groupadd lfs <screen><userinput>groupadd &lfs-groupname;
useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen> useradd -s /bin/bash -g &lfs-groupname; -m -k /dev/null &lfs-username;</userinput></screen>
<variablelist> <variablelist>
<title>This is what the command line options mean:</title> <title>This is what the command line options mean:</title>
@ -74,15 +74,15 @@ useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
have a password), you need to set a password for &lfs-user;. Issue the have a password), you need to set a password for &lfs-user;. Issue the
following command as the &root; user to set the password:</para> following command as the &root; user to set the password:</para>
<screen role="nodump"><userinput>passwd lfs</userinput></screen> <screen role="nodump"><userinput>passwd &lfs-username;</userinput></screen>
<para>Grant <systemitem class="username">lfs</systemitem> full access to <para>Grant <systemitem class="username">lfs</systemitem> full access to
all the directories under <filename class="directory">$LFS</filename> by making all the directories under <filename class="directory">$LFS</filename> by making
<systemitem class="username">lfs</systemitem> the owner:</para> <systemitem class="username">lfs</systemitem> the owner:</para>
<screen><userinput>chown -v lfs $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools} <screen><userinput>chown -v &lfs-username; $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
case $(uname -m) in case $(uname -m) in
x86_64) chown -v lfs $LFS/lib64 ;; x86_64) chown -v &lfs-username; $LFS/lib64 ;;
esac</userinput></screen> esac</userinput></screen>
<screen arch="ml_32" ><userinput>chown -v lfs $LFS/lib32</userinput></screen> <screen arch="ml_32" ><userinput>chown -v lfs $LFS/lib32</userinput></screen>
<screen arch="ml_x32" ><userinput>chown -v lfs $LFS/libx32</userinput></screen> <screen arch="ml_x32" ><userinput>chown -v lfs $LFS/libx32</userinput></screen>
@ -97,7 +97,7 @@ esac</userinput></screen>
logging in as &lfs-user; on a virtual console, or with the following logging in as &lfs-user; on a virtual console, or with the following
substitute/switch user command:</para> substitute/switch user command:</para>
<screen role="nodump"><userinput>su - lfs</userinput></screen> <screen role="nodump"><userinput>su - &lfs-username;</userinput></screen>
<para>The <quote><parameter>-</parameter></quote> instructs <para>The <quote><parameter>-</parameter></quote> instructs
<command>su</command> to start a login shell as opposed to a non-login shell. <command>su</command> to start a login shell as opposed to a non-login shell.

4
chapter07/changingowner.xml
View File

@ -33,9 +33,9 @@
user <systemitem class="username">root</systemitem> by running the following user <systemitem class="username">root</systemitem> by running the following
command:</para> command:</para>
<screen><userinput>chown --from lfs -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools} <screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
case $(uname -m) in case $(uname -m) in
x86_64) chown --from lfs -R root:root $LFS/lib64 ;; x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;;
esac</userinput></screen> esac</userinput></screen>
<para arch="ml_32,ml_x32,ml_all">Some more directories exists for <para arch="ml_32,ml_x32,ml_all">Some more directories exists for

2
chapter08/flit-core.xml
View File

@ -42,7 +42,7 @@
<para>Build the package:</para> <para>Build the package:</para>
<screen><userinput remap="install">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen> <screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
<para>Install the package:</para> <para>Install the package:</para>

2
chapter08/jinja2.xml
View File

@ -42,7 +42,7 @@
<para>Build the package:</para> <para>Build the package:</para>
<screen><userinput remap="install">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen> <screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
<para>Install the package:</para> <para>Install the package:</para>

2
chapter08/setuptools.xml
View File

@ -42,7 +42,7 @@
<para>Build the package:</para> <para>Build the package:</para>
<screen><userinput remap="install">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen> <screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
<para>Install the package:</para> <para>Install the package:</para>

2
general.ent
View File

@ -134,6 +134,8 @@
<!ENTITY root "<systemitem class='username'>root</systemitem>"> <!ENTITY root "<systemitem class='username'>root</systemitem>">
<!ENTITY lfs-user "<systemitem class='username'>lfs</systemitem>"> <!ENTITY lfs-user "<systemitem class='username'>lfs</systemitem>">
<!ENTITY lfs-username "<userinput remap='user'>lfs</userinput>">
<!ENTITY lfs-groupname "<userinput remap='group'>lfs</userinput>">
<!ENTITY devtmpfs "<systemitem class='filesystem'>devtmpfs</systemitem>"> <!ENTITY devtmpfs "<systemitem class='filesystem'>devtmpfs</systemitem>">
<!ENTITY fstab "<filename>/etc/fstab</filename>"> <!ENTITY fstab "<filename>/etc/fstab</filename>">
<!ENTITY boot-dir "<filename class='directory'>/boot</filename>"> <!ENTITY boot-dir "<filename class='directory'>/boot</filename>">