From 1a4bb6b770376ec43e4768a51cfee9db293f2d5f Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 28 Feb 2013 15:14:33 +0100
Subject: libkmod under src/

---
 remote/tools/systemd/systemd.build | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'remote/tools')

diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build
index 1d5a9a87..5b96666f 100644
--- a/remote/tools/systemd/systemd.build
+++ b/remote/tools/systemd/systemd.build
@@ -1,23 +1,24 @@
 #tool/distro specific functions for fetching, building and installing dependencies
 
 fetch_source () {
-	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
-	touch .fetched_source
+	if [ ! -e .fetched_source ]; then 
+		download_untar "$URL" "src/"
+		local LIBKMOD_VERSION="kmod-12"
+		download_untar "http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz" "src/"
+		touch .fetched_source
+	fi
 }	
 
 build () {
 	if [ ! -e .built ]; then
-		local libkmodversion=kmod-12
-		if [ ! -d $libkmodversion ]; then
-			wget http://www.kernel.org/pub/linux/utils/kernel/kmod/${libkmodversion}.tar.gz
-			tar xf $libkmodversion.tar.gz
-			rm ${libkmodversion}.tar.gz
-			cd $libkmodversion
-			./configure
-			make -j5
-			make install
-			cd -
-		fi
+		#build libkmod
+		cd "src/$LIBKMOD_VERSION/"
+		./configure
+		make -j5
+		make install
+		cd -
+
+		#build systemd
 		cd "src/$VERSION/"
 		pinfo "calling configure"
 		./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
-- 
cgit v1.2.3-55-g7522