tests: update build-sys tests

Signed-off-by: Karel Zak <kzak@redhat.com>

18 files changed, 364 insertions, 349 deletions

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index 47336f0c1..68c9f15a8 100644
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libsmartcols libudev libuuid 
-fsck:  libblkid libmount libuuid 
-fstrim:  libblkid libmount libuuid 
+findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libuuid 
+fstrim:  libblkid libmount librt libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
+libmount.so.1.1.0:  libblkid librt libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libsmartcols libuuid 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount libuuid 
-mountpoint:  libblkid libmount libuuid 
+mount:  libblkid libmount librt libuuid 
+mountpoint:  libblkid libmount librt libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libuuid 
-swapon:  libblkid libmount libsmartcols libuuid 
-umount:  libblkid libmount libuuid 
+swapoff:  libblkid libmount librt libuuid 
+swapon:  libblkid libmount librt libsmartcols libuuid 
+umount:  libblkid libmount librt libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 line:  
 logger:  libsystemd 
@@ -90,7 +91,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index 47336f0c1..68c9f15a8 100644
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libsmartcols libudev libuuid 
-fsck:  libblkid libmount libuuid 
-fstrim:  libblkid libmount libuuid 
+findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libuuid 
+fstrim:  libblkid libmount librt libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
+libmount.so.1.1.0:  libblkid librt libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libsmartcols libuuid 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount libuuid 
-mountpoint:  libblkid libmount libuuid 
+mount:  libblkid libmount librt libuuid 
+mountpoint:  libblkid libmount librt libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libuuid 
-swapon:  libblkid libmount libsmartcols libuuid 
-umount:  libblkid libmount libuuid 
+swapoff:  libblkid libmount librt libuuid 
+swapon:  libblkid libmount librt libsmartcols libuuid 
+umount:  libblkid libmount librt libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 line:  
 logger:  libsystemd 
@@ -90,7 +91,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index ca32b6134..5d7465ae8 100644
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libsmartcols libudev libuuid 
-fsck:  libblkid libmount libuuid 
-fstrim:  libblkid libmount libuuid 
+findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libuuid 
+fstrim:  libblkid libmount librt libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
+libmount.so.1.1.0:  libblkid librt libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libsmartcols libuuid 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount libuuid 
-mountpoint:  libblkid libmount libuuid 
+mount:  libblkid libmount librt libuuid 
+mountpoint:  libblkid libmount librt libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libuuid 
-swapon:  libblkid libmount libsmartcols libuuid 
-umount:  libblkid libmount libuuid 
+swapoff:  libblkid libmount librt libuuid 
+swapon:  libblkid libmount librt libsmartcols libuuid 
+umount:  libblkid libmount librt libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc 
@@ -88,7 +89,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser
index 43e83526a..ce6b4a9b1 100644
--- a/tests/expected/build-sys/config-chfnsh-libuser
+++ b/tests/expected/build-sys/config-chfnsh-libuser
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libselinux libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
-fsck:  libblkid libmount libselinux libuuid 
-fstrim:  libblkid libmount libselinux libuuid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libselinux libuuid 
+fstrim:  libblkid libmount librt libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libselinux libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
 lslogins:  libselinux libsmartcols libsystemd 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount libselinux libuuid 
-mountpoint:  libblkid libmount libselinux libuuid 
+mount:  libblkid libmount librt libselinux libuuid 
+mountpoint:  libblkid libmount librt libselinux libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libselinux libuuid 
-swapon:  libblkid libmount libselinux libsmartcols libuuid 
-umount:  libblkid libmount libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux libuuid 
+swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
+umount:  libblkid libmount librt libselinux libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
@@ -77,7 +78,7 @@ mkfs.minix:
 more:  libtinfo 
 namei:  
 nologin:  
-nsenter:  
+nsenter:  libselinux 
 pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -88,7 +89,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password
index b9c55267e..00966d6d2 100644
--- a/tests/expected/build-sys/config-chfnsh-no-password
+++ b/tests/expected/build-sys/config-chfnsh-no-password
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libselinux libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
-fsck:  libblkid libmount libselinux libuuid 
-fstrim:  libblkid libmount libselinux libuuid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libselinux libuuid 
+fstrim:  libblkid libmount librt libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libselinux libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
 lslogins:  libselinux libsmartcols libsystemd 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount libselinux libuuid 
-mountpoint:  libblkid libmount libselinux libuuid 
+mount:  libblkid libmount librt libselinux libuuid 
+mountpoint:  libblkid libmount librt libselinux libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libselinux libuuid 
-swapon:  libblkid libmount libselinux libsmartcols libuuid 
-umount:  libblkid libmount libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux libuuid 
+swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
+umount:  libblkid libmount librt libselinux libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
@@ -77,7 +78,7 @@ mkfs.minix:
 more:  libtinfo 
 namei:  
 nologin:  
-nsenter:  
+nsenter:  libselinux 
 pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -88,7 +89,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam
index 5de2e796c..ad111b640 100644
--- a/tests/expected/build-sys/config-chfnsh-pam
+++ b/tests/expected/build-sys/config-chfnsh-pam
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libselinux libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
-fsck:  libblkid libmount libselinux libuuid 
-fstrim:  libblkid libmount libselinux libuuid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libselinux libuuid 
+fstrim:  libblkid libmount librt libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libselinux libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
 lslogins:  libselinux libsmartcols libsystemd 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount libselinux libuuid 
-mountpoint:  libblkid libmount libselinux libuuid 
+mount:  libblkid libmount librt libselinux libuuid 
+mountpoint:  libblkid libmount librt libselinux libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libselinux libuuid 
-swapon:  libblkid libmount libselinux libsmartcols libuuid 
-umount:  libblkid libmount libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux libuuid 
+swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
+umount:  libblkid libmount librt libselinux libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
@@ -77,7 +78,7 @@ mkfs.minix:
 more:  libtinfo 
 namei:  
 nologin:  
-nsenter:  
+nsenter:  libselinux 
 pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -88,7 +89,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index bf53c7e05..2db833a82 100644
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libsmartcols libudev libuuid 
-fsck:  libblkid libmount libuuid 
-fstrim:  libblkid libmount libuuid 
+findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libuuid 
+fstrim:  libblkid libmount librt libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
+libmount.so.1.1.0:  libblkid librt libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libsmartcols libuuid 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount libuuid 
-mountpoint:  libblkid libmount libuuid 
+mount:  libblkid libmount librt libuuid 
+mountpoint:  libblkid libmount librt libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libuuid 
-swapon:  libblkid libmount libsmartcols libuuid 
-umount:  libblkid libmount libuuid 
+swapoff:  libblkid libmount librt libuuid 
+swapon:  libblkid libmount librt libsmartcols libuuid 
+umount:  libblkid libmount librt libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -88,7 +89,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index 4053bbc81..46b94af05 100644
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libselinux libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
-fsck:  libblkid libmount libselinux libuuid 
-fstrim:  libblkid libmount libselinux libuuid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libselinux libuuid 
+fstrim:  libblkid libmount librt libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libselinux libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
 lslogins:  libselinux libsmartcols libsystemd 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount libselinux libuuid 
-mountpoint:  libblkid libmount libselinux libuuid 
+mount:  libblkid libmount librt libselinux libuuid 
+mountpoint:  libblkid libmount librt libselinux libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libselinux libuuid 
-swapon:  libblkid libmount libselinux libsmartcols libuuid 
-umount:  libblkid libmount libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux libuuid 
+swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
+umount:  libblkid libmount librt libselinux libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 line:  
 logger:  libsystemd 
@@ -79,7 +80,7 @@ more:  libtinfo
 namei:  
 newgrp:  rypt 
 nologin:  
-nsenter:  
+nsenter:  libselinux 
 pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -90,7 +91,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutempter libutil 
+script:  librt libutempter libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs
index 4053bbc81..46b94af05 100644
--- a/tests/expected/build-sys/config-devel-non-docs
+++ b/tests/expected/build-sys/config-devel-non-docs
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libselinux libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
-fsck:  libblkid libmount libselinux libuuid 
-fstrim:  libblkid libmount libselinux libuuid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libselinux libuuid 
+fstrim:  libblkid libmount librt libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libselinux libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
 lslogins:  libselinux libsmartcols libsystemd 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount libselinux libuuid 
-mountpoint:  libblkid libmount libselinux libuuid 
+mount:  libblkid libmount librt libselinux libuuid 
+mountpoint:  libblkid libmount librt libselinux libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libselinux libuuid 
-swapon:  libblkid libmount libselinux libsmartcols libuuid 
-umount:  libblkid libmount libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux libuuid 
+swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
+umount:  libblkid libmount librt libselinux libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 line:  
 logger:  libsystemd 
@@ -79,7 +80,7 @@ more:  libtinfo
 namei:  
 newgrp:  rypt 
 nologin:  
-nsenter:  
+nsenter:  libselinux 
 pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -90,7 +91,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutempter libutil 
+script:  librt libutempter libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index b9b5ade05..2a96959c6 100644
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -1,20 +1,21 @@
 cfdisk:  libfdisk libncursesw libsmartcols libtinfo libuuid 
-fdisk:  libfdisk libsmartcols libuuid 
+fdisk:  libfdisk libreadline libsmartcols libtinfo libuuid 
 libfdisk.so.1.1.0:  libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
 lscpu:  libsmartcols 
+lsipc:  libsmartcols 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libuuid 
 prlimit:  libsmartcols 
-sfdisk:  libfdisk libsmartcols libuuid 
+sfdisk:  libfdisk libreadline libsmartcols libtinfo libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 zramctl:  libsmartcols 
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -26,15 +27,15 @@ colcrt:
 colrm:  
 column:  
 ctrlaltdel:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -42,7 +43,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -66,7 +67,7 @@ renice:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 2141060e6..63ecdc65c 100644
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -1,6 +1,6 @@
 blkid:  libblkid libuuid 
 cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
@@ -8,11 +8,12 @@ libsmartcols.so.1.1.0:
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
 lscpu:  libsmartcols 
+lsipc:  libsmartcols 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
@@ -21,7 +22,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -34,15 +35,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -50,7 +51,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -75,7 +76,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index fbee6c67e..85ae2714a 100644
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -1,5 +1,5 @@
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -11,15 +11,15 @@ colcrt:
 colrm:  
 column:  
 ctrlaltdel:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -27,7 +27,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -52,7 +52,7 @@ renice:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols
index 29267bdce..f1cdebfee 100644
--- a/tests/expected/build-sys/config-non-libsmartcols
+++ b/tests/expected/build-sys/config-non-libsmartcols
@@ -1,23 +1,23 @@
 blkid:  libblkid libuuid 
-eject:  libblkid libmount libuuid 
+eject:  libblkid libmount librt libuuid 
 findfs:  libblkid libuuid 
-fsck:  libblkid libmount libuuid 
-fstrim:  libblkid libmount libuuid 
+fsck:  libblkid libmount librt libuuid 
+fstrim:  libblkid libmount librt libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
+libmount.so.1.1.0:  libblkid librt libuuid 
 libuuid.so.1.3.0:  
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount libuuid 
-mountpoint:  libblkid libmount libuuid 
-pylibmount.so:  libblkid libmount libpython2 libuuid 
+mount:  libblkid libmount librt libuuid 
+mountpoint:  libblkid libmount librt libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libuuid 
 swaplabel:  libblkid libuuid 
-umount:  libblkid libmount libuuid 
+umount:  libblkid libmount librt libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -29,15 +29,15 @@ colcrt:
 colrm:  
 column:  
 ctrlaltdel:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -45,7 +45,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -69,7 +69,7 @@ renice:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 80568dcb3..49185f341 100644
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -1,33 +1,34 @@
 blkid:  libblkid 
-eject:  libblkid libmount 
+eject:  libblkid libmount librt 
 findfs:  libblkid 
-findmnt:  libblkid libmount libsmartcols libudev 
-fsck:  libblkid libmount 
-fstrim:  libblkid libmount 
+findmnt:  libblkid libmount librt libsmartcols libudev 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
 libblkid.so.1.1.0:  
-libmount.so.1.1.0:  libblkid 
+libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount librt libsmartcols libudev 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libsmartcols 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libsmartcols 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid 
-mount:  libblkid libmount 
-mountpoint:  libblkid libmount 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 
+pylibmount.so:  libblkid libmount libpython2 librt 
 swaplabel:  libblkid 
-swapoff:  libblkid libmount 
-swapon:  libblkid libmount libsmartcols 
-umount:  libblkid libmount 
+swapoff:  libblkid libmount librt 
+swapon:  libblkid libmount librt libsmartcols 
+umount:  libblkid libmount librt 
 wdctl:  libsmartcols 
 wipefs:  libblkid 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -40,15 +41,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -56,7 +57,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -81,7 +82,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index bf53c7e05..2db833a82 100644
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libsmartcols libudev libuuid 
-fsck:  libblkid libmount libuuid 
-fstrim:  libblkid libmount libuuid 
+findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libuuid 
+fstrim:  libblkid libmount librt libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
+libmount.so.1.1.0:  libblkid librt libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libsmartcols libuuid 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount libuuid 
-mountpoint:  libblkid libmount libuuid 
+mount:  libblkid libmount librt libuuid 
+mountpoint:  libblkid libmount librt libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libuuid 
-swapon:  libblkid libmount libsmartcols libuuid 
-umount:  libblkid libmount libuuid 
+swapoff:  libblkid libmount librt libuuid 
+swapon:  libblkid libmount librt libsmartcols libuuid 
+umount:  libblkid libmount librt libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -88,7 +89,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index a8339d494..ff3677ba6 100644
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libselinux libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
-fsck:  libblkid libmount libselinux libuuid 
-fstrim:  libblkid libmount libselinux libuuid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libselinux libuuid 
+fstrim:  libblkid libmount librt libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libselinux libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
 lslogins:  libselinux libsmartcols libsystemd 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount libselinux libuuid 
-mountpoint:  libblkid libmount libselinux libuuid 
+mount:  libblkid libmount librt libselinux libuuid 
+mountpoint:  libblkid libmount librt libselinux libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libselinux libuuid 
-swapon:  libblkid libmount libselinux libsmartcols libuuid 
-umount:  libblkid libmount libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux libuuid 
+swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
+umount:  libblkid libmount librt libselinux libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc libselinux 
@@ -77,7 +78,7 @@ mkfs.minix:
 more:  libtinfo 
 namei:  
 nologin:  
-nsenter:  
+nsenter:  libselinux 
 pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -88,7 +89,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 34c6d3ac9..d23a47842 100644
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libslang libsmartcols libuuid 
-eject:  libblkid libmount libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount librt libslang libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libsmartcols libudev libuuid 
-fsck:  libblkid libmount libuuid 
-fstrim:  libblkid libmount libuuid 
+findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libuuid 
+fstrim:  libblkid libmount librt libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
+libmount.so.1.1.0:  libblkid librt libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libsmartcols libuuid 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount libuuid 
-mountpoint:  libblkid libmount libuuid 
+mount:  libblkid libmount librt libuuid 
+mountpoint:  libblkid libmount librt libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libuuid 
-swapon:  libblkid libmount libsmartcols libuuid 
-umount:  libblkid libmount libuuid 
+swapoff:  libblkid libmount librt libuuid 
+swapon:  libblkid libmount librt libsmartcols libuuid 
+umount:  libblkid libmount librt libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blockdev:  
 cal:  libncursesw libtinfo 
 chcpu:  
@@ -47,15 +48,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -63,7 +64,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -88,7 +89,7 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index 38e643d49..e2743f3b1 100644
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -1,32 +1,33 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
-eject:  libblkid libmount libuuid 
-fdisk:  libblkid libfdisk libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+eject:  libblkid libmount librt libuuid 
+fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 findfs:  libblkid libuuid 
-findmnt:  libblkid libmount libsmartcols libudev libuuid 
-fsck:  libblkid libmount libuuid 
-fstrim:  libblkid libmount libuuid 
+findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
+fsck:  libblkid libmount librt libuuid 
+fstrim:  libblkid libmount librt libuuid 
 libblkid.so.1.1.0:  libuuid 
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
+libmount.so.1.1.0:  libblkid librt libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
 lscpu:  libsmartcols 
-lslocks:  libblkid libmount libsmartcols libuuid 
+lsipc:  libsmartcols 
+lslocks:  libblkid libmount librt libsmartcols libuuid 
 lslogins:  libsmartcols libsystemd 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount libuuid 
-mountpoint:  libblkid libmount libuuid 
+mount:  libblkid libmount librt libuuid 
+mountpoint:  libblkid libmount librt libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 libuuid 
-sfdisk:  libblkid libfdisk libsmartcols libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount libuuid 
-swapon:  libblkid libmount libsmartcols libuuid 
-umount:  libblkid libmount libuuid 
+swapoff:  libblkid libmount librt libuuid 
+swapon:  libblkid libmount librt libsmartcols libuuid 
+umount:  libblkid libmount librt libuuid 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
@@ -34,7 +35,7 @@ wipefs:  libblkid libuuid
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  
+blkdiscard:  librt 
 blkid.static: STATIC
 blockdev:  
 cal:  libncursesw libtinfo 
@@ -48,16 +49,15 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  
+dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-fdisk.static: STATIC
-flock:  
+flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hexdump:  
+hexdump:  libtinfo 
 hwclock:  libm 
 ionice:  
 ipcmk:  
@@ -65,7 +65,7 @@ ipcrm:
 ipcs:  
 isosize:  
 kill:  
-last:  
+last:  librt 
 ldattach:  
 logger:  libsystemd 
 login:  libpam libpam_misc 
@@ -93,13 +93,12 @@ resizepart:
 rev:  
 rtcwake:  
 runuser:  libpam libpam_misc 
-script:  libutil 
+script:  librt libutil 
 scriptreplay:  
 setarch:  
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  
@@ -108,6 +107,7 @@ taskset:
 ul:  libtinfo 
 umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis: