summaryrefslogtreecommitdiffstats
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:35 +0100
commitb7e3f3ff4ba25f9196fa13c8cfa1d89080bf7e71 (patch)
tree5d51208ab42fae72bba456045747646e1372756d
parentea8dfcf2d1739f1f539b6201ec42cfa91877ec04 (diff)
downloadpoky-b7e3f3ff4ba25f9196fa13c8cfa1d89080bf7e71.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 (From OE-Core rev: d633633f3d83467fe1f946c57e2e75e0e774ec7e) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() {
23 s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', 23 s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
24} 24}
25 25
26inherit ptest 26inherit ptest update-alternatives
27
28ALTERNATIVE_PRIORITY = "100"
29ALTERNATIVE_${PN} = "setfattr"
30ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr"
27 31
28do_install_ptest() { 32do_install_ptest() {
29 tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) 33 tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )