From 0d020d630e61841600265489bfb8272aad14fce9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 6 Aug 2016 16:15:34 +0100
Subject: [PATCH] Cross-compile util-linux into stage3 chroot.

---
 .gitignore |  1 +
 Makefile   | 38 ++++++++++++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c45d10a..8b01137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ stamp-*
 /mpfr-3.1.4/
 /ncurses-6.0-20160730/
 /riscv-gcc-riscv-gcc-6.1.0/
+/util-linux-2.28/
diff --git a/Makefile b/Makefile
index ba07225..787a820 100644
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,13 @@ STAGE3_PACKAGES = gcc rpm-build
 
 # Versions of cross-compiled packages.
 NCURSES_VERSION    = 6.0-20160730
-BASH_VERSION      = 4.3
-COREUTILS_VERSION = 8.25
-GMP_VERSION       = 6.1.1
-MPFR_VERSION      = 3.1.4
-MPC_VERSION       = 1.0.3
-GCC_X_VERSION     = 6.1.0
+BASH_VERSION       = 4.3
+COREUTILS_VERSION  = 8.25
+GMP_VERSION        = 6.1.1
+MPFR_VERSION       = 3.1.4
+MPC_VERSION        = 1.0.3
+GCC_X_VERSION      = 6.1.0
+UTIL_LINUX_VERSION = 2.28
 
 all: stage1 stage2 stage3 stage4
 
@@ -252,6 +253,7 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \
 	stage3-chroot/usr/lib64/libmpfr.so.4 \
 	stage3-chroot/usr/lib64/libmpc.so.3 \
 	stage3-chroot/usr/bin/gcc \
+	stage3-chroot/usr/bin/mount \
 	stage3-chroot/init \
 	stage3-disk.img
 
@@ -443,6 +445,30 @@ gcc-$(GCC_X_VERSION).tar.gz:
 	wget -O $@-t https://github.com/riscv/riscv-gcc/archive/riscv-gcc-$(GCC_X_VERSION).tar.gz
 	mv $@-t $@
 
+# Cross-compile util-linux.
+# XXX Be nice to fix ncurses/tinfo support which in theory should work.
+stage3-chroot/usr/bin/mount: util-linux-$(UTIL_LINUX_VERSION).tar.xz
+	rm -rf util-linux-$(UTIL_LINUX_VERSION)
+	tar -Jxf $^
+	cd util-linux-$(UTIL_LINUX_VERSION) && \
+	PATH=$(ROOT)/fixed-gcc:$$PATH \
+	./configure \
+	    --host=riscv64-unknown-linux-gnu \
+	    --prefix=/usr --libdir=/usr/lib64 \
+	    --without-python \
+	    --without-tinfo \
+	    --without-ncurses \
+	    --without-systemd \
+	    --disable-makeinstall-chown
+	cd util-linux-$(UTIL_LINUX_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+#	libtool fucks something up here, ignore the failure and continue.
+	-cd util-linux-$(UTIL_LINUX_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot -j1 -k V=1
+
+util-linux-$(UTIL_LINUX_VERSION).tar.xz:
+	rm -f $@ $@-t
+	wget -O $@-t ftp://ftp.kernel.org/pub/linux/utils/util-linux/v$(UTIL_LINUX_VERSION)/util-linux-$(UTIL_LINUX_VERSION).tar.xz
+	mv $@-t $@
+
 # Create an /init script.
 stage3-chroot/init: init.sh
 	install -m 0755 $^ $@
-- 
1.8.3.1