From b9404f13ca882e381a3c1b0797b761ce7638e273 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 23 May 2013 20:14:53 +0200
Subject: Remove ldap in initial nsswitch conf, will be added after udev
 started up Update to systemd 204 Remove some systemd services that don't make
 sense in our setup Add own sysctl defaults

---
 remote/modules/systemd/systemd.build | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'remote/modules/systemd/systemd.build')

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index fb56f231..48bd68d1 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -1,27 +1,35 @@
 #tool/distro specific functions for fetching, building and installing dependencies
 
 fetch_source () {
-	download_untar "$URL" "src/"
-	download_untar "$LIBKMOD_URL" "src/"
+	download_untar "$REQUIRED_URL" "src/"
+	download_untar "$REQUIRED_LIBKMOD_URL" "src/"
 }	
 
 build () {
 	#build libkmod
-	cd "${MODULE_DIR}/src/$LIBKMOD_VERSION"
+	pinfo "Building libkmod"
+	cd "${MODULE_DIR}/src/$REQUIRED_LIBKMOD_VERSION"
 	./configure || perror "./configure kmod failed."
 	make || perror "kmod make failed."
 	make install || perror "kmod make install failed."
 	cd - &> /dev/null
 
 	#build systemd
-	cd "${MODULE_DIR}/src/$VERSION"
+	pinfo "Building systemd"
+	cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
 	pinfo "calling configure"
-	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
+	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-logind --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python || perror "configure failed."
 	pinfo "calling make"
 	make || perror "make failed."
 	pinfo "calling make install"
 	DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed."
 	cd - &> /dev/null
+	# Delete unneeded services
+	pinfo "Deleting unneeded services"
+	local SERVICE=
+	for SERVICE in $REQUIRED_DISABLED_SERVICES; do
+		find "${MODULE_BUILD_DIR}" -name "$SERVICE" -delete
+	done
 }
 
 post_copy() {
-- 
cgit v1.2.3-55-g7522