tests: update build tests

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 0e1668d8060cc08e7c31cf2b9bbea5881374a72e..956db975353972fb5a5fc6c1994d5b9105d776bb 100644 (file)
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libsmartcols libudev libuuid 
 fsck:  libblkid libmount libuuid 
 fstrim:  libblkid libmount libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libuuid 
 swapon:  libblkid libmount libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 line:  
 logger:  libsystemd-id128 libsystemd-journal 
@@ -93,7 +96,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index 0e1668d8060cc08e7c31cf2b9bbea5881374a72e..956db975353972fb5a5fc6c1994d5b9105d776bb 100644 (file)
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libsmartcols libudev libuuid 
 fsck:  libblkid libmount libuuid 
 fstrim:  libblkid libmount libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libuuid 
 swapon:  libblkid libmount libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 line:  
 logger:  libsystemd-id128 libsystemd-journal 
@@ -93,7 +96,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index 97d0c61b7e10ef1e2598d048d9aa30875084db35..73c1150aee51df9c84f4b5abeafda8ee02620632 100644 (file)
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libsmartcols libudev libuuid 
 fsck:  libblkid libmount libuuid 
 fstrim:  libblkid libmount libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libuuid 
 swapon:  libblkid libmount libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  libaudit 
+hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libaudit libpam libpam_misc 
@@ -91,7 +94,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser
index 06bbb02ecd995dbb2e845160526c35ed43eb5bff..b866ab5f3f5bcdddec17e9844450d2939bb44a2e 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-libuser
+++ b/tests/expected/build-sys/config-chfnsh-libuser
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
 fsck:  libblkid libmount libselinux libuuid 
 fstrim:  libblkid libmount libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libselinux libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libselinux libuuid 
 swapon:  libblkid libmount libselinux libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  libaudit 
+hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libaudit libpam libpam_misc libselinux 
@@ -91,7 +94,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  libselinux rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password
index 0c2abca01031de188f6e812baa79bf580db68d98..4141068ebaf40d581f456faad8f0660253aa7e60 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-no-password
+++ b/tests/expected/build-sys/config-chfnsh-no-password
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
 fsck:  libblkid libmount libselinux libuuid 
 fstrim:  libblkid libmount libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libselinux libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libselinux libuuid 
 swapon:  libblkid libmount libselinux libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  libaudit 
+hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libaudit libpam libpam_misc libselinux 
@@ -91,7 +94,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  libselinux rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam
index 3bab4d66c0a3d29ea7ff1c32ce1787d012664795..c03ead9d44964e8d8dfa9dd842b2d6effed66d15 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-pam
+++ b/tests/expected/build-sys/config-chfnsh-pam
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
 fsck:  libblkid libmount libselinux libuuid 
 fstrim:  libblkid libmount libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libselinux libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libselinux libuuid 
 swapon:  libblkid libmount libselinux libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  libaudit 
+hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libaudit libpam libpam_misc libselinux 
@@ -91,7 +94,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  libselinux rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index 1a1546c6d1a6bfff6c140c2a353f0656b5f9b55f..4d25b68b293e8cc9ab9419d9572f4112c8039c52 100644 (file)
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libsmartcols libudev libuuid 
 fsck:  libblkid libmount libuuid 
 fstrim:  libblkid libmount libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libuuid 
 swapon:  libblkid libmount libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -91,7 +94,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index 461957a1945059adc51e2039ee57e92a41d1a146..d039ab3cf70b709f42949aa6ea418f3425ee1321 100644 (file)
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
 fsck:  libblkid libmount libselinux libuuid 
 fstrim:  libblkid libmount libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libselinux libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libselinux libuuid 
 swapon:  libblkid libmount libselinux libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  libaudit 
+hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 line:  
 logger:  libsystemd-id128 libsystemd-journal 
@@ -93,7 +96,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  libselinux rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs
index 461957a1945059adc51e2039ee57e92a41d1a146..d039ab3cf70b709f42949aa6ea418f3425ee1321 100644 (file)
--- a/tests/expected/build-sys/config-devel-non-docs
+++ b/tests/expected/build-sys/config-devel-non-docs
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
 fsck:  libblkid libmount libselinux libuuid 
 fstrim:  libblkid libmount libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libselinux libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libselinux libuuid 
 swapon:  libblkid libmount libselinux libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  libaudit 
+hwclock:  libaudit libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 line:  
 logger:  libsystemd-id128 libsystemd-journal 
@@ -93,7 +96,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  libselinux rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index 69b63647272293a403ae059d5403aa58f44c819c..b79b9ad4982e047f2fb411b2f83f9baf9503fd10 100644 (file)
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -1,5 +1,6 @@
-cfdisk:  libncursesw libsmartcols libtinfo libuuid 
-fdisk:  libsmartcols libuuid 
+cfdisk:  libfdisk libncursesw libsmartcols libtinfo libuuid 
+fdisk:  libfdisk libsmartcols libuuid 
+libfdisk.so.1.1.0:  libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
@@ -7,9 +8,11 @@ lscpu:  libsmartcols
 lslogins:  libsmartcols libsystemd-id128 libsystemd-journal 
 mkswap:  libuuid 
 prlimit:  libsmartcols 
+sfdisk:  libfdisk libsmartcols libuuid 
 uuidd:  libsystemd-daemon libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
+zramctl:  libsmartcols 
 agetty:  
 blkdiscard:  
 blockdev:  
@@ -23,7 +26,7 @@ colcrt:
 colrm:  
 column:  
 ctrlaltdel:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -32,14 +35,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -69,7 +72,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 62642688d9222a35c7c25c1457aa9fd11aefefeb..d0a6a070170dc8214325fbaabbd29c4b7dd2bd4a 100644 (file)
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -1,8 +1,9 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
@@ -11,11 +12,13 @@ lslogins:  libsmartcols libsystemd-id128 libsystemd-journal
 mkswap:  libblkid libuuid 
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 uuidd:  libsystemd-daemon libuuid 
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -31,7 +34,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -40,14 +43,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -78,7 +81,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index 68eec422c117918ed7d04e23181423327e0ff017..2e17425842dad2570a5a751610af4c0af4cc921d 100644 (file)
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -11,7 +11,7 @@ colcrt:
 colrm:  
 column:  
 ctrlaltdel:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -20,14 +20,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -58,7 +58,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols
index b52ae7197c8344f66278cdbeba0a3e6eab42693d..56a3760c0f27ccd7d1ee62f00ae3cd3350c12bb0 100644 (file)
--- a/tests/expected/build-sys/config-non-libsmartcols
+++ b/tests/expected/build-sys/config-non-libsmartcols
@@ -4,6 +4,7 @@ findfs:  libblkid libuuid
 fsck:  libblkid libmount libuuid 
 fstrim:  libblkid libmount libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libuuid.so.1.3.0:  
 mkswap:  libblkid libuuid 
@@ -28,7 +29,7 @@ colcrt:
 colrm:  
 column:  
 ctrlaltdel:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -37,14 +38,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -74,7 +75,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index fe58aafe6e411178b22cd01de18f39a887325fd1..f9f2819b1f0f7b23ed073efae55a1ef47bf64bbe 100644 (file)
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -24,6 +24,7 @@ swapon:  libblkid libmount libsmartcols
 umount:  libblkid libmount 
 wdctl:  libsmartcols 
 wipefs:  libblkid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -39,7 +40,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -48,14 +49,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -86,7 +87,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index 1a1546c6d1a6bfff6c140c2a353f0656b5f9b55f..4d25b68b293e8cc9ab9419d9572f4112c8039c52 100644 (file)
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libsmartcols libudev libuuid 
 fsck:  libblkid libmount libuuid 
 fstrim:  libblkid libmount libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libuuid 
 swapon:  libblkid libmount libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -91,7 +94,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index 8be964053a11794c76a2bc4cb62d97d710c643c9..49ba264d18f8dc896c7c406b00e22aff1ffa36b6 100644 (file)
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libselinux libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libselinux libsmartcols libudev libuuid 
 fsck:  libblkid libmount libselinux libuuid 
 fstrim:  libblkid libmount libselinux libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libselinux libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libselinux libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libselinux libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libselinux libuuid 
 swapon:  libblkid libmount libselinux libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc libselinux 
@@ -91,7 +94,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  libselinux rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 28cedc6ba161f7c223314af20d31522acf5f74b9..d4e93b1f5d03a1eaa992e692f7767e2030b94805 100644 (file)
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libslang libsmartcols libuuid 
+cfdisk:  libblkid libfdisk libslang libsmartcols libuuid 
 eject:  libblkid libmount libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libsmartcols libudev libuuid 
 fsck:  libblkid libmount libuuid 
 fstrim:  libblkid libmount libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libuuid 
 swapon:  libblkid libmount libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -44,7 +47,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 flock:  
@@ -53,14 +56,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -91,7 +94,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  

diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index 91d43293d833518c9bf1518b8a080c31a3354900..e1a2063d5956f19fb676f9ab07d838ab8c0e4cc7 100644 (file)
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -1,12 +1,13 @@
 blkid:  libblkid libuuid 
-cfdisk:  libblkid libncursesw libsmartcols libtinfo libuuid 
+cfdisk:  libblkid libfdisk libncursesw libsmartcols libtinfo libuuid 
 eject:  libblkid libmount libuuid 
-fdisk:  libblkid libsmartcols libuuid 
+fdisk:  libblkid libfdisk libsmartcols libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libsmartcols libudev libuuid 
 fsck:  libblkid libmount libuuid 
 fstrim:  libblkid libmount libuuid 
 libblkid.so.1.1.0:  libuuid 
+libfdisk.so.1.1.0:  libblkid libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
@@ -21,6 +22,7 @@ mountpoint:  libblkid libmount libuuid
 partx:  libblkid libsmartcols libuuid 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libpython2 libuuid 
+sfdisk:  libblkid libfdisk libsmartcols libuuid 
 swaplabel:  libblkid libuuid 
 swapoff:  libblkid libmount libuuid 
 swapon:  libblkid libmount libsmartcols libuuid 
@@ -29,6 +31,7 @@ uuidd:  libsystemd-daemon libuuid
 uuidgen:  libuuid 
 wdctl:  libsmartcols 
 wipefs:  libblkid libuuid 
+zramctl:  libsmartcols 
 addpart:  
 agetty:  
 blkdiscard:  
@@ -45,7 +48,7 @@ colrm:
 column:  
 ctrlaltdel:  
 delpart:  
-dmesg:  librt 
+dmesg:  
 fallocate:  
 fdformat:  
 fdisk.static: STATIC
@@ -55,14 +58,14 @@ fsck.minix:
 fsfreeze:  
 getopt:  
 hexdump:  
-hwclock:  
+hwclock:  libm 
 ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
 isosize:  
 kill:  
-last:  librt 
+last:  
 ldattach:  
 logger:  libsystemd-id128 libsystemd-journal 
 login:  libpam libpam_misc 
@@ -79,6 +82,7 @@ mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pg:  libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -95,7 +99,6 @@ setarch:
 setpriv:  ap-ng 
 setsid:  
 setterm:  libtinfo 
-sfdisk:  
 sfdisk.static: STATIC
 su:  libpam libpam_misc 
 sulogin:  rypt