From da3e1ae35e948ffe75830d837c15f0137c9073a1 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Wed, 25 Sep 2024 13:31:29 +0200 Subject: [PATCH] tools: e2fsprogs: pass --with-crond-dir=no instead of patching Currently, e2fsprogs is being patched to avoid detecting host crond, but instead of doing that we can simply pass --with-crond-dir=no as an argument and drop the patch. Link: https://github.com/openwrt/openwrt/pull/16500 Signed-off-by: Robert Marko --- tools/e2fsprogs/Makefile | 3 ++- tools/e2fsprogs/patches/003-no-crond.patch | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 tools/e2fsprogs/patches/003-no-crond.patch diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index 2c35adfa8f9..8a8a2e181f3 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -30,7 +30,8 @@ HOST_CONFIGURE_ARGS += \ --disable-tls \ --disable-nls \ --enable-threads=pth \ - --disable-fuse2fs + --disable-fuse2fs \ + --with-crond-dir=no define Host/Prepare $(call Host/Prepare/Default) diff --git a/tools/e2fsprogs/patches/003-no-crond.patch b/tools/e2fsprogs/patches/003-no-crond.patch deleted file mode 100644 index 67ddd4ab0ce..00000000000 --- a/tools/e2fsprogs/patches/003-no-crond.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -15259,7 +15259,7 @@ then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${crond_dir}" >&5 - printf "%s\n" "${crond_dir}" >&6; } -- have_crond="yes" -+ have_crond="no"; with_crond_dir="" - - else $as_nop -