From bd48ca1245d02fcb83a39d9b44cbbcbcc0831d2c Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Tue, 25 Jun 2024 19:43:30 +0200 Subject: [PATCH] tools: e2fsprogs: use libuuid provided by util-linux We are now using util-linux to provide libuuid so disable building it in e2fsprogs and simply use the util-linux provided one. Disabling libuuid removes the need for custom install recipe. Link: https://github.com/openwrt/openwrt/pull/15806 Signed-off-by: Robert Marko --- tools/Makefile | 2 +- tools/e2fsprogs/Makefile | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 4019f3ba5f..df6cb64e52 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -96,7 +96,7 @@ $(curdir)/bison/compile := $(curdir)/flex/compile $(curdir)/cbootimage/compile += $(curdir)/automake/compile $(curdir)/cmake/compile += $(curdir)/libressl/compile $(curdir)/ninja/compile $(curdir)/expat/compile $(curdir)/xz/compile $(curdir)/zlib/compile $(curdir)/zstd/compile $(curdir)/dosfstools/compile := $(curdir)/automake/compile -$(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile +$(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile $(curdir)/util-linux/compile $(curdir)/elfutils/compile := $(curdir)/m4/compile $(curdir)/zlib/compile $(curdir)/gnulib/compile $(curdir)/libtool/compile $(curdir)/fakeroot/compile := $(curdir)/libtool/compile $(curdir)/findutils/compile := $(curdir)/bison/compile diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index 567e6a4c9a..c4895add12 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -27,7 +27,7 @@ HOST_CFLAGS += $(HOST_FPIC) HOST_CONFIGURE_ARGS += \ --disable-elf-shlibs \ - --enable-libuuid \ + --disable-libuuid \ --disable-tls \ --disable-nls \ --enable-threads=pth \ @@ -38,15 +38,6 @@ define Host/Prepare rm -rf $(HOST_BUILD_DIR)/doc endef -define Host/Install - $(Host/Install/Default) - $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install - mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs - $(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/ - rm -rf $(STAGING_DIR_HOST)/include/uuid - $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/ -endef - define Host/Clean rm -f $(STAGING_DIR_HOST)/bin/e2fsck rm -f $(STAGING_DIR_HOST)/bin/tune2fs