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"

3 files changed, 12 insertions, 10 deletions

diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build
index 83cc8efa..e0e03943 100644
--- a/remote/tools/dbus/dbus.build
+++ b/remote/tools/dbus/dbus.build
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-install_dependencies() {
-	echo "No dependencies."
-}
-
 fetch_source() {
 	echo "Extracting from running system..."
 }
@@ -14,10 +10,7 @@ build() {
 	COPYLIST="list_dpkg_output"
 	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 
-	for FILE in $(dpkg -L dbus | grep -v share/doc | grep -v share/man)
-	do
-        	[ ! -d "${FILE}" ] && echo ${FILE} >> "${COPYLIST}"
-	done
+        list_packet_files >> "${COPYLIST}"
 
 	# prepare target dir & copy there
 	[ ! -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR}
diff --git a/remote/tools/dbus/dbus.conf b/remote/tools/dbus/dbus.conf
index 9847862f..a8c97d9c 100644
--- a/remote/tools/dbus/dbus.conf
+++ b/remote/tools/dbus/dbus.conf
@@ -1,3 +1,4 @@
+REQUIRED_PACKAGES="dbus"
 REQUIRED_BINARIES="	dbus-cleanup-sockets
 			dbus-daemon
 			dbus-uuidgen
@@ -5,5 +6,4 @@ REQUIRED_BINARIES="	dbus-cleanup-sockets
 			dbus-send
 			dbus-daemon-launch-helper"
 REQUIRED_DIRECTORIES="	/etc/dbus-1"
-REQUIRED_FILES="	/etc/default/dbus
-			/etc/init/dbus.conf"
+REQUIRED_FILES="	/etc/default/dbus"
diff --git a/remote/tools/dbus/dbus.conf.zypper b/remote/tools/dbus/dbus.conf.zypper
new file mode 100644
index 00000000..db7183c5
--- /dev/null
+++ b/remote/tools/dbus/dbus.conf.zypper
@@ -0,0 +1,9 @@
+REQUIRED_PACKAGES="dbus-1"
+REQUIRED_BINARIES="	dbus-cleanup-sockets
+			dbus-daemon
+			dbus-uuidgen
+			dbus-monitor
+			dbus-send
+			dbus-daemon-launch-helper"
+REQUIRED_DIRECTORIES="	/etc/dbus-1"
+REQUIRED_FILES=""