From c62cd4614ce5d352711274db208f50b9182099a4 Mon Sep 17 00:00:00 2001 From: Krejzi Date: Sun, 10 Feb 2013 01:40:38 +0000 Subject: [PATCH] Added sulogin and mesg utilities to util-linux package, changed kmod --libdir to --with-rootlibdir plus minor fixes, minor fix for coreutils page. You might want last two in LFS, too. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10119 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 ++++++++ chapter06/coreutils.xml | 2 +- chapter06/kmod.xml | 28 ++++++++++++++-------- chapter06/util-linux.xml | 50 ++++++++++++++++++++++++++++++++++++---- general.ent | 4 ++-- 5 files changed, 78 insertions(+), 16 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 2c22ca59a..3454ddd05 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,16 @@ --> + + 2013-02-06 + + + [krejzi] - Modified Util-Linux instructions to + install mesg and sulogin utilities that were part of + Sysvinit. + + + 2013-02-06 diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 779ea5924..5f6f8c131 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -156,7 +156,7 @@ sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8 timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes libstdbuf.so - /usr/libexec/coreutils + /usr/lib/coreutils diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index 48c1585c3..b0957c8aa 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -43,17 +43,26 @@ Prepare Kmod for compilation: -./configure --prefix=/usr \ - --bindir=/bin \ - --libdir=/lib \ - --sysconfdir=/etc \ - --disable-manpages \ - --with-xz \ +./configure --prefix=/usr \ + --bindir=/bin \ + --sysconfdir=/etc \ + --with-rootlibdir=/lib \ + --disable-manpages \ + --with-xz \ --with-zlib The meaning of the configure options: + + --with-rootlibdir + + This switch ensures that shared library is installed in + /lib instead of + /usr/lib. + + + --with-* @@ -84,9 +93,10 @@ Module-Init-Tools, the package that previously handled Linux kernel modules: -make pkgconfigdir=/usr/lib/pkgconfig install + +make install -for target in depmod insmod modinfo modprobe rmmod; do +for target in depmod insmod lsmod modinfo modprobe rmmod; do ln -sv ../bin/kmod /sbin/$target done @@ -105,7 +115,7 @@ ln -sv kmod /bin/lsmod depmod (link to kmod), insmod (link to kmod), kmod, kmod-nolib, lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod), and rmmod (link to kmod) - /lib/kmod.so + libkmod.so diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index e208623dd..fd2ea4aab 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -59,7 +59,10 @@ mkdir -pv /var/lib/hwclock Installation of Util-linux -./configure --disable-su --disable-sulogin --disable-login +./configure --disable-su \ + --disable-login \ + --enable-mesg \ + --with-systemdsystemunitdir=/lib/systemd/system The meaning of the configure option: @@ -67,7 +70,7 @@ mkdir -pv /var/lib/hwclock --disable-* - These switches disable building su, sulogin, and login. They + These switches disable building su and login. They duplicate the same programs provided by . They also require @@ -75,6 +78,22 @@ mkdir -pv /var/lib/hwclock which is not available in LFS. + + + --enable-mesg + + This switch enables building of the mesg utility which + was previously provided by Sysvinit package. + + + + + --with-systemdsystemunitdir=/lib/systemd/system + + This switch sets install location for the Systemd units provided + with the package. + + Compile the package: @@ -103,11 +122,11 @@ mkdir -pv /var/lib/hwclock dmesg, eject, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck, fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock, i386, ionice, ipcmk, ipcrm, ipcs, isosize, ldattach, linux32, linux64, - logger, look, losetup, lsblk, lscpu, lslocks, mcookie, mkfs, mkfs.bfs, + logger, look, losetup, lsblk, lscpu, lslocks, mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more, mount, mountpoint, namei, partx, pg, pivot_root, prlimit, raw, readprofile, rename, renice, resizepart, rev, rtcwake, script, scriptreplay, setarch, setsid, setterm, sfdisk, - swaplabel, swapoff (link to swapon), swapon, switch_root, tailf, + sulogin, swaplabel, swapoff (link to swapon), swapon, switch_root, tailf, taskset, tunelp, ul, umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, and x86_64 @@ -620,6 +639,17 @@ mkdir -pv /var/lib/hwclock + + mesg + + Controls whether other users can send messages to the current + user's terminal + + mesg + + + + mkfs @@ -888,6 +918,18 @@ mkdir -pv /var/lib/hwclock + + sulogin + + Allows root to log in; + it is normally invoked by init when the system goes + into single user mode + + sulogin + + + + swaplabel diff --git a/general.ent b/general.ent index e921091b2..160ac7935 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + +