From 45f0ff8b19b54f2ea0254e2cab55f5e871dcb20b Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Date: Tue, 2 Jun 2015 15:40:16 +0100
Subject: [PATCH] Clear linux use system binaries, instead of compiling
 systemd.

---
 stage1/rootfs/usr_from_src/Makefile | 84 ++---------------------------
 1 file changed, 5 insertions(+), 79 deletions(-)

diff --git a/stage1/rootfs/usr_from_src/Makefile b/stage1/rootfs/usr_from_src/Makefile
index a65ade9..fd0f332 100644
--- a/stage1/rootfs/usr_from_src/Makefile
+++ b/stage1/rootfs/usr_from_src/Makefile
@@ -17,7 +17,7 @@ install: Makefile host_deps.txt
 
 # discover host library dependencies for all the ELF executables in systemd_build/installed, note the LD_LIBRARY_PATH= to find systemd-produced libraries.
 host_deps.txt: Makefile systemd.done bash.done
-	cd systemd_build/installed && find -type f | xargs file  | grep ELF | cut -f1 -d: | LD_LIBRARY_PATH=usr/lib xargs ldd | grep -v ^\\. | grep '/' | sed  -e 's/^[[:space:]]*//' -e 's/.*=> //' -e 's/ (0x[0-9a-f]*)$$//' | grep -v ^[^/] | sort -u > ../../host_deps.txt.tmp
+	cd systemd_build/installed && find -type f | xargs file  | grep ELF | cut -f1 -d: | LD_LIBRARY_PATH=/usr/lib64 xargs ldd | grep -v ^\\. | grep '/' | sed  -e 's/^[[:space:]]*//' -e 's/.*=> //' -e 's/ (0x[0-9a-f]*)$$//' | grep -v ^[^/] | sort -u > ../../host_deps.txt.tmp
 	mv host_deps.txt.tmp host_deps.txt
 
 # grab bash from the host
@@ -26,92 +26,18 @@ bash.done: Makefile systemd.done
 	touch bash.done
 
 # configure, build, and install systemd
-systemd.done: Makefile systemd.src
+systemd.done: Makefile
 	{ [ ! -e systemd_build ] || rm -Rf systemd_build; }
-	mkdir systemd_build
-	cd systemd_build && ../systemd/configure \
-		--disable-python-devel \
-		--disable-dbus \
-		--disable-kmod \
-		--disable-blkid \
-		--disable-chkconfig \
-		--disable-selinux \
-		--disable-pam \
-		--disable-acl \
-		--disable-smack \
-		--disable-gcrypt \
-		--disable-elfutils \
-		--disable-libcryptsetup \
-		--disable-qrencode \
-		--disable-microhttpd \
-		--disable-gnutls \
-		--disable-binfmt \
-		--disable-vconsole \
-		--disable-bootchart \
-		--disable-quotacheck \
-		--disable-tmpfiles \
-		--disable-sysusers \
-		--disable-randomseed \
-		--disable-backlight \
-		--disable-rfkill \
-		--disable-logind \
-		--disable-machined \
-		--disable-timedated \
-		--disable-timesyncd \
-		--disable-localed \
-		--disable-coredump \
-		--disable-polkit \
-		--disable-resolved \
-		--disable-networkd \
-		--disable-efi \
-		--disable-myhostname \
-		--disable-gudev \
-		--disable-manpages \
-		--disable-tests \
-		--disable-blkid \
-		--disable-hibernate \
-		--disable-terminal \
-		--disable-hwdb \
-		--disable-importd \
-		&& $(MAKE) && DESTDIR=$${PWD}/installed make install-strip
+	mkdir -p systemd_build/installed
+	rpm -ql clr-systemd-config-config clr-systemd-config-data systemd glibc-utils nss-altfiles-lib systemd-libs linux-container-lkvm linux-container util-linux-bin | tar -cf - -T - | tar -xf - -C systemd_build/installed
 	touch systemd.done
 
-# TODO(vc): it may make more sense to have the systemd source be a git submodule?
-systemd.src: Makefile patches/*
-	if [ -z "$(RKT_STAGE1_SYSTEMD_SRC)" ]; then echo "Error: RKT_STAGE1_SYSTEMD_SRC undefined"; exit 1; fi
-	if [ -z "$(RKT_STAGE1_SYSTEMD_VER)" ]; then echo "Error: RKT_STAGE1_SYSTEMD_VER undefined"; exit 1; fi
-	{ [ ! -e systemd ] || rm -Rf systemd; }
-	mkdir systemd
-	if [ "$(RKT_STAGE1_SYSTEMD_VER)" = "HEAD" ]; then \
-		git clone --depth 1 $(RKT_STAGE1_SYSTEMD_SRC) ; \
-		PATCHES_DIR=patches/master ; \
-	else \
-		git clone --branch $(RKT_STAGE1_SYSTEMD_VER) --depth 1 $(RKT_STAGE1_SYSTEMD_SRC) ; \
-		PATCHES_DIR=patches/$(RKT_STAGE1_SYSTEMD_VER) ; \
-	fi ; \
-	if [ -d $$PATCHES_DIR ]; then \
-		set -e ; \
-		cd systemd ; \
-		shopt -s nullglob ; \
-		for p in ../$$PATCHES_DIR/*.patch ; \
-		do \
-			if patch -p1 <"$$p" ; \
-			then \
-				: ; \
-			else \
-				exit 1 ; \
-			fi ; \
-		done ; \
-	fi
-	cd systemd && ./autogen.sh
-	touch systemd.src
-
 .PHONY: clean distclean
 clean:
 	rm -Rf systemd_build systemd.done bash.done host_deps.txt rootfs usr.done install
 
 distclean: clean
-	rm -Rf systemd systemd.src
+	rm -Rf systemd
 
 test:
 	echo TODO