summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorFrieder Schrempf <frieder.schrempf@kontron.de>2023-05-23 17:39:55 +0200
committerSteve Sakoman <steve@sakoman.com>2023-06-21 06:50:50 -1000
commitd7781c43dbec05f2734212d68a29eb0cc59db454 (patch)
tree1a2378f60889e0249698b2c575404c40fcfbd68a /meta
parent3d3711394b55247dd45097dabea7ae9cda679859 (diff)
downloadpoky-d7781c43dbec05f2734212d68a29eb0cc59db454.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: 6071ff86edb1105ca470979ff691ba5910d7e2fc) 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>
Diffstat (limited to 'meta')
-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 a429c2ee96..23e98d21be 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -55,3 +55,5 @@ ALTERNATIVE_PRIORITY = "90"
55ALTERNATIVE:killall = "killall" 55ALTERNATIVE:killall = "killall"
56 56
57ALTERNATIVE:fuser = "fuser" 57ALTERNATIVE:fuser = "fuser"
58
59ALTERNATIVE:pstree = "pstree"