From 8c7acc6932c9cbe2c73e7c3a3c4c11b0469e5c0a Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sat, 8 Feb 2020 22:14:02 +0200
Subject: [PATCH] e2fsprogs: Remove util-linux dependency

---
 core/e2fsprogs/build   | 21 ++++++++++++++-------
 core/e2fsprogs/depends |  1 -
 core/e2fsprogs/version |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/core/e2fsprogs/build b/core/e2fsprogs/build
index a01968a7..1072359c 100755
--- a/core/e2fsprogs/build
+++ b/core/e2fsprogs/build
@@ -1,19 +1,26 @@
 #!/bin/sh -e
 
+export LDFLAGS="$LDFLAGS -static"
+
 ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --enable-symlink-install \
+    --enable-libuuid \
+    --enable-libblkid \
     --disable-uuidd \
-    --disable-libuuid \
-    --disable-libblkid \
-    --disable-elf-shlibs \
-    --disable-fsck
+    --disable-fsck \
+    --disable-elf-shlibs
 
 # MKDIR_P fixes an install issue on musl/busybox.
 make
-make MKDIR_P="install -d" DESTDIR="$1" install install-libs
+make MKDIR_P="install -d" DESTDIR="$1" install-progs-recursive
 
-# Make static libraries writable.
-chmod -v u+w "$1/usr/lib/"*.a
+# Remove utilities which conflict with util-linux.
+rm -f "$1/usr/bin/blkid" \
+      "$1/usr/bin/uuidgen" \
+      "$1/usr/bin/findfs" \
+      "$1/usr/share/man/man8/findfs.8" \
+      "$1/usr/share/man/man8/blkid.8" \
+      "$1/usr/share/man/man1/uuidgen.1"
diff --git a/core/e2fsprogs/depends b/core/e2fsprogs/depends
index 55c8f231..a53eaaed 100644
--- a/core/e2fsprogs/depends
+++ b/core/e2fsprogs/depends
@@ -1,3 +1,2 @@
 linux-headers make
 pkgconf       make
-util-linux
diff --git a/core/e2fsprogs/version b/core/e2fsprogs/version
index cccc2a66..53db64e8 100644
--- a/core/e2fsprogs/version
+++ b/core/e2fsprogs/version
@@ -1 +1 @@
-1.45.5 1
+1.45.5 2