summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrieder Schrempf <frieder.schrempf@kontron.de>2023-05-23 17:39:55 +0200
committerSteve Sakoman <steve@sakoman.com>2023-07-01 08:37:24 -1000
commit3aaf57f1ceef68c1ec0ca1e725b7b1e8e205f6a5 (patch)
tree046ef5b0285ce3c97ac2338226e590bd9521ab2c
parente35effd45fea4b6db306666fea31c5de6fd6e394 (diff)
downloadpoky-3aaf57f1ceef68c1ec0ca1e725b7b1e8e205f6a5.tar.gz
psmisc: Set ALTERNATIVE for pstree to resolve conflict with busybox
If pstree in busybox is enabled there is a conflict with pstree from psmisc resulting in: do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} (). Deferring to first boot via 'exit 1' is no longer supported. And more detailed in do_rootfs.log: update-alternatives: Error: not linking [...]/rootfs/usr/bin/pstree to /bin/busybox.nosuid since [...]/rootfs/usr/bin/pstree exists and is not a link On order to fix this set ALTERNATIVE:pstree accordingly. (From OE-Core rev: b40a33f0665c7086e806da4f670a3eb25351216c) Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit deb2176df76dcb16c0d90072ad63d308a0ab1158) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-extended/psmisc/psmisc.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 12539dad53..44b82bd325 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -54,3 +54,5 @@ ALTERNATIVE_PRIORITY = "90"
54ALTERNATIVE:killall = "killall" 54ALTERNATIVE:killall = "killall"
55 55
56ALTERNATIVE:fuser = "fuser" 56ALTERNATIVE:fuser = "fuser"
57
58ALTERNATIVE:pstree = "pstree"