From 4ab51e780c7a0dd2e33b1f9e92559cdb6448e32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 20 Feb 2025 14:16:56 +0100 Subject: [PATCH] Remove unnecessary and invalid e2scrub removal from post-build (#3886) Removal of the e2scrub binary is not needed anymore, as it's not installed and only BR2_PACKAGE_E2FSPROGS_E2IMAGE is enabled. Moreover, it's been probably wrong since the very beginning, as the TARGET_DIR prefix was missing, possibly leading to removal of the binary from the host/builder. --- buildroot-external/scripts/rootfs-layer.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh index 3f91a7103..d88065ab2 100755 --- a/buildroot-external/scripts/rootfs-layer.sh +++ b/buildroot-external/scripts/rootfs-layer.sh @@ -1,7 +1,6 @@ #!/bin/bash function fix_rootfs() { - # Cleanup etc rm -rf "${TARGET_DIR:?}/etc/init.d" rm -rf "${TARGET_DIR:?}/etc/network" @@ -27,10 +26,6 @@ function fix_rootfs() { # Use systemd-resolved for Host OS resolve sed -i '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' "${TARGET_DIR}/etc/nsswitch.conf" - - # Remove e2scrub (LVM specific tools provided by e2fsprogs) - rm -f "/usr/lib/systemd/system/e2scrub*" - rm -f "/usr/sbin/e2scrub*" "/usr/lib/e2fsprogs/e2scrub*" }