[lfs] 01/01: Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.book
Message-ID <[email protected]>
This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch xry111/loongarch
in repository lfs.

commit f1e1be2a3a84bf87e95f1f16c7dcd104a5efbd3c
Merge: c0d4dc8a8 50a0916de
Author: Xi Ruoyao <[email protected]>
AuthorDate: Thu Jan 30 19:03:17 2025 +0800

    Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

 chapter01/changelog.xml      | 94 ++++++++++++++++++++++++++++++++++++++++++-
 chapter01/whatsnew.xml       | 23 ++++++-----
 chapter02/aboutlfs.xml       | 55 ++++++++++++++++++-------
 chapter02/mounting.xml       |  9 +++++
 chapter04/addinguser.xml     | 10 ++---
 chapter04/settingenviron.xml |  7 +---
 chapter07/changingowner.xml  |  2 +-
 chapter08/dbus.xml           | 56 +++++++++-----------------
 chapter08/flit-core.xml      |  4 +-
 chapter08/gettext.xml        |  4 +-
 chapter08/glibc.xml          |  2 +-
 chapter08/jinja2.xml         |  4 +-
 chapter08/libtool.xml        |  8 +---
 chapter08/markupsafe.xml     |  2 +-
 chapter08/procps.xml         |  3 +-
 chapter08/setuptools.xml     |  2 +-
 chapter08/vim.xml            |  6 ++-
 chapter08/wheel.xml          |  2 +-
 general.ent                  |  2 +
 packages.ent                 | 96 ++++++++++++++++++++++----------------------
 patches.ent                  |  2 +-
 21 files changed, 249 insertions(+), 144 deletions(-)

diff --cc chapter04/addinguser.xml
index fa1cbafc0,e1d130b95..28be6b9ad
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@@ -80,7 -80,10 +80,7 @@@ useradd -s /bin/bash -g &lfs-groupname
    all the directories under <filename class="directory">$LFS</filename> by making
    <systemitem class="username">lfs</systemitem> the owner:</para>
  
- <screen><userinput>chown -v lfs $LFS/{usr{,/*},lib,lib64,var,etc,bin,sbin,tools}</userinput></screen>
 -<screen><userinput>chown -v &lfs-username; $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
 -case $(uname -m) in
 -  x86_64) chown -v &lfs-username; $LFS/lib64 ;;
 -esac</userinput></screen>
++<screen><userinput>chown -v &lfs-username; $LFS/{usr{,/*},lib,lib64,var,etc,bin,sbin,tools}</userinput></screen>
  
  <note><para>In some host systems, the following <command>su</command> command does not complete
    properly and suspends the login for the &lfs-user; user to the background.
diff --cc chapter07/changingowner.xml
index 4c83f40f6,178c7836e..8997d91f0
--- a/chapter07/changingowner.xml
+++ b/chapter07/changingowner.xml
@@@ -33,6 -33,9 +33,6 @@@
    user <systemitem class="username">root</systemitem> by running the following
    command:</para>
  
- <screen><userinput>chown --from lfs -R root:root $LFS/{usr,lib,lib64,var,etc,bin,sbin,tools}</userinput></screen>
 -<screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
 -case $(uname -m) in
 -  x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;;
 -esac</userinput></screen>
++<screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,lib,lib64,var,etc,bin,sbin,tools}</userinput></screen>
  
  </sect1>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.