diff options
Diffstat (limited to 'chapter08')
| -rw-r--r-- | chapter08/dbus.xml | 2 | ||||
| -rw-r--r-- | chapter08/iproute2.xml | 3 | ||||
| -rw-r--r-- | chapter08/python.xml | 14 | ||||
| -rw-r--r-- | chapter08/udev.xml | 20 |
4 files changed, 25 insertions, 14 deletions
diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml index 8ab4744ad..309e5b2e9 100644 --- a/chapter08/dbus.xml +++ b/chapter08/dbus.xml @@ -56,7 +56,7 @@ --disable-static \ --disable-doxygen-docs \ --disable-xml-docs \ - --docdir=/usr/share/doc/dbus-&dbus-version; \ + --docdir=/usr/share/doc/dbus-&dbus-version; \ --with-system-socket=/run/dbus/system_bus_socket</userinput></screen> <variablelist> diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index bfc25331a..cd3e5a658 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -45,9 +45,6 @@ be built since it depends on Berkeley DB, which is not installed in LFS. However, a directory and a man page for <command>arpd</command> will still be installed. Prevent this by running the commands shown below. - (If the <command>arpd</command> program is needed, - instructions for compiling Berkeley DB can be found in the BLFS book at - <ulink url="&blfs-book;server/db.html"/>.) </para> <screen><userinput remap="pre">sed -i /ARPD/d Makefile diff --git a/chapter08/python.xml b/chapter08/python.xml index f7bc19d47..62279880d 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -155,21 +155,21 @@ EOF <screen><userinput remap="install">install -v -dm755 /usr/share/doc/python-&python-version;/html -tar --strip-components=1 \ - --no-same-owner \ - --no-same-permissions \ - -C /usr/share/doc/python-&python-version;/html \ - -xvf ../python-&python-version;-docs-html.tar.bz2</userinput></screen> +tar --no-same-owner \ + -xvf ../python-&python-version;-docs-html.tar.bz2 +cp -R --no-preserve=mode python-&python-version;-docs-html/* \ + /usr/share/doc/python-&python-version;/html</userinput></screen> <variablelist> <title>The meaning of the documentation install commands:</title> <varlistentry> - <term><option>--no-same-owner</option> and <option>--no-same-permissions</option></term> + <term><option>--no-same-owner</option> (tar) and <option>--no-preserve=mode</option> (cp)</term> <listitem> <para>Ensure the installed files have the correct ownership and permissions. Without these options, <application>tar</application> - will install the package files with the upstream creator's values. + will install the package files with the upstream creator's values + and files would have restrictive permissions. </para> </listitem> </varlistentry> diff --git a/chapter08/udev.xml b/chapter08/udev.xml index 100a18fc9..580c78203 100644 --- a/chapter08/udev.xml +++ b/chapter08/udev.xml @@ -55,6 +55,11 @@ <screen><userinput remap="pre">sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in</userinput></screen> + <para>Adjust the hardcoded paths to network configuration files for the + standalone udev installation:</para> + + <screen><userinput remap="pre">sed '/NETWORK_DIRS/s/systemd/udev/' -i src/basic/path-lookup.h</userinput></screen> + <para>Prepare Udev for compilation:</para> <screen><userinput remap="configure">mkdir -p build @@ -129,7 +134,7 @@ meson setup \ <para>Install the package:</para> - <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb,rules}.d + <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb.d,rules.d,network} install -vm755 -d /usr/{lib,share}/pkgconfig install -vm755 udevadm /usr/bin/ install -vm755 systemd-hwdb /usr/bin/udev-hwdb @@ -144,7 +149,8 @@ install -vm644 $(find ../rules.d/*.rules \ -not -name '*power-switch*') /usr/lib/udev/rules.d/ install -vm644 hwdb.d/* ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/ install -vm755 $(find src/udev \ - -type f -not -name '*.*') /usr/lib/udev</userinput></screen> + -type f -not -name '*.*') /usr/lib/udev +install -vm644 ../network/99-default.link /usr/lib/udev/network</userinput></screen> <para>Install some custom rules and support files useful in an LFS environment:</para> @@ -159,13 +165,21 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen> <screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz \ --no-same-owner --strip-components=1 \ -C /usr/share/man --wildcards '*/udev*' '*/libudev*' \ + '*/systemd.link.5' \ '*/systemd-'{hwdb,udevd.service}.8 + +sed 's|systemd/network|udev/network|' \ + /usr/share/man/man5/systemd.link.5 \ + > /usr/share/man/man5/udev.link.5 + sed 's/systemd\(\\\?-\)/udev\1/' /usr/share/man/man8/systemd-hwdb.8 \ > /usr/share/man/man8/udev-hwdb.8 + sed 's|lib.*udevd|sbin/udevd|' \ /usr/share/man/man8/systemd-udevd.service.8 \ > /usr/share/man/man8/udevd.8 -rm /usr/share/man/man8/systemd-*.8</userinput></screen> + +rm /usr/share/man/man*/systemd*</userinput></screen> </sect2> |