tests: update build test results

Update as usually before release to see differences (on Fedora 33).

- static programs are not enabled by tools/config-gen.d/all.conf
  anymore (see 63f4e199287c6b2cfbb092f1e2b0f0a3e0e576e3)
- add new uclampset
- libdl and libpython3 seems unnecessary
- fdformat disabled by default
- new hardlink uses libpcre2-posix

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

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index cc8cb0ab9c088e39c1e69382dc87cb8caa43925e..bf5008ccb598677c13e1a89730e633a6a7179e43 100644 (file)
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libcryptsetup libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libcryptsetup libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libcryptsetup libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libcryptsetup libmount librt libsmartcols libudev 
 fsck:  libblkid libcryptsetup libmount librt 
 fstrim:  libblkid libcryptsetup libmount librt 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libcryptsetup librt 
@@ -28,7 +29,7 @@ mount:  libblkid libcryptsetup libmount librt
 mountpoint:  libblkid libcryptsetup libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libcryptsetup libmount libpython3 librt 
+pylibmount.so:  libblkid libcryptsetup libmount librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -62,13 +61,12 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -83,7 +81,6 @@ line:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -91,13 +88,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  
-nsenter.static: STATIC
-pg:  libdl libncursesw libtinfo 
+pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
 readprofile:  
@@ -114,16 +109,14 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 tunelp:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 vipw:  
 wall:  

diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index cc8cb0ab9c088e39c1e69382dc87cb8caa43925e..bf5008ccb598677c13e1a89730e633a6a7179e43 100644 (file)
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libcryptsetup libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libcryptsetup libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libcryptsetup libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libcryptsetup libmount librt libsmartcols libudev 
 fsck:  libblkid libcryptsetup libmount librt 
 fstrim:  libblkid libcryptsetup libmount librt 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libcryptsetup librt 
@@ -28,7 +29,7 @@ mount:  libblkid libcryptsetup libmount librt
 mountpoint:  libblkid libcryptsetup libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libcryptsetup libmount libpython3 librt 
+pylibmount.so:  libblkid libcryptsetup libmount librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -62,13 +61,12 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -83,7 +81,6 @@ line:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -91,13 +88,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  
-nsenter.static: STATIC
-pg:  libdl libncursesw libtinfo 
+pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
 readprofile:  
@@ -114,16 +109,14 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 tunelp:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 vipw:  
 wall:  

diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index 3ad427724904b4b251cd28692cd1bd454deb649d..9a494d04eef8602b217e7d585725ee2281df4e72 100644 (file)
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libsmartcols libudev 
 fsck:  libblkid libmount librt 
 fstrim:  libblkid libmount librt 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid librt 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt
 mountpoint:  libblkid libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt 
+pylibmount.so:  libblkid libmount librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,14 +60,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libaudit libm librt 
 ionice:  
@@ -82,7 +79,6 @@ ldattach:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -90,11 +86,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -111,15 +105,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser
index ffc78749ce72d7b9daf7cf4646b05622162d4e6c..0e29a8d027d50dfa80a5ca5009479aa45d625227 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-libuser
+++ b/tests/expected/build-sys/config-chfnsh-libuser
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
 fsck:  libblkid libmount librt libselinux 
 fstrim:  libblkid libmount librt libselinux 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid librt libselinux 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt libselinux
 mountpoint:  libblkid libmount librt libselinux 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt libselinux 
+pylibmount.so:  libblkid libmount librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,14 +60,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libaudit libm librt 
 ionice:  
@@ -82,7 +79,6 @@ ldattach:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -90,11 +86,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  libselinux 
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -111,15 +105,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password
index 432d1c4bf932101f53a867a9e2ef0da1650afcab..7c70d6a7a075c453b49416d6692ccdd7ddf36fab 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-no-password
+++ b/tests/expected/build-sys/config-chfnsh-no-password
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
 fsck:  libblkid libmount librt libselinux 
 fstrim:  libblkid libmount librt libselinux 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid librt libselinux 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt libselinux
 mountpoint:  libblkid libmount librt libselinux 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt libselinux 
+pylibmount.so:  libblkid libmount librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,14 +60,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libaudit libm librt 
 ionice:  
@@ -82,7 +79,6 @@ ldattach:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -90,11 +86,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  libselinux 
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -111,15 +105,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam
index 53ce4ad1be240d26aeb7992b3d76b34af9d89b2a..6230eb3ef2623cc1eccb8949166044600cb86d5a 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-pam
+++ b/tests/expected/build-sys/config-chfnsh-pam
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
 fsck:  libblkid libmount librt libselinux 
 fstrim:  libblkid libmount librt libselinux 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid librt libselinux 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt libselinux
 mountpoint:  libblkid libmount librt libselinux 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt libselinux 
+pylibmount.so:  libblkid libmount librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,14 +60,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libaudit libm librt 
 ionice:  
@@ -82,7 +79,6 @@ ldattach:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -90,11 +86,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  libselinux 
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -111,15 +105,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index 9dc397079eeb81543e6bf802e329315b997a87b1..44f2984289e2e9db233ed97cd665a1d016262e15 100644 (file)
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libsmartcols libudev 
 fsck:  libblkid libmount librt 
 fstrim:  libblkid libmount librt 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid librt 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt
 mountpoint:  libblkid libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt 
+pylibmount.so:  libblkid libmount librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,14 +60,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -82,7 +79,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -90,11 +86,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -111,15 +105,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index 620ee7177b498d6d18b137c0503e8cbe23e33fb3..d47a1fdb0f93963f17acf8ac1a5e9187926dc6ec 100644 (file)
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libcryptsetup libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libcryptsetup libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libcryptsetup libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libcryptsetup libmount librt libselinux libsmartcols libudev 
 fsck:  libblkid libcryptsetup libmount librt libselinux 
 fstrim:  libblkid libcryptsetup libmount librt libselinux 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libcryptsetup librt libselinux 
@@ -28,7 +29,7 @@ mount:  libblkid libcryptsetup libmount librt libselinux
 mountpoint:  libblkid libcryptsetup libmount librt libselinux 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libcryptsetup libmount libpython3 librt libselinux 
+pylibmount.so:  libblkid libcryptsetup libmount librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -62,13 +61,12 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libaudit libm librt 
 ionice:  
@@ -83,7 +81,6 @@ line:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -91,13 +88,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
-nsenter.static: STATIC
-pg:  libdl libncursesw libtinfo 
+pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
 readprofile:  
@@ -114,16 +109,14 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 tunelp:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 vipw:  libselinux 
 wall:  

diff --git a/tests/expected/build-sys/config-devel-non-asan b/tests/expected/build-sys/config-devel-non-asan
index 620ee7177b498d6d18b137c0503e8cbe23e33fb3..d47a1fdb0f93963f17acf8ac1a5e9187926dc6ec 100644 (file)
--- a/tests/expected/build-sys/config-devel-non-asan
+++ b/tests/expected/build-sys/config-devel-non-asan
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libcryptsetup libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libcryptsetup libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libcryptsetup libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libcryptsetup libmount librt libselinux libsmartcols libudev 
 fsck:  libblkid libcryptsetup libmount librt libselinux 
 fstrim:  libblkid libcryptsetup libmount librt libselinux 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libcryptsetup librt libselinux 
@@ -28,7 +29,7 @@ mount:  libblkid libcryptsetup libmount librt libselinux
 mountpoint:  libblkid libcryptsetup libmount librt libselinux 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libcryptsetup libmount libpython3 librt libselinux 
+pylibmount.so:  libblkid libcryptsetup libmount librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -62,13 +61,12 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libaudit libm librt 
 ionice:  
@@ -83,7 +81,6 @@ line:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -91,13 +88,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
-nsenter.static: STATIC
-pg:  libdl libncursesw libtinfo 
+pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
 readprofile:  
@@ -114,16 +109,14 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 tunelp:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 vipw:  libselinux 
 wall:  

diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs
index 620ee7177b498d6d18b137c0503e8cbe23e33fb3..d47a1fdb0f93963f17acf8ac1a5e9187926dc6ec 100644 (file)
--- a/tests/expected/build-sys/config-devel-non-docs
+++ b/tests/expected/build-sys/config-devel-non-docs
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libcryptsetup libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libcryptsetup libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libcryptsetup libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libcryptsetup libmount librt libselinux libsmartcols libudev 
 fsck:  libblkid libcryptsetup libmount librt libselinux 
 fstrim:  libblkid libcryptsetup libmount librt libselinux 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libcryptsetup librt libselinux 
@@ -28,7 +29,7 @@ mount:  libblkid libcryptsetup libmount librt libselinux
 mountpoint:  libblkid libcryptsetup libmount librt libselinux 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libcryptsetup libmount libpython3 librt libselinux 
+pylibmount.so:  libblkid libcryptsetup libmount librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -62,13 +61,12 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libaudit libm librt 
 ionice:  
@@ -83,7 +81,6 @@ line:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -91,13 +88,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
-nsenter.static: STATIC
-pg:  libdl libncursesw libtinfo 
+pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
 readprofile:  
@@ -114,16 +109,14 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 tunelp:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 vipw:  libselinux 
 wall:  

diff --git a/tests/expected/build-sys/config-disable-all b/tests/expected/build-sys/config-disable-all
index 05e4de65f65c16ceba0ceb4c6a9a4bd0948dedb9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/tests/expected/build-sys/config-disable-all
+++ b/tests/expected/build-sys/config-disable-all
@@ -1,8 +0,0 @@
-blkid.static: STATIC
-fdisk.static: STATIC
-losetup.static: STATIC
-mount.static: STATIC
-nsenter.static: STATIC
-sfdisk.static: STATIC
-umount.static: STATIC
-unshare.static: STATIC

diff --git a/tests/expected/build-sys/config-enable-schedutils b/tests/expected/build-sys/config-enable-schedutils
index a5c72d8375b59be7c3ddc0df744c45089e8b50a5..39eeae0b9e1b06b681d98a3d164d4590bd21faaa 100644 (file)
--- a/tests/expected/build-sys/config-enable-schedutils
+++ b/tests/expected/build-sys/config-enable-schedutils
@@ -1,11 +1,4 @@
-blkid.static: STATIC
 chrt:  
-fdisk.static: STATIC
 ionice:  
-losetup.static: STATIC
-mount.static: STATIC
-nsenter.static: STATIC
-sfdisk.static: STATIC
 taskset:  
-umount.static: STATIC
-unshare.static: STATIC
+uclampset:  

diff --git a/tests/expected/build-sys/config-fuzz b/tests/expected/build-sys/config-fuzz
new file mode 100644 (file)
index 0000000..43fc431
--- /dev/null
+++ b/tests/expected/build-sys/config-fuzz
@@ -0,0 +1 @@
+libuuid.so.1.3.0:  

diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index c9dabb0d5652f8e2470ce08fe0192eb7f570271d..8e5e8ced4394635ad253f28c635f1b7439c40f53 100644 (file)
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -1,29 +1,10 @@
-cfdisk:  libdl libfdisk libncursesw libsmartcols libtinfo libuuid 
-column:  libsmartcols 
-fdisk:  libfdisk libreadline libsmartcols libtinfo libuuid 
-fincore:  libsmartcols 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
 libfdisk.so.1.1.0:  libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
-losetup:  libsmartcols 
-lscpu:  libsmartcols 
-lsipc:  libsmartcols 
-lsirq:  libsmartcols 
-lslogins:  libsmartcols libsystemd 
-lsmem:  libsmartcols 
 mkswap:  libuuid 
-prlimit:  libsmartcols 
-rfkill:  libsmartcols 
-sfdisk:  libfdisk libreadline libsmartcols libtinfo libuuid 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
-uuidparse:  libsmartcols libuuid 
-wdctl:  libsmartcols 
-zramctl:  libsmartcols 
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -39,14 +20,12 @@ colrm:
 ctrlaltdel:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -60,7 +39,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -68,11 +46,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -88,15 +64,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 411a091f1d1095e2835d9a0d1e5c3f1b0481c2c1..be59ad86064fcb4e421fde40f9f3b19178e66d83 100644 (file)
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -1,10 +1,11 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 fincore:  libsmartcols 
 findfs:  libblkid 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
@@ -29,8 +30,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -47,14 +46,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -68,7 +65,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -76,11 +72,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -97,15 +91,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index c074435ad599531310ddef7ee27f135ddcedc160..c35693a3637e456c0bfdb3f56b3d6da2fba7a4fa 100644 (file)
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -1,6 +1,4 @@
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -16,14 +14,12 @@ colrm:
 ctrlaltdel:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -37,7 +33,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -46,11 +41,9 @@ mkfs.cramfs:  libz
 mkfs.minix:  
 mkswap:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -66,15 +59,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols
index d2b730fc3a83ea9bb39a5eba904f6119b0a99f18..fdd8b4ce7393aca253515047df85f600bdd53549 100644 (file)
--- a/tests/expected/build-sys/config-non-libsmartcols
+++ b/tests/expected/build-sys/config-non-libsmartcols
@@ -1,3 +1,4 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
 eject:  libblkid libmount librt 
 findfs:  libblkid 
@@ -10,14 +11,12 @@ libuuid.so.1.3.0:
 mkswap:  libblkid libuuid 
 mount:  libblkid libmount librt 
 mountpoint:  libblkid libmount librt 
-pylibmount.so:  libblkid libmount libpython3 librt 
+pylibmount.so:  libblkid libmount librt 
 swaplabel:  libblkid libuuid 
 umount:  libblkid libmount librt 
 uuidd:  librt libsystemd libuuid 
 uuidgen:  libuuid 
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -33,14 +32,12 @@ colrm:
 ctrlaltdel:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -54,7 +51,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -62,11 +58,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -82,15 +76,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 5364415fd435696bba437eb11585699f4fd53cb5..f96b3ed4825afe314cd8c6eab5a8525e6c947153 100644 (file)
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -1,3 +1,4 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
 column:  libsmartcols 
 eject:  libblkid libmount librt 
@@ -6,7 +7,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libsmartcols libudev 
 fsck:  libblkid libmount librt 
 fstrim:  libblkid libmount librt 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libmount.so.1.1.0:  libblkid librt 
 libsmartcols.so.1.1.0:  
@@ -24,7 +25,7 @@ mount:  libblkid libmount librt
 mountpoint:  libblkid libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt 
+pylibmount.so:  libblkid libmount librt 
 rfkill:  libsmartcols 
 swaplabel:  libblkid 
 swapoff:  libblkid libmount librt 
@@ -35,8 +36,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -53,14 +52,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -74,7 +71,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -82,11 +78,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -103,15 +97,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index 9dc397079eeb81543e6bf802e329315b997a87b1..44f2984289e2e9db233ed97cd665a1d016262e15 100644 (file)
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libsmartcols libudev 
 fsck:  libblkid libmount librt 
 fstrim:  libblkid libmount librt 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid librt 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt
 mountpoint:  libblkid libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt 
+pylibmount.so:  libblkid libmount librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,14 +60,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -82,7 +79,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -90,11 +86,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -111,15 +105,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-widechar b/tests/expected/build-sys/config-non-widechar
index 05e4de65f65c16ceba0ceb4c6a9a4bd0948dedb9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/tests/expected/build-sys/config-non-widechar
+++ b/tests/expected/build-sys/config-non-widechar
@@ -1,8 +0,0 @@
-blkid.static: STATIC
-fdisk.static: STATIC
-losetup.static: STATIC
-mount.static: STATIC
-nsenter.static: STATIC
-sfdisk.static: STATIC
-umount.static: STATIC
-unshare.static: STATIC

diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index f677ef75cc07218c6d4c2f61768b6f691366aace..584eca2291a2896dc316613596f9a12706e43989 100644 (file)
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libselinux libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libmount librt libselinux 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libselinux libsmartcols libudev 
 fsck:  libblkid libmount librt libselinux 
 fstrim:  libblkid libmount librt libselinux 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid librt libselinux 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt libselinux
 mountpoint:  libblkid libmount librt libselinux 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt libselinux 
+pylibmount.so:  libblkid libmount librt libselinux 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,14 +60,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -82,7 +79,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc libselinux 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -90,11 +86,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  libselinux 
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -111,15 +105,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 92ab9b17698398f23044d9e92215e80ef61514f9..3d863da655f17a8c3b93191b502192fb2c3c5792 100644 (file)
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -1,3 +1,4 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
 cfdisk:  libblkid libfdisk libmount librt libslang libsmartcols libtinfo libuuid 
 column:  libsmartcols 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt
 mountpoint:  libblkid libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt 
+pylibmount.so:  libblkid libmount librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,8 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
-blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,14 +60,12 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
-fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -82,7 +79,6 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
-losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -90,11 +86,9 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
-nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -111,15 +105,13 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
-umount.static: STATIC
 unshare:  
-unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index 9dc397079eeb81543e6bf802e329315b997a87b1..e6140e7cb79db5d3270981df71b91fdc3b2850bb 100644 (file)
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -1,5 +1,6 @@
+blkdiscard:  libblkid librt 
 blkid:  libblkid 
-cfdisk:  libblkid libdl libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libmount libncursesw librt libsmartcols libtinfo libuuid 
 column:  libsmartcols 
 eject:  libblkid libmount librt 
 fdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
@@ -8,7 +9,7 @@ findfs:  libblkid
 findmnt:  libblkid libmount librt libsmartcols libudev 
 fsck:  libblkid libmount librt 
 fstrim:  libblkid libmount librt 
-irqtop:  libdl libncursesw librt libsmartcols libtinfo 
+irqtop:  libncursesw librt libsmartcols libtinfo 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid librt 
@@ -28,7 +29,7 @@ mount:  libblkid libmount librt
 mountpoint:  libblkid libmount librt 
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
-pylibmount.so:  libblkid libmount libpython3 librt 
+pylibmount.so:  libblkid libmount librt 
 rfkill:  libsmartcols 
 sfdisk:  libblkid libfdisk libreadline libsmartcols libtinfo libuuid 
 swaplabel:  libblkid libuuid 
@@ -43,7 +44,6 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
-blkdiscard:  librt 
 blkid.static: STATIC
 blkzone:  
 blockdev:  
@@ -61,14 +61,13 @@ ctrlaltdel:
 delpart:  
 dmesg:  librt libtinfo 
 fallocate:  
-fdformat:  
 fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 getopt:  
-hardlink:  libpcre2-8 
+hardlink:  libpcre2-posix librt 
 hexdump:  libtinfo 
 hwclock:  libm librt 
 ionice:  
@@ -116,6 +115,7 @@ su:  libpam libpam_misc librt libutil
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
+uclampset:  
 ul:  libtinfo 
 umount.static: STATIC
 unshare: