From 83dcd2b34cefd5b324b5a4f54be141a858dc5238 Mon Sep 17 00:00:00 2001
From: root
Date: Wed, 27 Feb 2013 22:19:53 +0100
Subject: Generalization:

- Rework install_dependencies: make it a global function, not per tools.build
- Determine packet manager of local system (currently supports apt/dpkg and zypper/rpm)
- Look for packet manager specific tools.conf.$MANAGER first, use tools.conf otherwise
- Added list_package_files which should be used instead of "for $(dpkg -L | grep ...) ... >> ... done"
---
 remote/tools/systemd/systemd.build | 37 +++++++++++--------------------------
 remote/tools/systemd/systemd.conf  |  2 +-
 2 files changed, 12 insertions(+), 27 deletions(-)

(limited to 'remote/tools/systemd')

diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build
index 7d9588c0..1d5a9a87 100644
--- a/remote/tools/systemd/systemd.build
+++ b/remote/tools/systemd/systemd.build
@@ -5,34 +5,19 @@ fetch_source () {
 	touch .fetched_source
 }	
 
-install_dependencies() {
-	# quick fix for missing libkmod repo...
-	#libkmod=$(apt-cache search libkmod-dev)
-	#if [[ -z $libkmod ]];
-	#then
-	#	echo "libkmod cannot be found. Adding ppa:pitti/systemd"
-	#	add-apt-repository --yes ppa:pitti/systemd
-	#	apt-get update --force-yes
-	#fi
-	# install libkmod from source
-	# TODO: Use download_untar
-	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
-	
-	apt-get install -y $DEPS
-}
-
 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
 		cd "src/$VERSION/"
 		pinfo "calling configure"
 		./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
diff --git a/remote/tools/systemd/systemd.conf b/remote/tools/systemd/systemd.conf
index 98cd8ba9..c5e72aeb 100644
--- a/remote/tools/systemd/systemd.conf
+++ b/remote/tools/systemd/systemd.conf
@@ -1,6 +1,6 @@
 VERSION=systemd-197
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
-DEPS="			intltool
+REQUIRED_DEPENDENCIES="	intltool
 			gperf
 			dbus
 			pkg-config
-- 
cgit v1.2.3-55-g7522