diff options
20 files changed, 364 insertions, 220 deletions
diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all index 428490fdb..0e1668d80 100644 --- a/tests/expected/build-sys/config-all +++ b/tests/expected/build-sys/config-all @@ -1,27 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libudev libuuid +findmnt: libblkid libmount libsmartcols libudev libuuid fsck: libblkid libmount libuuid fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libudev libuuid -lslocks: libblkid libmount libuuid +losetup: libsmartcols +lsblk: libblkid libmount libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libsmartcols libuuid +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols pylibmount.so: libblkid libmount libpython2 libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid -swapon: libblkid libmount libuuid +swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: librt libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -54,14 +60,12 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: line: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -75,7 +79,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -102,6 +105,5 @@ unshare: utmpdump: vipw: wall: -wdctl: whereis: write: diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls index 428490fdb..0e1668d80 100644 --- a/tests/expected/build-sys/config-all-non-nls +++ b/tests/expected/build-sys/config-all-non-nls @@ -1,27 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libudev libuuid +findmnt: libblkid libmount libsmartcols libudev libuuid fsck: libblkid libmount libuuid fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libudev libuuid -lslocks: libblkid libmount libuuid +losetup: libsmartcols +lsblk: libblkid libmount libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libsmartcols libuuid +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols pylibmount.so: libblkid libmount libpython2 libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid -swapon: libblkid libmount libuuid +swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: librt libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -54,14 +60,12 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: line: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -75,7 +79,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -102,6 +105,5 @@ unshare: utmpdump: vipw: wall: -wdctl: whereis: write: diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit index cb623be47..97d0c61b7 100644 --- a/tests/expected/build-sys/config-audit +++ b/tests/expected/build-sys/config-audit @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libudev libuuid +findmnt: libblkid libmount libsmartcols libudev libuuid fsck: libblkid libmount libuuid fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libudev libuuid -lslocks: libblkid libmount libuuid +losetup: libsmartcols +lsblk: libblkid libmount libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libsmartcols libuuid +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid -swapon: libblkid libmount libuuid +swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -28,7 +35,9 @@ blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -51,13 +60,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libaudit libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -70,7 +77,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -95,5 +101,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser index 6ac5e56f4..06bbb02ec 100644 --- a/tests/expected/build-sys/config-chfnsh-libuser +++ b/tests/expected/build-sys/config-chfnsh-libuser @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libselinux libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libselinux libudev libuuid +findmnt: libblkid libmount libselinux libsmartcols libudev libuuid fsck: libblkid libmount libselinux libuuid fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libselinux libudev libuuid -lslocks: libblkid libmount libselinux libuuid +losetup: libsmartcols +lsblk: libblkid libmount libselinux libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libselinux libsmartcols libuuid +lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libselinux libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid -swapon: libblkid libmount libselinux libuuid +swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -53,13 +60,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libaudit libpam libpam_misc libselinux look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -72,7 +77,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -97,5 +101,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password index 7d04805ba..0c2abca01 100644 --- a/tests/expected/build-sys/config-chfnsh-no-password +++ b/tests/expected/build-sys/config-chfnsh-no-password @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libselinux libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libselinux libudev libuuid +findmnt: libblkid libmount libselinux libsmartcols libudev libuuid fsck: libblkid libmount libselinux libuuid fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libselinux libudev libuuid -lslocks: libblkid libmount libselinux libuuid +losetup: libsmartcols +lsblk: libblkid libmount libselinux libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libselinux libsmartcols libuuid +lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libselinux libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid -swapon: libblkid libmount libselinux libuuid +swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -53,13 +60,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libaudit libpam libpam_misc libselinux look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -72,7 +77,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -97,5 +101,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam index 5fa2be19d..3bab4d66c 100644 --- a/tests/expected/build-sys/config-chfnsh-pam +++ b/tests/expected/build-sys/config-chfnsh-pam @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libselinux libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libselinux libudev libuuid +findmnt: libblkid libmount libselinux libsmartcols libudev libuuid fsck: libblkid libmount libselinux libuuid fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libselinux libudev libuuid -lslocks: libblkid libmount libselinux libuuid +losetup: libsmartcols +lsblk: libblkid libmount libselinux libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libselinux libsmartcols libuuid +lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libselinux libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid -swapon: libblkid libmount libselinux libuuid +swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -53,13 +60,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libaudit libpam libpam_misc libselinux look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -72,7 +77,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -97,5 +101,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core index a0e6dd476..1a1546c6d 100644 --- a/tests/expected/build-sys/config-core +++ b/tests/expected/build-sys/config-core @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libudev libuuid +findmnt: libblkid libmount libsmartcols libudev libuuid fsck: libblkid libmount libuuid fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libudev libuuid -lslocks: libblkid libmount libuuid +losetup: libsmartcols +lsblk: libblkid libmount libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libsmartcols libuuid +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid -swapon: libblkid libmount libuuid +swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -28,7 +35,9 @@ blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -51,13 +60,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -70,7 +77,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -95,5 +101,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel index 1d377d951..461957a19 100644 --- a/tests/expected/build-sys/config-devel +++ b/tests/expected/build-sys/config-devel @@ -1,27 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libselinux libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libselinux libudev libuuid +findmnt: libblkid libmount libselinux libsmartcols libudev libuuid fsck: libblkid libmount libselinux libuuid fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libselinux libudev libuuid -lslocks: libblkid libmount libselinux libuuid +losetup: libsmartcols +lsblk: libblkid libmount libselinux libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libselinux libsmartcols libuuid +lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols pylibmount.so: libblkid libmount libpython2 libselinux libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid -swapon: libblkid libmount libselinux libuuid +swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: librt libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -54,14 +60,12 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: line: -logger: +logger: libsystemd-id128 libsystemd-journal login: libaudit libpam libpam_misc libselinux look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -75,7 +79,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -102,6 +105,5 @@ unshare: utmpdump: vipw: libselinux wall: -wdctl: whereis: write: diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs index 1d377d951..461957a19 100644 --- a/tests/expected/build-sys/config-devel-non-docs +++ b/tests/expected/build-sys/config-devel-non-docs @@ -1,27 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libselinux libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libselinux libudev libuuid +findmnt: libblkid libmount libselinux libsmartcols libudev libuuid fsck: libblkid libmount libselinux libuuid fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libselinux libudev libuuid -lslocks: libblkid libmount libselinux libuuid +losetup: libsmartcols +lsblk: libblkid libmount libselinux libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libselinux libsmartcols libuuid +lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols pylibmount.so: libblkid libmount libpython2 libselinux libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid -swapon: libblkid libmount libselinux libuuid +swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: librt libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -54,14 +60,12 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: line: -logger: +logger: libsystemd-id128 libsystemd-journal login: libaudit libpam libpam_misc libselinux look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -75,7 +79,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -102,6 +105,5 @@ unshare: utmpdump: vipw: libselinux wall: -wdctl: whereis: write: diff --git a/tests/expected/build-sys/config-disable-all b/tests/expected/build-sys/config-disable-all new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/expected/build-sys/config-disable-all diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid index fa9ce33a9..69b636472 100644 --- a/tests/expected/build-sys/config-non-libblkid +++ b/tests/expected/build-sys/config-non-libblkid @@ -1,15 +1,23 @@ -fdisk: libuuid +cfdisk: libncursesw libsmartcols libtinfo libuuid +fdisk: libsmartcols libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: +losetup: libsmartcols +lscpu: libsmartcols +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libuuid -uuidd: libuuid +prlimit: libsmartcols +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols agetty: blkdiscard: blockdev: cal: libncursesw libtinfo -cfdisk: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -31,13 +39,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -50,7 +56,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -74,5 +79,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount index 78e659f6e..62642688d 100644 --- a/tests/expected/build-sys/config-non-libmount +++ b/tests/expected/build-sys/config-non-libmount @@ -1,14 +1,20 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid -fdisk: libblkid libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid libblkid.so.1.1.0: libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: +losetup: libsmartcols +lscpu: libsmartcols +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols swaplabel: libblkid libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -16,7 +22,9 @@ blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -39,13 +47,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -58,7 +64,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -83,5 +88,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs index 2aa4820b1..68eec422c 100644 --- a/tests/expected/build-sys/config-non-libs +++ b/tests/expected/build-sys/config-non-libs @@ -2,9 +2,10 @@ agetty: blkdiscard: blockdev: cal: libncursesw libtinfo -cfdisk: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -26,13 +27,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -46,7 +45,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -70,5 +68,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols new file mode 100644 index 000000000..b52ae7197 --- /dev/null +++ b/tests/expected/build-sys/config-non-libsmartcols @@ -0,0 +1,87 @@ +blkid: libblkid libuuid +eject: libblkid libmount libuuid +findfs: libblkid libuuid +fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: +mkswap: libblkid libuuid +mount: libblkid libmount libuuid +mountpoint: libblkid libmount libuuid +pylibmount.so: libblkid libmount libpython2 libuuid +swaplabel: libblkid libuuid +umount: libblkid libmount libuuid +uuidd: libsystemd-daemon libuuid +uuidgen: libuuid +wipefs: libblkid libuuid +agetty: +blkdiscard: +blockdev: +cal: libncursesw libtinfo +chcpu: +chfn: libpam libpam_misc libpthread libuser +chrt: +chsh: libpam libpam_misc libpthread libuser +col: +colcrt: +colrm: +column: +ctrlaltdel: +dmesg: librt +fallocate: +fdformat: +flock: +fsck.cramfs: libz +fsck.minix: +fsfreeze: +getopt: +hexdump: +hwclock: +ionice: +ipcmk: +ipcrm: +ipcs: +isosize: +kill: +last: librt +ldattach: +logger: libsystemd-id128 libsystemd-journal +login: libpam libpam_misc +look: +mcookie: +mesg: +mkfs: +mkfs.bfs: +mkfs.cramfs: libz +mkfs.minix: +more: libtinfo +namei: +nologin: +nsenter: +pg: libncursesw libtinfo +pivot_root: +raw: +readprofile: +rename: +renice: +rev: +rtcwake: +runuser: libpam libpam_misc +script: libutil +scriptreplay: +setarch: +setpriv: ap-ng +setsid: +setterm: libtinfo +sfdisk: +su: libpam libpam_misc +sulogin: rypt +switch_root: +tailf: +taskset: +ul: libtinfo +unshare: +utmpdump: +wall: +whereis: diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid index 91fe3406b..fe58aafe6 100644 --- a/tests/expected/build-sys/config-non-libuuid +++ b/tests/expected/build-sys/config-non-libuuid @@ -1,22 +1,28 @@ blkid: libblkid -cfdisk: libblkid libncursesw libtinfo eject: libblkid libmount findfs: libblkid -findmnt: libblkid libmount libudev +findmnt: libblkid libmount libsmartcols libudev fsck: libblkid libmount fstrim: libblkid libmount libblkid.so.1.1.0: libmount.so.1.1.0: libblkid -lsblk: libblkid libmount libudev -lslocks: libblkid libmount +libsmartcols.so.1.1.0: +losetup: libsmartcols +lsblk: libblkid libmount libsmartcols libudev +lscpu: libsmartcols +lslocks: libblkid libmount libsmartcols +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid mount: libblkid libmount mountpoint: libblkid libmount -partx: libblkid +partx: libblkid libsmartcols +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 swaplabel: libblkid swapoff: libblkid libmount -swapon: libblkid libmount +swapon: libblkid libmount libsmartcols umount: libblkid libmount +wdctl: libsmartcols wipefs: libblkid addpart: agetty: @@ -24,7 +30,9 @@ blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -47,13 +55,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -66,7 +72,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -91,5 +96,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls index a0e6dd476..1a1546c6d 100644 --- a/tests/expected/build-sys/config-non-nls +++ b/tests/expected/build-sys/config-non-nls @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libudev libuuid +findmnt: libblkid libmount libsmartcols libudev libuuid fsck: libblkid libmount libuuid fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libudev libuuid -lslocks: libblkid libmount libuuid +losetup: libsmartcols +lsblk: libblkid libmount libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libsmartcols libuuid +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid -swapon: libblkid libmount libuuid +swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -28,7 +35,9 @@ blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -51,13 +60,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -70,7 +77,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -95,5 +101,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux index c2644abf7..8be964053 100644 --- a/tests/expected/build-sys/config-selinux +++ b/tests/expected/build-sys/config-selinux @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libselinux libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libselinux libudev libuuid +findmnt: libblkid libmount libselinux libsmartcols libudev libuuid fsck: libblkid libmount libselinux libuuid fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libselinux libudev libuuid -lslocks: libblkid libmount libselinux libuuid +losetup: libsmartcols +lsblk: libblkid libmount libselinux libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libselinux libsmartcols libuuid +lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libselinux libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid -swapon: libblkid libmount libselinux libuuid +swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -28,7 +35,9 @@ blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libselinux libuser chrt: +chsh: libpam libpam_misc libpthread libselinux libuser col: colcrt: colrm: @@ -51,13 +60,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc libselinux look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -70,7 +77,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -95,5 +101,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang index 363649210..28cedc6ba 100644 --- a/tests/expected/build-sys/config-slang +++ b/tests/expected/build-sys/config-slang @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libslang libuuid +cfdisk: libblkid libslang libsmartcols libuuid eject: libblkid libmount libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libudev libuuid +findmnt: libblkid libmount libsmartcols libudev libuuid fsck: libblkid libmount libuuid fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libudev libuuid -lslocks: libblkid libmount libuuid +losetup: libsmartcols +lsblk: libblkid libmount libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libsmartcols libuuid +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid -swapon: libblkid libmount libuuid +swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -28,7 +35,9 @@ blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -51,13 +60,11 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: -lscpu: mcookie: mesg: mkfs: @@ -70,7 +77,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -95,5 +101,4 @@ ul: libtinfo unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static index ba2184a0f..91d43293d 100644 --- a/tests/expected/build-sys/config-static +++ b/tests/expected/build-sys/config-static @@ -1,26 +1,33 @@ blkid: libblkid libuuid -cfdisk: libblkid libncursesw libtinfo libuuid +cfdisk: libblkid libncursesw libsmartcols libtinfo libuuid eject: libblkid libmount libuuid -fdisk: libblkid libuuid +fdisk: libblkid libsmartcols libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libudev libuuid +findmnt: libblkid libmount libsmartcols libudev libuuid fsck: libblkid libmount libuuid fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid +libsmartcols.so.1.1.0: libuuid.so.1.3.0: -lsblk: libblkid libmount libudev libuuid -lslocks: libblkid libmount libuuid +losetup: libsmartcols +lsblk: libblkid libmount libsmartcols libudev libuuid +lscpu: libsmartcols +lslocks: libblkid libmount libsmartcols libuuid +lslogins: libsmartcols libsystemd-id128 libsystemd-journal mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid -partx: libblkid libuuid +partx: libblkid libsmartcols libuuid +prlimit: libsmartcols +pylibmount.so: libblkid libmount libpython2 libuuid swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid -swapon: libblkid libmount libuuid +swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libuuid +uuidd: libsystemd-daemon libuuid uuidgen: libuuid +wdctl: libsmartcols wipefs: libblkid libuuid addpart: agetty: @@ -29,7 +36,9 @@ blkid.static: STATIC blockdev: cal: libncursesw libtinfo chcpu: +chfn: libpam libpam_misc libpthread libuser chrt: +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -53,14 +62,12 @@ ipcrm: ipcs: isosize: kill: -last: +last: librt ldattach: -logger: +logger: libsystemd-id128 libsystemd-journal login: libpam libpam_misc look: -losetup: losetup.static: STATIC -lscpu: mcookie: mesg: mkfs: @@ -74,7 +81,6 @@ nologin: nsenter: pg: libncursesw libtinfo pivot_root: -prlimit: raw: readprofile: rename: @@ -101,5 +107,4 @@ umount.static: STATIC unshare: utmpdump: wall: -wdctl: whereis: diff --git a/tools/config-gen.d/non-libs.conf b/tools/config-gen.d/non-libs.conf index d2f16d2e2..a73e8ade8 100644 --- a/tools/config-gen.d/non-libs.conf +++ b/tools/config-gen.d/non-libs.conf @@ -2,3 +2,4 @@ include:core.conf include:non-libblkid.conf include:non-libmount.conf include:non-libuuid.conf +include:non-libsmartcols.conf |