Commit Graph

5 Commits

Author SHA1 Message Date
Khem Raj
e81bef685f util-linux: Disable chfn-chsh on non-target builds
They are also provided by shadow-native e.g. when building native
recipes and packages where they depend on both shadow-native and
util-linux-native, this can conflict

Enable it only when pam is enabled in distro

Fixes
ERROR: systemd-1_248.3-r0 do_prepare_recipe_sysroot: The file /usr/bin/chsh is installed by both util-linux-native and shadow-native, aborting

(From OE-Core rev: 336625fe433100fb57ea0dda4d9ff5fcb835dc95)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-07-10 22:42:22 +01:00
Ross Burton
493d1abff7 util-linux: rewrite the ptest integration
Instead of duplicating logic, we can use the run.sh that the test suite
installs.

Unless told otherwise, the util-linux test suite assumes that it is
running in a build tree and looks for binaries to run, but we're on
target so pass --use-system-commands (drops ~180 skips to tens).

Add --show-diff so that debugging can be done from the logs alone.

Remove redundant path manipulation that is now done upstream.

If PAM is disabled, delete the chfn test: it will run the chfn from
shadow which has different output, and the test will fail.

[ YOCTO #14244 ]

(From OE-Core rev: 720660b936b5523ec48a7c04712d10c88198e12c)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-07-07 11:39:42 +01:00
Ross Burton
ebaf733a70 util-linux: add missing ptest dependencies
The kernel modules loop and sd-mod are needed for the block device tests.

GNU find is used in some tests.

(From OE-Core rev: 9350c391f11bf7587fe46a54c93dc6e4bf3b51db)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-07-07 11:39:42 +01:00
Ross Burton
31d2e2ef9f util-linux: build chfn and chsh
As we now split util-linux per-binary there's no disadvantage to not
building chfn and chsh.

This also means that the tests pass instead of failing when the test
uses the binaries from shadow.

(From OE-Core rev: 804c6b5bd3d398d5ea2a45d6bcc23c76e328ea3f)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-07-07 11:39:42 +01:00
Alexander Kanavin
6091f104bb util-linux: update 2.36.2 -> 2.37
Drop manpages support, as it requires asciidoctor
(written in ruby, isn't in oe-core).

(From OE-Core rev: 6cb58dd4feae12a064fad3ab30b1d44e159fe7e2)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-06-17 00:07:05 +01:00