From 7b317343a74bb0c31515b28879127972d50d1896 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Mon, 2 Jul 2018 15:28:06 +0200 Subject: util-linux: alternatify fstrim I hit update-alternatives: Error: not linking [...]/rootfs/sbin/fstrim to /bin/busybox.nosuid since [...]/rootfs/sbin/fstrim exists and is not a link The solution seems to be to tell the alternatives system that util-linux can also provide fstrim. Signed-off-by: Rasmus Villemoes Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/util-linux/util-linux.inc') diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 8b633e9ac6..8d8f3962ff 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -75,7 +75,7 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" -FILES_util-linux-fstrim = "${base_sbindir}/fstrim" +FILES_util-linux-fstrim = "${base_sbindir}/fstrim.${BPN}" FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" @@ -245,6 +245,9 @@ ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" ALTERNATIVE_util-linux-fdisk = "fdisk" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" +ALTERNATIVE_util-linux-fstrim = "fstrim" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" + ALTERNATIVE_util-linux-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" -- cgit 1.2.3-korg