Revert "mca-tool/trustfence-tool: don't install files in /sbin when usrmerge is enabled"
This partially reverts commit f6d91b9022. The new
mca-tool v1.26 already installs its binaries to /usr/sbin (instead of /sbin),
so the workaround is no longer needed.
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
parent
f8df964716
commit
4e191ff58a
|
|
@ -20,16 +20,6 @@ S = "${WORKDIR}/${PKGNAME}-${PV}"
|
||||||
|
|
||||||
inherit bin_package
|
inherit bin_package
|
||||||
|
|
||||||
HAS_USRMERGE = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '1', '0', d)}"
|
|
||||||
|
|
||||||
do_install:append() {
|
|
||||||
# Move binaries from /sbin to /usr/sbin to avoid usrmerge QA error.
|
|
||||||
if [ "${HAS_USRMERGE}" = "1" ]; then
|
|
||||||
install -d ${D}${base_sbindir}
|
|
||||||
mv ${D}/sbin/* ${D}${base_sbindir} && rmdir ${D}/sbin
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
INSANE_SKIP:${PN} = "already-stripped"
|
INSANE_SKIP:${PN} = "already-stripped"
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x|ccmp1|ccimx95)"
|
COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x|ccmp1|ccimx95)"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue