reworked setup-tools, generation of base dir structure of stage3.2 with tool named base

3 files changed, 57 insertions, 35 deletions

diff --git a/remote/tools/dbus/build.dbus b/remote/tools/dbus/build.dbus
deleted file mode 100644
index a2ad0f89..00000000
--- a/remote/tools/dbus/build.dbus
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-install_dependencies() {
-  echo "No dependencies."
-}
-
-fetch_source() {
-  echo "Extracting from running system..."
-}
-
-build() {
-
-  COPYLIST="filestocopy"
-
-  for FILE in $(dpkg -L dbus | grep -v share/doc | grep -v share/man)
-  do
-          [ ! -d $FILE ] && echo $FILE >> $COPYLIST
-  done
-
-  # prepare target dir
-  [ ! -d $TOOL_DIR/$TOOL/build ] && mkdir -p $TOOL_DIR/$TOOL/build
-  tar -cpv $(cat $COPYLIST) | tar -xpv -C $TOOL_DIR/$TOOL/build
-}
diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build
new file mode 100644
index 00000000..cd4812cd
--- /dev/null
+++ b/remote/tools/dbus/dbus.build
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+install_dependencies() {
+	echo "No dependencies."
+}
+
+fetch_source() {
+	echo "Extracting from running system..."
+}
+
+build() {
+
+	BUILDDIR=$TOOL_DIR/$TOOL/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
+
+  # prepare target dir & copy there
+  [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
+  tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR
+
+  # fix path: everything in lib/systemd to usr/lib/systemd
+  cd $BUILDDIR
+
+  TARLIST="list_files_to_fix_prefix"
+  [ -f $TARLIST ] && rm $TARLIST
+
+  # find files and symlinks with wrong prefix
+  for FILE in $(find . -type f -o -type l|grep ^./lib/systemd)
+  do
+	echo $FILE >> $TARLIST
+  done
+  # copy found files to usr/*
+  [ ! -d $BUILDDIR/usr ] && mkdir -p $BUILDDIR/usr
+  tar -cpv $(cat $TARLIST|sort -u) | tar -xpv -C $BUILDDIR/usr
+  # delete original location
+  rm -rf ./lib/systemd
+  cd -
+}
+post_copy() {
+        :
+}
diff --git a/remote/tools/dbus/dbus.conf b/remote/tools/dbus/dbus.conf
index 1d3e2916..f18d675f 100644
--- a/remote/tools/dbus/dbus.conf
+++ b/remote/tools/dbus/dbus.conf
@@ -1,12 +1,10 @@
-REQUIRED_BINARIES="dbus-cleanup-sockets
-dbus-daemon
-dbus-uuidgen
-dbus-monitor
-dbus-send"
-REQUIRED_FILES="session.conf
-system.conf
-dbus
-dbus.conf
-dbus.service
-dbus.socket
-dbus-daemon-launch-helper"
+REQUIRED_BINARIES="	dbus-cleanup-sockets
+			dbus-daemon
+			dbus-uuidgen
+			dbus-monitor
+			dbus-send
+			dbus-daemon-launch-helper"
+REQUIRED_DIRECTORIES="	/etc/dbus-1
+			/usr/lib/systemd/system"
+REQUIRED_FILES="	/etc/default/dbus
+			/etc/init/dbus.conf"