[oe-commits] [openembedded-core] 13/19: attr: use u-a for setfattr

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit d633633f3d83467fe1f946c57e2e75e0e774ec7e
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Mon Sep 10 09:35:31 2018 +0000

    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 <Martin.Jansa at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 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 24ef5ad..9fc0f33 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 - )

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.