aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-09-10 09:35:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-11 09:05:29 +0100
commitd633633f3d83467fe1f946c57e2e75e0e774ec7e (patch)
tree36e7294f27105ac8b32a93cadebf31a24e345f36
parentbf81b4e5327134e131e3198adad68c74afb5e259 (diff)
downloadopenembedded-core-contrib-d633633f3d83467fe1f946c57e2e75e0e774ec7e.tar.gz
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@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-support/attr/attr.inc6
1 files changed, 5 insertions, 1 deletions
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 - )