From d633633f3d83467fe1f946c57e2e75e0e774ec7e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 10 Sep 2018 09:35:31 +0000 Subject: attr: use u-a for setfattr setfattr is now provided also by busybox since 1.29.2 upgrade and do_rootfs is failing with: update-alternatives: Error: not linking usr/bin/setfattr to /bin/busybox.nosuid since usr/bin/setfattr exists and is not a link Signed-off-by: Martin Jansa Signed-off-by: Ross Burton --- meta/recipes-support/attr/attr.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index 24ef5adfd3..9fc0f33cce 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc @@ -23,7 +23,11 @@ do_install_append() { s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', } -inherit ptest +inherit ptest update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "setfattr" +ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" do_install_ptest() { tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) -- cgit 1.2.3-korg