| 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 multilib
in repository lfs.
commit a8afd7e8e5d3ad3d4c4468f833d80f76ca2e90f7
Author: Zeckmathederg <[email protected]>
AuthorDate: Fri Oct 3 19:33:32 2025 -0600
Udev; Systemd: \ alignment; remove &&.
---
chapter08/systemd.xml | 72 +++++++++++++++++++++++++--------------------------
chapter08/udev.xml | 55 +++++++++++++++++++--------------------
2 files changed, 62 insertions(+), 65 deletions(-)
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 8b6430039..044b9cfbc 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -301,24 +301,24 @@ done</userinput></screen>
(-Dblkid deprecated) -->
<para>Prepare systemd for compilation:</para>
- <screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
-CC="gcc -m32" \
-CXX="g++ -m32" \
-LANG=en_US.UTF-8 \
-meson setup .. \
- --prefix=/usr \
- --libdir=/usr/lib32 \
- --buildtype=release \
- -D default-dnssec=no \
- -D firstboot=false \
- -D install-tests=false \
- -D ldconfig=false \
- -D sysusers=false \
- -D rpmmacrosdir=no \
- -D homed=disabled \
- -D userdb=false \
- -D man=disabled \
- -D mode=release </userinput></screen>
+<screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
+CC="gcc -m32" \
+CXX="g++ -m32" \
+LANG=en_US.UTF-8 \
+meson setup --prefix=/usr \
+ --libdir=/usr/lib32 \
+ --buildtype=release \
+ -D default-dnssec=no \
+ -D firstboot=false \
+ -D install-tests=false \
+ -D ldconfig=false \
+ -D sysusers=false \
+ -D rpmmacrosdir=no \
+ -D homed=disabled \
+ -D userdb=false \
+ -D man=disabled \
+ -D mode=release \
+ ..</userinput></screen>
<!-- We still use -D userdb=false for m32 to prevent the utilities from being
built. We only are interested in libraries here, and userdb has none.
- zeckma -->
@@ -360,24 +360,24 @@ sed '/long drift_freq;/s@long @int64_t @' -i src/timesync/timesyncd-manager.h</u
-->
<para>Prepare systemd for compilation:</para>
- <screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
-CC="gcc -mx32" \
-CXX="g++ -mx32" \
-LANG=en_US.UTF-8 \
-meson setup .. \
- --prefix=/usr \
- --libdir=/usr/libx32 \
- --buildtype=release \
- -D default-dnssec=no \
- -D firstboot=false \
- -D install-tests=false \
- -D ldconfig=false \
- -D sysusers=false \
- -D rpmmacrosdir=no \
- -D homed=false \
- -D userdb=false \
- -D man=disabled \
- -D mode=release </userinput></screen>
+<screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
+CC="gcc -mx32" \
+CXX="g++ -mx32" \
+LANG=en_US.UTF-8 \
+meson setup --prefix=/usr \
+ --libdir=/usr/libx32 \
+ --buildtype=release \
+ -D default-dnssec=no \
+ -D firstboot=false \
+ -D install-tests=false \
+ -D ldconfig=false \
+ -D sysusers=false \
+ -D rpmmacrosdir=no \
+ -D homed=false \
+ -D userdb=false \
+ -D man=disabled \
+ -D mode=release \
+ ..</userinput></screen>
<!-- We still use -D userdb=false for mx32 to prevent the utilities from being
built. We only are interested in libraries here, and userdb has none.
- zeckma -->
diff --git a/chapter08/udev.xml b/chapter08/udev.xml
index dcd4586ca..eb3c58929 100644
--- a/chapter08/udev.xml
+++ b/chapter08/udev.xml
@@ -216,27 +216,25 @@ rm /usr/share/man/man*/systemd*</userinput></screen>
CC="gcc -m32 -march=i686" \
CXX="g++ -m32 -march=i686" \
LANG=en_US.UTF-8 \
-meson setup \
- --prefix=/usr \
- --buildtype=release \
- -Dmode=release \
- -Ddev-kvm-mode=0660 \
- -Dlink-udev-shared=false \
- -Dlogind=false \
- -Dvconsole=false \
- ..</userinput></screen>
+meson setup --prefix=/usr \
+ --buildtype=release \
+ -D mode=release \
+ -D dev-kvm-mode=0660 \
+ -D link-udev-shared=false \
+ -D logind=false \
+ -D vconsole=false \
+ ..</userinput></screen>
<para>Compile the package:</para>
-<screen><userinput remap="make">ninja \
- $(grep -o -E "^build (src/libudev|src/udev)[^:]*" \
- build.ninja | awk '{ print $2 }') \
+<screen><userinput remap="make">ninja $(grep -o -E "^build (src/libudev|src/udev)[^:]*" \
+ build.ninja | awk '{ print $2 }') \
$(realpath libudev.so --relative-to .)</userinput></screen>
<para>Install the package:</para>
-<screen><userinput remap="install">mkdir -pv /usr/lib32/pkgconfig &&
-cp -av libudev.so{,*[0-9]} /usr/lib32/ &&
+<screen><userinput remap="install">mkdir -pv /usr/lib32/pkgconfig
+cp -av libudev.so{,*[0-9]} /usr/lib32/
sed -e "s;/usr/lib;&32;g" src/libudev/libudev.pc > /usr/lib32/pkgconfig/libudev.pc</userinput></screen>
</sect2><!-- m32 -->
@@ -252,33 +250,32 @@ sed -e "s;/usr/lib;&32;g" src/libudev/libudev.pc > /usr/lib32/pkgconfig/libu
<para>Prepare Udev for compilation:</para>
-<screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
+<screen><userinput remap="configure">
+PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
CC="gcc -mx32" \
CXX="g++ -mx32" \
CFLAGS+=" -Wno-error=shift-overflow" \
CXXFLAGS+=" -Wno-error=shift-overflow" \
LANG=en_US.UTF-8 \
-meson setup \
- --prefix=/usr \
- --buildtype=release \
- -Dmode=release \
- -Ddev-kvm-mode=0660 \
- -Dlink-udev-shared=false \
- -Dlogind=false \
- -Dvconsole=false \
- ..</userinput></screen>
+meson setup --prefix=/usr \
+ --buildtype=release \
+ -D mode=release \
+ -D dev-kvm-mode=0660 \
+ -D link-udev-shared=false \
+ -D logind=false \
+ -D vconsole=false \
+ ..</userinput></screen>
<para>Compile the package:</para>
-<screen><userinput remap="make">ninja \
- $(grep -o -E "^build (src/libudev|src/udev)[^:]*" \
- build.ninja | awk '{ print $2 }') \
+<screen><userinput remap="make">ninja $(grep -o -E "^build (src/libudev|src/udev)[^:]*" \
+ build.ninja | awk '{ print $2 }') \
$(realpath libudev.so --relative-to .)</userinput></screen>
<para>Install the package:</para>
-<screen><userinput remap="install">mkdir -pv /usr/libx32/pkgconfig &&
-cp -av libudev.so{,*[0-9]} /usr/libx32/ &&
+<screen><userinput remap="install">mkdir -pv /usr/libx32/pkgconfig
+cp -av libudev.so{,*[0-9]} /usr/libx32/
sed -e "s;/usr/lib;&x32;g" src/libudev/libudev.pc > /usr/libx32/pkgconfig/libudev.pc</userinput></screen>
</sect2><!-- mx32 -->
--
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