[openwrt/openwrt] tools: e2fsprogs: pass --with-crond-dir=no instead of patching
LEDE Commits
lede-commits at lists.infradead.org
Wed Sep 25 10:53:20 PDT 2024
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/da3e1ae35e948ffe75830d837c15f0137c9073a1
commit da3e1ae35e948ffe75830d837c15f0137c9073a1
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Wed Sep 25 13:31:29 2024 +0200
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 <robimarko at gmail.com>
---
tools/e2fsprogs/Makefile | 3 ++-
tools/e2fsprogs/patches/003-no-crond.patch | 11 -----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 2c35adfa8f..8a8a2e181f 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 67ddd4ab0c..0000000000
--- 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
-
More information about the lede-commits
mailing list