tests: build-sys update

* libblkid does not depend on libuuid anymore
* libncurses depends on libdl due to

  $ ncursesw6-config --libs
  -lncursesw -ltinfo -ldl

* new command hardlink (with dependence on libpcre2-8
* hwclock needs librt

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

18 files changed, 413 insertions, 395 deletions

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index b3e2f1f0f..4d950abc5 100644
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libuuid 
+eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid libuuid 
-findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
-fsck:  libblkid libmount librt libuuid 
-fstrim:  libblkid libmount librt libuuid 
-libblkid.so.1.1.0:  libuuid 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libsmartcols libudev 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libuuid 
+libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libsmartcols libuuid 
+lslocks:  libblkid libmount librt libsmartcols 
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libsmartcols libuuid 
+lsns:  libblkid libmount librt libsmartcols 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount librt libuuid 
-mountpoint:  libblkid libmount librt libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libuuid 
-swapon:  libblkid libmount librt libsmartcols libuuid 
-umount:  libblkid libmount librt libuuid 
+swapoff:  libblkid libmount librt 
+swapon:  libblkid libmount librt libsmartcols 
+umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
@@ -89,7 +90,7 @@ namei:
 newgrp:  rypt 
 nologin:  
 nsenter:  
-pg:  libncursesw libtinfo 
+pg:  libdl libncursesw libtinfo 
 pivot_root:  
 raw:  
 readprofile:  
diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index b3e2f1f0f..4d950abc5 100644
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libuuid 
+eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid libuuid 
-findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
-fsck:  libblkid libmount librt libuuid 
-fstrim:  libblkid libmount librt libuuid 
-libblkid.so.1.1.0:  libuuid 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libsmartcols libudev 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libuuid 
+libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libsmartcols libuuid 
+lslocks:  libblkid libmount librt libsmartcols 
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libsmartcols libuuid 
+lsns:  libblkid libmount librt libsmartcols 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount librt libuuid 
-mountpoint:  libblkid libmount librt libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libuuid 
-swapon:  libblkid libmount librt libsmartcols libuuid 
-umount:  libblkid libmount librt libuuid 
+swapoff:  libblkid libmount librt 
+swapon:  libblkid libmount librt libsmartcols 
+umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
@@ -89,7 +90,7 @@ namei:
 newgrp:  rypt 
 nologin:  
 nsenter:  
-pg:  libncursesw libtinfo 
+pg:  libdl libncursesw libtinfo 
 pivot_root:  
 raw:  
 readprofile:  
diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index ab99871af..5c6f398dc 100644
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libuuid 
+eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid libuuid 
-findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
-fsck:  libblkid libmount librt libuuid 
-fstrim:  libblkid libmount librt libuuid 
-libblkid.so.1.1.0:  libuuid 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libsmartcols libudev 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libuuid 
+libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libsmartcols libuuid 
+lslocks:  libblkid libmount librt libsmartcols 
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libsmartcols libuuid 
+lsns:  libblkid libmount librt libsmartcols 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount librt libuuid 
-mountpoint:  libblkid libmount librt libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libuuid 
-swapon:  libblkid libmount librt libsmartcols libuuid 
-umount:  libblkid libmount librt libuuid 
+swapoff:  libblkid libmount librt 
+swapon:  libblkid libmount librt libsmartcols 
+umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libaudit libm 
+hwclock:  libaudit libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser
index 5e0c52bd8..974654075 100644
--- a/tests/expected/build-sys/config-chfnsh-libuser
+++ b/tests/expected/build-sys/config-chfnsh-libuser
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libselinux libuuid 
+eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid 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 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
+fsck:  libblkid libmount librt libselinux 
+fstrim:  libblkid libmount librt libselinux 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
+lslocks:  libblkid libmount librt libselinux libsmartcols 
 lslogins:  libselinux libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libselinux libsmartcols libuuid 
+lsns:  libblkid libmount librt libselinux libsmartcols 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount librt libselinux libuuid 
-mountpoint:  libblkid libmount librt libselinux libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt libselinux 
+mountpoint:  libblkid libmount librt libselinux 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libselinux libuuid 
-swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
-umount:  libblkid libmount librt libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux 
+swapon:  libblkid libmount librt libselinux libsmartcols 
+umount:  libblkid libmount librt libselinux 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libaudit libm 
+hwclock:  libaudit libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password
index 3b604b963..92a59cceb 100644
--- a/tests/expected/build-sys/config-chfnsh-no-password
+++ b/tests/expected/build-sys/config-chfnsh-no-password
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libselinux libuuid 
+eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid 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 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
+fsck:  libblkid libmount librt libselinux 
+fstrim:  libblkid libmount librt libselinux 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
+lslocks:  libblkid libmount librt libselinux libsmartcols 
 lslogins:  libselinux libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libselinux libsmartcols libuuid 
+lsns:  libblkid libmount librt libselinux libsmartcols 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount librt libselinux libuuid 
-mountpoint:  libblkid libmount librt libselinux libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt libselinux 
+mountpoint:  libblkid libmount librt libselinux 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libselinux libuuid 
-swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
-umount:  libblkid libmount librt libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux 
+swapon:  libblkid libmount librt libselinux libsmartcols 
+umount:  libblkid libmount librt libselinux 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libaudit libm 
+hwclock:  libaudit libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam
index b5ef6587a..091323b6d 100644
--- a/tests/expected/build-sys/config-chfnsh-pam
+++ b/tests/expected/build-sys/config-chfnsh-pam
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libselinux libuuid 
+eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid 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 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
+fsck:  libblkid libmount librt libselinux 
+fstrim:  libblkid libmount librt libselinux 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
+lslocks:  libblkid libmount librt libselinux libsmartcols 
 lslogins:  libselinux libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libselinux libsmartcols libuuid 
+lsns:  libblkid libmount librt libselinux libsmartcols 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount librt libselinux libuuid 
-mountpoint:  libblkid libmount librt libselinux libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt libselinux 
+mountpoint:  libblkid libmount librt libselinux 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libselinux libuuid 
-swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
-umount:  libblkid libmount librt libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux 
+swapon:  libblkid libmount librt libselinux libsmartcols 
+umount:  libblkid libmount librt libselinux 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libaudit libm 
+hwclock:  libaudit libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index c2c32cc0f..68b553817 100644
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libuuid 
+eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid libuuid 
-findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
-fsck:  libblkid libmount librt libuuid 
-fstrim:  libblkid libmount librt libuuid 
-libblkid.so.1.1.0:  libuuid 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libsmartcols libudev 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libuuid 
+libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libsmartcols libuuid 
+lslocks:  libblkid libmount librt libsmartcols 
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libsmartcols libuuid 
+lsns:  libblkid libmount librt libsmartcols 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount librt libuuid 
-mountpoint:  libblkid libmount librt libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libuuid 
-swapon:  libblkid libmount librt libsmartcols libuuid 
-umount:  libblkid libmount librt libuuid 
+swapoff:  libblkid libmount librt 
+swapon:  libblkid libmount librt libsmartcols 
+umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index b1dd90b7b..4ff73b82f 100644
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -1,119 +1,120 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
-column:  libsmartcols 
-eject:  libblkid libmount librt libselinux libuuid 
-fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
-fincore:  libsmartcols 
-findfs:  libblkid 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 librt libselinux libuuid 
-libsmartcols.so.1.1.0:  
+blkid:  libasan libblkid libgcc_s 
+cfdisk:  libasan libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+column:  libasan libsmartcols 
+eject:  libasan libblkid libgcc_s libmount librt libselinux 
+fdisk:  libasan libblkid libfdisk libgcc_s libreadline libsmartcols libtinfo libuuid 
+fincore:  libasan libsmartcols 
+findfs:  libasan libblkid 
+findmnt:  libasan libblkid libmount librt libselinux libsmartcols libudev 
+fsck:  libasan libblkid libmount librt libselinux 
+fstrim:  libasan libblkid libgcc_s libmount librt libselinux 
+libblkid.so.1.1.0:  libgcc_s 
+libfdisk.so.1.1.0:  libblkid libgcc_s libuuid 
+libmount.so.1.1.0:  libblkid libgcc_s librt libselinux 
+libsmartcols.so.1.1.0:  libgcc_s 
 libuuid.so.1.3.0:  
-losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
-lscpu:  libsmartcols 
-lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
-lslogins:  libselinux libsmartcols libsystemd 
-lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libselinux libsmartcols libuuid 
-mkswap:  libblkid 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 librt libselinux libuuid 
-rfkill:  libsmartcols 
-sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
-swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libselinux libuuid 
-swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
-umount:  libblkid libmount librt libselinux libuuid 
-uuidd:  librt libsystemd libuuid 
-uuidgen:  libuuid 
-uuidparse:  libsmartcols libuuid 
-wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
-zramctl:  libsmartcols 
-addpart:  
-agetty:  
-blkdiscard:  librt 
-blkzone:  
-blockdev:  
-cal:  libtinfo 
-chcpu:  
-chfn:  libpam libpam_misc libpthread libreadline libselinux libuser 
-chmem:  
-choom:  
-chrt:  
-chsh:  libpam libpam_misc libpthread libreadline libselinux libuser 
-col:  
-colcrt:  
-colrm:  
-ctrlaltdel:  
-delpart:  
-dmesg:  librt libtinfo 
-fallocate:  
-fdformat:  
-flock:  librt 
-fsck.cramfs:  libz 
-fsck.minix:  
-fsfreeze:  
-getopt:  
-hexdump:  libtinfo 
-hwclock:  libaudit libm 
-ionice:  
-ipcmk:  
-ipcrm:  
-ipcs:  
-isosize:  
-kill:  
-last:  librt 
-ldattach:  
-line:  
-logger:  libsystemd 
-login:  libaudit libpam libpam_misc libselinux 
-look:  
-mcookie:  
-mesg:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-more:  libtinfo 
-namei:  
-newgrp:  rypt 
-nologin:  
-nsenter:  libselinux 
-pg:  libncursesw libtinfo 
-pivot_root:  
-raw:  
-readprofile:  
-rename:  
-renice:  
-resizepart:  
-rev:  
-rtcwake:  
-runuser:  libpam libpam_misc libutil 
-script:  librt libutempter libutil 
-scriptreplay:  
-setarch:  
-setpriv:  ap-ng 
-setsid:  
-setterm:  libtinfo 
-su:  libpam libpam_misc libutil 
-sulogin:  libselinux rypt 
-switch_root:  
-taskset:  
-tunelp:  
-ul:  libtinfo 
-unshare:  
-utmpdump:  
-vipw:  libselinux 
-wall:  
-whereis:  
-write:  
+losetup:  libasan libgcc_s libsmartcols 
+lsblk:  libasan libblkid libgcc_s libmount librt libselinux libsmartcols libudev 
+lscpu:  libasan libgcc_s libsmartcols 
+lsipc:  libasan libgcc_s libsmartcols 
+lslocks:  libasan libblkid libmount librt libselinux libsmartcols 
+lslogins:  libasan libselinux libsmartcols libsystemd 
+lsmem:  libasan libgcc_s libsmartcols 
+lsns:  libasan libblkid libmount librt libselinux libsmartcols 
+mkswap:  libasan libblkid libgcc_s libselinux libuuid 
+mount:  libasan libblkid libmount librt libselinux 
+mountpoint:  libasan libblkid libmount librt libselinux 
+partx:  libasan libblkid libgcc_s libsmartcols 
+prlimit:  libasan libsmartcols 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux 
+rfkill:  libasan libsmartcols 
+sfdisk:  libasan libblkid libfdisk libgcc_s libreadline libsmartcols libtinfo libuuid 
+swaplabel:  libasan libblkid libuuid 
+swapoff:  libasan libblkid libmount librt libselinux 
+swapon:  libasan libblkid libmount librt libselinux libsmartcols 
+umount:  libasan libblkid libmount librt libselinux 
+uuidd:  libasan librt libsystemd libuuid 
+uuidgen:  libasan libuuid 
+uuidparse:  libasan libsmartcols libuuid 
+wdctl:  libasan libsmartcols 
+wipefs:  libasan libblkid libsmartcols 
+zramctl:  libasan libgcc_s libsmartcols 
+addpart:  libasan 
+agetty:  libasan 
+blkdiscard:  libasan librt 
+blkzone:  libasan libgcc_s 
+blockdev:  libasan libgcc_s 
+cal:  libasan libtinfo 
+chcpu:  libasan libgcc_s 
+chfn:  libasan libpam libpam_misc libpthread libreadline libselinux libuser 
+chmem:  libasan libgcc_s 
+choom:  libasan libgcc_s 
+chrt:  libasan 
+chsh:  libasan libpam libpam_misc libpthread libreadline libselinux libuser 
+col:  libasan 
+colcrt:  libasan 
+colrm:  libasan 
+ctrlaltdel:  libasan libgcc_s 
+delpart:  libasan 
+dmesg:  libasan libgcc_s librt libtinfo 
+fallocate:  libasan 
+fdformat:  libasan 
+flock:  libasan librt 
+fsck.cramfs:  libasan libz 
+fsck.minix:  libasan libgcc_s 
+fsfreeze:  libasan 
+getopt:  libasan 
+hardlink:  libasan libpcre2-8 
+hexdump:  libasan libtinfo 
+hwclock:  libasan libaudit libgcc_s libm librt 
+ionice:  libasan 
+ipcmk:  libasan 
+ipcrm:  libasan 
+ipcs:  libasan libgcc_s 
+isosize:  libasan 
+kill:  libasan 
+last:  libasan librt 
+ldattach:  libasan 
+line:  libasan 
+logger:  libasan libsystemd 
+login:  libasan libaudit libpam libpam_misc libselinux 
+look:  libasan 
+mcookie:  libasan 
+mesg:  libasan 
+mkfs:  libasan 
+mkfs.bfs:  libasan 
+mkfs.cramfs:  libasan libz 
+mkfs.minix:  libasan libgcc_s 
+more:  libasan libtinfo 
+namei:  libasan 
+newgrp:  libasan rypt 
+nologin:  libasan 
+nsenter:  libasan libselinux 
+pg:  libasan libdl libncursesw libtinfo 
+pivot_root:  libasan 
+raw:  libasan 
+readprofile:  libasan 
+rename:  libasan 
+renice:  libasan 
+resizepart:  libasan libgcc_s 
+rev:  libasan 
+rtcwake:  libasan 
+runuser:  libasan libpam libpam_misc libutil 
+script:  libasan librt libutempter libutil 
+scriptreplay:  libasan 
+setarch:  libasan 
+setpriv:  ap-ng libasan 
+setsid:  libasan 
+setterm:  libasan libtinfo 
+su:  libasan libpam libpam_misc libutil 
+sulogin:  libasan libselinux rypt 
+switch_root:  libasan 
+taskset:  libasan 
+tunelp:  libasan 
+ul:  libasan libtinfo 
+unshare:  libasan 
+utmpdump:  libasan 
+vipw:  libasan libselinux 
+wall:  libasan 
+whereis:  libasan 
+write:  libasan 
diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs
index b1dd90b7b..118b04cea 100644
--- a/tests/expected/build-sys/config-devel-non-docs
+++ b/tests/expected/build-sys/config-devel-non-docs
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libselinux libuuid 
+eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid 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 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
+fsck:  libblkid libmount librt libselinux 
+fstrim:  libblkid libmount librt libselinux 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
+lslocks:  libblkid libmount librt libselinux libsmartcols 
 lslogins:  libselinux libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libselinux libsmartcols libuuid 
+lsns:  libblkid libmount librt libselinux libsmartcols 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount librt libselinux libuuid 
-mountpoint:  libblkid libmount librt libselinux libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt libselinux 
+mountpoint:  libblkid libmount librt libselinux 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libselinux libuuid 
-swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
-umount:  libblkid libmount librt libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux 
+swapon:  libblkid libmount librt libselinux libsmartcols 
+umount:  libblkid libmount librt libselinux 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libaudit libm 
+hwclock:  libaudit libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
@@ -89,7 +90,7 @@ namei:
 newgrp:  rypt 
 nologin:  
 nsenter:  libselinux 
-pg:  libncursesw libtinfo 
+pg:  libdl libncursesw libtinfo 
 pivot_root:  
 raw:  
 readprofile:  
diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index a3a451d19..195187b1f 100644
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -1,4 +1,4 @@
-cfdisk:  libfdisk libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libdl libfdisk libncursesw libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 fdisk:  libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
@@ -42,8 +42,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 931336525..d2264a30c 100644
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -1,10 +1,10 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libncursesw libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
+findfs:  libblkid 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -14,7 +14,7 @@ lsipc:  libsmartcols
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
 mkswap:  libblkid libuuid 
-partx:  libblkid libsmartcols libuuid 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -23,7 +23,7 @@ uuidd:  librt libsystemd libuuid
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -50,8 +50,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index c445ab00a..96eec3c1b 100644
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -21,8 +21,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols
index 576d796db..f4f6688d1 100644
--- a/tests/expected/build-sys/config-non-libsmartcols
+++ b/tests/expected/build-sys/config-non-libsmartcols
@@ -1,18 +1,18 @@
-blkid:  libblkid libuuid 
-eject:  libblkid libmount librt libuuid 
-findfs:  libblkid libuuid 
-fsck:  libblkid libmount librt libuuid 
-fstrim:  libblkid libmount librt libuuid 
-libblkid.so.1.1.0:  libuuid 
+blkid:  libblkid 
+eject:  libblkid libmount librt 
+findfs:  libblkid 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libuuid 
+libmount.so.1.1.0:  libblkid librt 
 libuuid.so.1.3.0:  
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount librt libuuid 
-mountpoint:  libblkid libmount librt libuuid 
-pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
+pylibmount.so:  libblkid libmount libpython2 librt 
 swaplabel:  libblkid libuuid 
-umount:  libblkid libmount librt libuuid 
+umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 agetty:  
@@ -38,8 +38,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 60a200c3a..ccff63d4f 100644
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -56,8 +56,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index c2c32cc0f..68b553817 100644
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libuuid 
+eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid libuuid 
-findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
-fsck:  libblkid libmount librt libuuid 
-fstrim:  libblkid libmount librt libuuid 
-libblkid.so.1.1.0:  libuuid 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libsmartcols libudev 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libuuid 
+libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libsmartcols libuuid 
+lslocks:  libblkid libmount librt libsmartcols 
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libsmartcols libuuid 
+lsns:  libblkid libmount librt libsmartcols 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount librt libuuid 
-mountpoint:  libblkid libmount librt libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libuuid 
-swapon:  libblkid libmount librt libsmartcols libuuid 
-umount:  libblkid libmount librt libuuid 
+swapoff:  libblkid libmount librt 
+swapon:  libblkid libmount librt libsmartcols 
+umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index aab84f37e..cddd75f73 100644
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libselinux libuuid 
+eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid 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 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
+fsck:  libblkid libmount librt libselinux 
+fstrim:  libblkid libmount librt libselinux 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libselinux libuuid 
+libmount.so.1.1.0:  libblkid librt libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libselinux libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libselinux libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libselinux libsmartcols libuuid 
+lslocks:  libblkid libmount librt libselinux libsmartcols 
 lslogins:  libselinux libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libselinux libsmartcols libuuid 
+lsns:  libblkid libmount librt libselinux libsmartcols 
 mkswap:  libblkid libselinux libuuid 
-mount:  libblkid libmount librt libselinux libuuid 
-mountpoint:  libblkid libmount librt libselinux libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt libselinux 
+mountpoint:  libblkid libmount librt libselinux 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libselinux libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libselinux libuuid 
-swapon:  libblkid libmount librt libselinux libsmartcols libuuid 
-umount:  libblkid libmount librt libselinux libuuid 
+swapoff:  libblkid libmount librt libselinux 
+swapon:  libblkid libmount librt libselinux libsmartcols 
+umount:  libblkid libmount librt libselinux 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 7de180226..89addae64 100644
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
+blkid:  libblkid 
 cfdisk:  libblkid libfdisk libmount librt libslang libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libuuid 
+eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid libuuid 
-findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
-fsck:  libblkid libmount librt libuuid 
-fstrim:  libblkid libmount librt libuuid 
-libblkid.so.1.1.0:  libuuid 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libsmartcols libudev 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libuuid 
+libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libsmartcols libuuid 
+lslocks:  libblkid libmount librt libsmartcols 
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libsmartcols libuuid 
+lsns:  libblkid libmount librt libsmartcols 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount librt libuuid 
-mountpoint:  libblkid libmount librt libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libuuid 
-swapon:  libblkid libmount librt libsmartcols libuuid 
-umount:  libblkid libmount librt libuuid 
+swapoff:  libblkid libmount librt 
+swapon:  libblkid libmount librt libsmartcols 
+umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -64,8 +64,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm:  
diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index 1e35f2b5f..eff9cf11e 100644
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -1,43 +1,43 @@
-blkid:  libblkid libuuid 
-cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+blkid:  libblkid 
+cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
-eject:  libblkid libmount librt libuuid 
+eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
-findfs:  libblkid libuuid 
-findmnt:  libblkid libmount librt libsmartcols libudev libuuid 
-fsck:  libblkid libmount librt libuuid 
-fstrim:  libblkid libmount librt libuuid 
-libblkid.so.1.1.0:  libuuid 
+findfs:  libblkid 
+findmnt:  libblkid libmount librt libsmartcols libudev 
+fsck:  libblkid libmount librt 
+fstrim:  libblkid libmount librt 
+libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
-libmount.so.1.1.0:  libblkid librt libuuid 
+libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount librt libsmartcols libudev libuuid 
+lsblk:  libblkid libmount librt libsmartcols libudev 
 lscpu:  libsmartcols 
 lsipc:  libsmartcols 
-lslocks:  libblkid libmount librt libsmartcols libuuid 
+lslocks:  libblkid libmount librt libsmartcols 
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
-lsns:  libblkid libmount librt libsmartcols libuuid 
+lsns:  libblkid libmount librt libsmartcols 
 mkswap:  libblkid libuuid 
-mount:  libblkid libmount librt libuuid 
-mountpoint:  libblkid libmount librt libuuid 
-partx:  libblkid libsmartcols libuuid 
+mount:  libblkid libmount librt 
+mountpoint:  libblkid libmount librt 
+partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython2 librt libuuid 
+pylibmount.so:  libblkid libmount libpython2 librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
-swapoff:  libblkid libmount librt libuuid 
-swapon:  libblkid libmount librt libsmartcols libuuid 
-umount:  libblkid libmount librt libuuid 
+swapoff:  libblkid libmount librt 
+swapon:  libblkid libmount librt libsmartcols 
+umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
-wipefs:  libblkid libsmartcols libuuid 
+wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
@@ -66,8 +66,9 @@ fsck.cramfs:  libz
 fsck.minix:  
 fsfreeze:  
 getopt:  
+hardlink:  libpcre2-8 
 hexdump:  libtinfo 
-hwclock:  libm 
+hwclock:  libm librt 
 ionice:  
 ipcmk:  
 ipcrm: