From bd7101d3ff3bcc83892789c30368b83174723bca Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 21 Mar 2013 22:35:11 +0100 Subject: tests: update build tests * remove ld-linux-* from output * findmnt linked with libudev * lslocks linked with libmount * uuidd linked with librt * static binaries are no more enabled by default * chfn/chsh linked with libuser * add nsenter, runuser, setpriv Signed-off-by: Karel Zak --- tests/expected/build-sys/config-all | 29 ++++++++---------- tests/expected/build-sys/config-all-non-nls | 29 ++++++++---------- tests/expected/build-sys/config-audit | 17 ++++++----- tests/expected/build-sys/config-core | 17 ++++++----- tests/expected/build-sys/config-devel | 45 +++++++++++++--------------- tests/expected/build-sys/config-non-libblkid | 10 ++++--- tests/expected/build-sys/config-non-libmount | 12 ++++---- tests/expected/build-sys/config-non-libs | 7 +++-- tests/expected/build-sys/config-non-libuuid | 14 +++++---- tests/expected/build-sys/config-non-nls | 17 ++++++----- tests/expected/build-sys/config-old-mount | 17 ++++++----- tests/expected/build-sys/config-selinux | 33 ++++++++++---------- tests/expected/build-sys/config-slang | 17 ++++++----- tests/expected/build-sys/config-static | 17 ++++++----- tests/ts/build-sys/config | 2 +- 15 files changed, 151 insertions(+), 132 deletions(-) diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all index e5888dd70..36757775a 100644 --- a/tests/expected/build-sys/config-all +++ b/tests/expected/build-sys/config-all @@ -1,14 +1,15 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid eject: libblkid libmount libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libuuid +findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: lsblk: libblkid libmount libudev libuuid +lslocks: libblkid libmount libuuid mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -17,19 +18,18 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libuuid umount: libblkid libmount libuuid -uuidd: libuuid +uuidd: librt libuuid uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: -arch: -blkid.static: STATIC +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: -chfn: libpam libpam_misc +chfn: libpam libpam_misc libpthread libuser chrt: -chsh: libpam libpam_misc +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -41,7 +41,6 @@ dmesg: elvtune: fallocate: fdformat: -fdisk.static: STATIC flock: fsck.cramfs: libz fsck.minix: @@ -63,9 +62,7 @@ logger: login: libpam libpam_misc look: losetup: -losetup.static: STATIC lscpu: -lslocks: mcookie: mesg: mkfs: @@ -73,9 +70,9 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -mount.static: STATIC namei: newgrp: rypt +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -86,13 +83,14 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: -sfdisk.static: STATIC su: libpam libpam_misc sulogin: rypt switch_root: @@ -100,7 +98,6 @@ tailf: taskset: tunelp: ul: libtinfo -umount.static: STATIC unshare: utmpdump: vipw: diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls index e5888dd70..36757775a 100644 --- a/tests/expected/build-sys/config-all-non-nls +++ b/tests/expected/build-sys/config-all-non-nls @@ -1,14 +1,15 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid eject: libblkid libmount libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libuuid +findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: lsblk: libblkid libmount libudev libuuid +lslocks: libblkid libmount libuuid mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -17,19 +18,18 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libuuid umount: libblkid libmount libuuid -uuidd: libuuid +uuidd: librt libuuid uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: -arch: -blkid.static: STATIC +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: -chfn: libpam libpam_misc +chfn: libpam libpam_misc libpthread libuser chrt: -chsh: libpam libpam_misc +chsh: libpam libpam_misc libpthread libuser col: colcrt: colrm: @@ -41,7 +41,6 @@ dmesg: elvtune: fallocate: fdformat: -fdisk.static: STATIC flock: fsck.cramfs: libz fsck.minix: @@ -63,9 +62,7 @@ logger: login: libpam libpam_misc look: losetup: -losetup.static: STATIC lscpu: -lslocks: mcookie: mesg: mkfs: @@ -73,9 +70,9 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -mount.static: STATIC namei: newgrp: rypt +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -86,13 +83,14 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: -sfdisk.static: STATIC su: libpam libpam_misc sulogin: rypt switch_root: @@ -100,7 +98,6 @@ tailf: taskset: tunelp: ul: libtinfo -umount.static: STATIC unshare: utmpdump: vipw: diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit index 8c9bfa5b4..d09539200 100644 --- a/tests/expected/build-sys/config-audit +++ b/tests/expected/build-sys/config-audit @@ -1,14 +1,15 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid eject: libblkid libmount libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libuuid +findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: lsblk: libblkid libmount libudev libuuid +lslocks: libblkid libmount libuuid mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -22,6 +23,7 @@ uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: @@ -56,7 +58,6 @@ login: libaudit libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -64,6 +65,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -74,9 +76,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -85,7 +89,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core index f7da4b901..8ebe0c8ec 100644 --- a/tests/expected/build-sys/config-core +++ b/tests/expected/build-sys/config-core @@ -1,14 +1,15 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid eject: libblkid libmount libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libuuid +findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: lsblk: libblkid libmount libudev libuuid +lslocks: libblkid libmount libuuid mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -22,6 +23,7 @@ uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: @@ -56,7 +58,6 @@ login: libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -64,6 +65,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -74,9 +76,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -85,7 +89,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel index cb7fad3ca..1906af17e 100644 --- a/tests/expected/build-sys/config-devel +++ b/tests/expected/build-sys/config-devel @@ -1,35 +1,35 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid -eject: libblkid libmount libselinux libsepol libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +eject: libblkid libmount libselinux libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libselinux libsepol libuuid -fsck: libblkid libmount libselinux libsepol libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libselinux libsepol libuuid -libuuid.so.1.3.0: ld-linux-x86-64 -lsblk: libblkid libmount libselinux libsepol libudev libuuid +findmnt: libblkid libmount libselinux libudev libuuid +fsck: libblkid libmount libselinux libuuid +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libselinux libuuid +libuuid.so.1.3.0: +lsblk: libblkid libmount libselinux libudev libuuid +lslocks: libblkid libmount libselinux libuuid mkswap: libblkid libselinux libuuid -mount: libblkid libmount libselinux libsepol libuuid -mountpoint: libblkid libmount libselinux libsepol libuuid +mount: libblkid libmount libselinux libuuid +mountpoint: libblkid libmount libselinux libuuid partx: libblkid libuuid swaplabel: libblkid libuuid -swapoff: libblkid libmount libselinux libsepol libuuid -swapon: libblkid libmount libselinux libsepol libuuid -umount: libblkid libmount libselinux libsepol libuuid -uuidd: libuuid +swapoff: libblkid libmount libselinux libuuid +swapon: libblkid libmount libselinux libuuid +umount: libblkid libmount libselinux libuuid +uuidd: librt libuuid uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: -arch: -blkid.static: STATIC +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: -chfn: libpam libpam_misc libselinux +chfn: libpam libpam_misc libpthread libselinux libuser chrt: -chsh: libpam libpam_misc libselinux +chsh: libpam libpam_misc libpthread libselinux libuser col: colcrt: colrm: @@ -41,7 +41,6 @@ dmesg: elvtune: fallocate: fdformat: -fdisk.static: STATIC flock: fsck.cramfs: libz fsck.minix: @@ -63,9 +62,7 @@ logger: login: libaudit libpam libpam_misc libselinux look: losetup: -losetup.static: STATIC lscpu: -lslocks: mcookie: mesg: mkfs: @@ -73,9 +70,9 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -mount.static: STATIC namei: newgrp: rypt +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -86,13 +83,14 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutempter libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: -sfdisk.static: STATIC su: libpam libpam_misc sulogin: libselinux rypt switch_root: @@ -100,7 +98,6 @@ tailf: taskset: tunelp: ul: libtinfo -umount.static: STATIC unshare: utmpdump: vipw: libselinux diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid index beb425423..b1447e1b5 100644 --- a/tests/expected/build-sys/config-non-libblkid +++ b/tests/expected/build-sys/config-non-libblkid @@ -1,8 +1,10 @@ -libuuid.so.1.3.0: ld-linux-x86-64 +fdisk: libuuid +libuuid.so.1.3.0: mkswap: libuuid uuidd: libuuid uuidgen: libuuid agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo cfdisk: libncursesw libtinfo @@ -17,7 +19,6 @@ cytune: dmesg: fallocate: fdformat: -fdisk: ld-linux-x86-64 flock: fsck.cramfs: libz fsck.minix: @@ -38,7 +39,6 @@ login: libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -46,6 +46,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -55,9 +56,11 @@ rename: renice: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -66,7 +69,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount index 72ad726e5..7932d26a6 100644 --- a/tests/expected/build-sys/config-non-libmount +++ b/tests/expected/build-sys/config-non-libmount @@ -1,9 +1,9 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libuuid.so.1.3.0: mkswap: libblkid libuuid partx: libblkid libuuid swaplabel: libblkid libuuid @@ -12,6 +12,7 @@ uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: @@ -46,7 +47,6 @@ login: libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -54,6 +54,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -64,9 +65,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -75,7 +78,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs index 6a9e3c9f8..ed1c3485d 100644 --- a/tests/expected/build-sys/config-non-libs +++ b/tests/expected/build-sys/config-non-libs @@ -1,4 +1,5 @@ agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo cfdisk: libncursesw libtinfo @@ -13,7 +14,6 @@ cytune: dmesg: fallocate: fdformat: -fdisk: ld-linux-x86-64 flock: fsck.cramfs: libz fsck.minix: @@ -34,7 +34,6 @@ login: libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -43,6 +42,7 @@ mkfs.minix: mkswap: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -52,9 +52,11 @@ rename: renice: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -63,7 +65,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid index c8dc870aa..54a7cb826 100644 --- a/tests/expected/build-sys/config-non-libuuid +++ b/tests/expected/build-sys/config-non-libuuid @@ -1,13 +1,13 @@ blkid: libblkid cfdisk: libblkid libncursesw libtinfo eject: libblkid libmount -fdisk: ld-linux-x86-64 libblkid findfs: libblkid -findmnt: libblkid libmount +findmnt: libblkid libmount libudev fsck: libblkid libmount -libblkid.so.1.1.0: ld-linux-x86-64 -libmount.so.1.1.0: ld-linux-x86-64 libblkid +libblkid.so.1.1.0: +libmount.so.1.1.0: libblkid lsblk: libblkid libmount libudev +lslocks: libblkid libmount mkswap: libblkid mount: libblkid libmount mountpoint: libblkid libmount @@ -19,6 +19,7 @@ umount: libblkid libmount wipefs: libblkid addpart: agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: @@ -53,7 +54,6 @@ login: libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -61,6 +61,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -71,9 +72,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -82,7 +85,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls index f7da4b901..8ebe0c8ec 100644 --- a/tests/expected/build-sys/config-non-nls +++ b/tests/expected/build-sys/config-non-nls @@ -1,14 +1,15 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid eject: libblkid libmount libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libuuid +findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: lsblk: libblkid libmount libudev libuuid +lslocks: libblkid libmount libuuid mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -22,6 +23,7 @@ uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: @@ -56,7 +58,6 @@ login: libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -64,6 +65,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -74,9 +76,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -85,7 +89,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-old-mount b/tests/expected/build-sys/config-old-mount index 4a420e3b9..5f8f91d0b 100644 --- a/tests/expected/build-sys/config-old-mount +++ b/tests/expected/build-sys/config-old-mount @@ -1,14 +1,15 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid eject: libblkid libmount libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libuuid +findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: lsblk: libblkid libmount libudev libuuid +lslocks: libblkid libmount libuuid mkswap: libblkid libuuid mount: libblkid libuuid mountpoint: libblkid libmount libuuid @@ -22,6 +23,7 @@ uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: @@ -56,7 +58,6 @@ login: libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -64,6 +65,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -74,9 +76,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -85,7 +89,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux index 2bffdcfae..31ba2dad3 100644 --- a/tests/expected/build-sys/config-selinux +++ b/tests/expected/build-sys/config-selinux @@ -1,27 +1,29 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid -eject: libblkid libmount libselinux libsepol libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +eject: libblkid libmount libselinux libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libselinux libsepol libuuid -fsck: libblkid libmount libselinux libsepol libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libselinux libsepol libuuid -libuuid.so.1.3.0: ld-linux-x86-64 -lsblk: libblkid libmount libselinux libsepol libudev libuuid +findmnt: libblkid libmount libselinux libudev libuuid +fsck: libblkid libmount libselinux libuuid +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libselinux libuuid +libuuid.so.1.3.0: +lsblk: libblkid libmount libselinux libudev libuuid +lslocks: libblkid libmount libselinux libuuid mkswap: libblkid libselinux libuuid -mount: libblkid libmount libselinux libsepol libuuid -mountpoint: libblkid libmount libselinux libsepol libuuid +mount: libblkid libmount libselinux libuuid +mountpoint: libblkid libmount libselinux libuuid partx: libblkid libuuid swaplabel: libblkid libuuid -swapoff: libblkid libmount libselinux libsepol libuuid -swapon: libblkid libmount libselinux libsepol libuuid -umount: libblkid libmount libselinux libsepol libuuid +swapoff: libblkid libmount libselinux libuuid +swapon: libblkid libmount libselinux libuuid +umount: libblkid libmount libselinux libuuid uuidd: libuuid uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: @@ -56,7 +58,6 @@ login: libpam libpam_misc libselinux look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -64,6 +65,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -74,9 +76,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -85,7 +89,6 @@ sulogin: libselinux rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang index f6268c34d..fc6db081d 100644 --- a/tests/expected/build-sys/config-slang +++ b/tests/expected/build-sys/config-slang @@ -1,14 +1,15 @@ blkid: libblkid libuuid cfdisk: libblkid libslang libuuid eject: libblkid libmount libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libuuid +findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: lsblk: libblkid libmount libudev libuuid +lslocks: libblkid libmount libuuid mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -22,6 +23,7 @@ uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: +blkdiscard: blockdev: cal: libncursesw libtinfo chcpu: @@ -56,7 +58,6 @@ login: libpam libpam_misc look: losetup: lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -64,6 +65,7 @@ mkfs.cramfs: libz mkfs.minix: more: libtinfo namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -74,9 +76,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -85,7 +89,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo unshare: utmpdump: diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static index 097d84025..b3fd3372f 100644 --- a/tests/expected/build-sys/config-static +++ b/tests/expected/build-sys/config-static @@ -1,14 +1,15 @@ blkid: libblkid libuuid cfdisk: libblkid libncursesw libtinfo libuuid eject: libblkid libmount libuuid -fdisk: ld-linux-x86-64 libblkid libuuid +fdisk: libblkid libuuid findfs: libblkid libuuid -findmnt: libblkid libmount libuuid +findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid -libblkid.so.1.1.0: ld-linux-x86-64 libuuid -libmount.so.1.1.0: ld-linux-x86-64 libblkid libuuid -libuuid.so.1.3.0: ld-linux-x86-64 +libblkid.so.1.1.0: libuuid +libmount.so.1.1.0: libblkid libuuid +libuuid.so.1.3.0: lsblk: libblkid libmount libudev libuuid +lslocks: libblkid libmount libuuid mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -22,6 +23,7 @@ uuidgen: libuuid wipefs: libblkid libuuid addpart: agetty: +blkdiscard: blkid.static: STATIC blockdev: cal: libncursesw libtinfo @@ -59,7 +61,6 @@ look: losetup: losetup.static: STATIC lscpu: -lslocks: mcookie: mkfs: mkfs.bfs: @@ -68,6 +69,7 @@ mkfs.minix: more: libtinfo mount.static: STATIC namei: +nsenter: pg: libncursesw libtinfo pivot_root: prlimit: @@ -78,9 +80,11 @@ renice: resizepart: rev: rtcwake: +runuser: libpam libpam_misc script: libutil scriptreplay: setarch: +setpriv: ap-ng setsid: setterm: libtinfo sfdisk: @@ -90,7 +94,6 @@ sulogin: rypt switch_root: tailf: taskset: -tunelp: ul: libtinfo umount.static: STATIC unshare: diff --git a/tests/ts/build-sys/config b/tests/ts/build-sys/config index e2c2b00f8..508bdee85 100755 --- a/tests/ts/build-sys/config +++ b/tests/ts/build-sys/config @@ -36,7 +36,7 @@ for conf in $config_gen_dir/config-gen.d/*.conf; do for b in $bins; do libs=$(readelf --dynamic $b 2> /dev/null | \ awk '/NEEDED/ { print $5 }' | \ - sed 's:\[::g; s:\..*::g; s:libc::g' | \ + sed 's:\[::g; s:\..*::g; s:libc::g; s:ld\-.*::g' | \ sort -u | tr '\n' ' ') if [ -n "$libs" ]; then -- cgit v1.2.3-55-g7522