From 14109e77437b13dbc0ad846d25d5f5f35071b92c Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 22 Jul 2014 21:55:23 +0000 Subject: Update to util-linux-2.25 git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10644 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 ++++++++++ chapter05/util-linux.xml | 10 ++++++++++ chapter06/util-linux.xml | 45 ++++++++++++++++++--------------------------- general.ent | 4 ++-- packages.ent | 6 +++--- 5 files changed, 43 insertions(+), 32 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f47b681d4..c9c7ce888 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,16 @@ --> + + 2014-07-22 + + + [bdubbs] - Update to util-linux-2.25. Fixes + #3627. + + + + 2014-07-21 diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml index 1b25e50f3..007b44e7d 100644 --- a/chapter05/util-linux.xml +++ b/chapter05/util-linux.xml @@ -44,6 +44,7 @@ Prepare Util-linux for compilation: ./configure --prefix=/tools \ + --without-python \ --disable-makeinstall-chown \ --without-systemdsystemunitdir \ PKG_CONFIG="" @@ -51,6 +52,15 @@ The meaning of the configure option: + + --without-python + + This switch disables using Python + if it is installed on the host system. It avoids trying to build + unneeded bindings. + + + --disable-makeinstall-chown diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 5afa8965b..87f70f0ea 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -45,14 +45,10 @@ The FHS recommends using the /var/lib/hwclock directory instead of the usual /etc directory as the - location for the adjtime file. To make the - hwclock program FHS-compliant, run the - following: + location for the adjtime file. First create a directory + to enable storage for the hwclock program: -sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \ - $(grep -rl '/etc/adjtime' .) - -mkdir -pv /var/lib/hwclock +mkdir -pv /var/lib/hwclock @@ -61,7 +57,7 @@ mkdir -pv /var/lib/hwclock Prepare Util-linux for compilation: -./configure +./configure ADJTIME_PATH=/var/lib/hwclock Compile the package: @@ -79,10 +75,6 @@ mkdir -pv /var/lib/hwclock bash tests/run.sh --srcdir=$PWD --builddir=$PWD - Two tests, last/ipv6 and last/last, fail in the chroot environment - due to the DNS resolver not being active yet. If the tests are rerun after - booting, they pass. - chown -Rv nobody . su nobody -s /bin/bash -c "PATH=$PATH make -k check" @@ -102,12 +94,12 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" addpart, agetty, blkdiscard, blkid, blockdev, cal, cfdisk, chcpu, - chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, delpart, dmesg, + chrt, col, colcrt, colrm, column, ctrlaltdel, delpart, dmesg, eject, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck, fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock, i386, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link to last), ldattach, linux32, linux64, logger, look, losetup, lsblk, lscpu, - lslocks, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, + lslocks, lslogins, mcookie, 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, sulogin, swaplabel, @@ -117,8 +109,8 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so} - /usr/include/blkid, /usr/include/libmount, /usr/include/uuid, - /usr/share/doc/util-linux/getopt, /var/lib/hwclock + /etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, + /usr/include/uuid, /usr/share/doc/util-linux/getopt, /var/lib/hwclock @@ -272,17 +264,6 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" - - cytune - - Tunes the parameters of the serial line drivers for - Cyclades cards - - cytune - - - - delpart @@ -646,6 +627,16 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" + + lslogins + + Lists information about users, groups and system accounts + + lslogins + + + + mcookie diff --git a/general.ent b/general.ent index 67b2b0772..d8b583254 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - + - + diff --git a/packages.ent b/packages.ent index 15c5cc521..b72d951c2 100644 --- a/packages.ent +++ b/packages.ent @@ -628,10 +628,10 @@ - - + + - + -- cgit v1.2.3-54-g00ecf