From c80a76bb581b96b910f338aef44748be51a86983 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Fri, 21 Jun 2019 09:43:12 +0300
Subject: [PATCH] e2fsprogs: Ensure same build regardless of system.

---
 core/e2fsprogs/build    |  4 ++++
 core/e2fsprogs/manifest | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/core/e2fsprogs/build b/core/e2fsprogs/build
index 47293dc5..e7821d66 100755
--- a/core/e2fsprogs/build
+++ b/core/e2fsprogs/build
@@ -2,8 +2,12 @@
 
 export CFLAGS="$CFLAGS -static"
 
+# Build using private libuuid and libblkid libraries as
+# KISS uses util-linux from busybox.
 ./configure \
     --enable-symlink-install \
+    --enable-libuuid \
+    --enable-libblkid \
     --disable-uuidd \
     --disable-elf-shlibs \
     --disable-fsck \
diff --git a/core/e2fsprogs/manifest b/core/e2fsprogs/manifest
index a1cd8d80..7dfe3fd4 100644
--- a/core/e2fsprogs/manifest
+++ b/core/e2fsprogs/manifest
@@ -46,9 +46,21 @@
 /usr/share/man/man5/ext2.5
 /usr/share/man/man5/e2fsck.conf.5
 /usr/share/man/man5/
+/usr/share/man/man3/uuid_unparse.3
+/usr/share/man/man3/uuid_time.3
+/usr/share/man/man3/uuid_parse.3
+/usr/share/man/man3/uuid_is_null.3
+/usr/share/man/man3/uuid_generate_time.3
+/usr/share/man/man3/uuid_generate_random.3
+/usr/share/man/man3/uuid_generate.3
+/usr/share/man/man3/uuid_copy.3
+/usr/share/man/man3/uuid_compare.3
+/usr/share/man/man3/uuid_clear.3
+/usr/share/man/man3/uuid.3
 /usr/share/man/man3/libblkid.3
 /usr/share/man/man3/com_err.3
 /usr/share/man/man3/
+/usr/share/man/man1/uuidgen.1
 /usr/share/man/man1/mk_cmds.1
 /usr/share/man/man1/lsattr.1
 /usr/share/man/man1/compile_et.1
@@ -65,12 +77,14 @@
 /usr/sbin/e4crypt
 /usr/sbin/e2freefrag
 /usr/sbin/
+/usr/lib/pkgconfig/uuid.pc
 /usr/lib/pkgconfig/ss.pc
 /usr/lib/pkgconfig/ext2fs.pc
 /usr/lib/pkgconfig/e2p.pc
 /usr/lib/pkgconfig/com_err.pc
 /usr/lib/pkgconfig/blkid.pc
 /usr/lib/pkgconfig/
+/usr/lib/libuuid.a
 /usr/lib/libss.a
 /usr/lib/libext2fs.a
 /usr/lib/libe2p.a
@@ -78,6 +92,8 @@
 /usr/lib/libblkid.a
 /usr/lib/e2initrd_helper
 /usr/lib/
+/usr/include/uuid/uuid.h
+/usr/include/uuid/
 /usr/include/ss/ss.h
 /usr/include/ss/ss_err.h
 /usr/include/ss/
@@ -102,6 +118,7 @@
 /usr/include/blkid/blkid.h
 /usr/include/blkid/
 /usr/include/
+/usr/bin/uuidgen
 /usr/bin/mk_cmds
 /usr/bin/lsattr
 /usr/bin/compile_et