From 4e191ff58a2e5a1d530d771aa56326891a08c245 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 26 Mar 2026 13:44:24 +0100 Subject: [PATCH] Revert "mca-tool/trustfence-tool: don't install files in /sbin when usrmerge is enabled" This partially reverts commit f6d91b9022e86eb1941a9f5a79d32d3a9b1a001a. 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 --- meta-digi-arm/recipes-digi/mca/mca-tool_1.26.bb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.26.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.26.bb index 96586f313..0b620d630 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.26.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.26.bb @@ -20,16 +20,6 @@ S = "${WORKDIR}/${PKGNAME}-${PV}" 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" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x|ccmp1|ccimx95)"