static unit files for dbus, cleanup

10 files changed, 30 insertions, 241 deletions

diff --git a/remote/tools/base/list_binaries_and_files b/remote/tools/base/list_binaries_and_files
deleted file mode 100644
index 717b914a..00000000
--- a/remote/tools/base/list_binaries_and_files
+++ /dev/null
@@ -1,73 +0,0 @@
-/bin/bash
-/sbin/agetty
-/bin/cat
-/bin/false
-/usr/bin/loadkeys
-/bin/setfont
-/bin/login
-/sbin/sulogin
-/bin/mount
-/bin/umount
-/bin/rm
-/usr/bin/ldd
-/usr/bin/strace
-/sbin/blkid
-/sbin/modprobe
-/lib/libcap.a
-/lib/libcap.so
-/lib/libcap.so.2
-/lib/libcap.so.2.21
-/lib/i386-linux-gnu/libcidn-2.13.so
-/lib/i386-linux-gnu/libcidn.so.1
-/lib/i386-linux-gnu/libcom_err.so.2
-/lib/i386-linux-gnu/libcom_err.so.2.1
-/lib/i386-linux-gnu/libcrypt-2.13.so
-/lib/i386-linux-gnu/libcrypt.so.1
-/lib/i386-linux-gnu/libcrypto.a
-/lib/i386-linux-gnu/libcrypto.so
-/lib/i386-linux-gnu/libcrypto.so.0.9.8
-/lib/i386-linux-gnu/libcrypto.so.1.0.0
-/lib/i386-linux-gnu/libcrypto.a
-/lib/i386-linux-gnu/libcrypto.so
-/lib/i386-linux-gnu/libcrypto.so.0.9.8
-/lib/i386-linux-gnu/libcrypto.so.1.0.0
-/lib/i386-linux-gnu/libnsl-2.13.so
-/lib/i386-linux-gnu/libnsl.so.1
-/lib/i386-linux-gnu/libnss_compat-2.13.so
-/lib/i386-linux-gnu/libnss_compat.so.2
-/lib/i386-linux-gnu/libnss_dns-2.13.so
-/lib/i386-linux-gnu/libnss_dns.so.2
-/lib/i386-linux-gnu/libnss_files-2.13.so
-/lib/i386-linux-gnu/libnss_files.so.2
-/lib/i386-linux-gnu/libnss_hesiod-2.13.so
-/lib/i386-linux-gnu/libnss_hesiod.so.2
-/lib/i386-linux-gnu/libnss_nis-2.13.so
-/lib/i386-linux-gnu/libnss_nis.so.2
-/lib/i386-linux-gnu/libnss_nisplus-2.13.so
-/lib/i386-linux-gnu/libnss_nisplus.so.2
-/lib/i386-linux-gnu/libnss_nisplus-2.13.so
-/lib/i386-linux-gnu/libnss_nisplus.so.2
-/lib/i386-linux-gnu/libpam.so.0
-/lib/i386-linux-gnu/libpam.so.0.83.0
-/lib/i386-linux-gnu/libpam_misc.so.0
-/lib/i386-linux-gnu/libpam_misc.so.0.82.0
-/lib/i386-linux-gnu/libpamc.so.0
-/lib/i386-linux-gnu/libpamc.so.0.82.1
-/lib/i386-linux-gnu/libutil-2.13.so
-/lib/i386-linux-gnu/libutil.so.1
-/lib/libtinfo.so.5
-/lib/libtinfo.so.5.9
-/etc/pam.d
-/etc/security
-/etc/passwd
-/etc/shadow
-/etc/group
-/etc/hostname
-/etc/environment
-/etc/pam.conf
-/etc/issue
-/etc/localtime
-/etc/login.defs
-/etc/nsswitch.conf
-/etc/securetty
-/etc/default/locale
diff --git a/remote/tools/dbus/data/etc/systemd/system/dbus.service b/remote/tools/dbus/data/etc/systemd/system/dbus.service
new file mode 100644
index 00000000..5e22c812
--- /dev/null
+++ b/remote/tools/dbus/data/etc/systemd/system/dbus.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=D-Bus System Message Bus
+Requires=dbus.socket
+After=syslog.target
+
+[Service]
+ExecStartPre=//bin/dbus-uuidgen --ensure
+ExecStartPre=-/bin/rm -f /var/run/dbus/pid
+ExecStart=//bin/dbus-daemon --system --address=systemd: --nofork --activation=systemd
+ExecReload=//bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
+OOMScoreAdjust=-900
diff --git a/remote/tools/dbus/data/etc/systemd/system/dbus.socket b/remote/tools/dbus/data/etc/systemd/system/dbus.socket
new file mode 100644
index 00000000..0303bfbd
--- /dev/null
+++ b/remote/tools/dbus/data/etc/systemd/system/dbus.socket
@@ -0,0 +1,5 @@
+[Unit]
+Description=D-Bus System Message Bus Socket
+
+[Socket]
+ListenStream=/var/run/dbus/system_bus_socket
diff --git a/remote/tools/dbus/data/etc/systemd/system/dbus.target.wants/dbus.socket b/remote/tools/dbus/data/etc/systemd/system/dbus.target.wants/dbus.socket
new file mode 120000
index 00000000..fe02d162
--- /dev/null
+++ b/remote/tools/dbus/data/etc/systemd/system/dbus.target.wants/dbus.socket
@@ -0,0 +1 @@
+../dbus.socket
\ No newline at end of file
diff --git a/remote/tools/dbus/data/etc/systemd/system/multi-user.target.wants/dbus.service b/remote/tools/dbus/data/etc/systemd/system/multi-user.target.wants/dbus.service
new file mode 120000
index 00000000..224df24b
--- /dev/null
+++ b/remote/tools/dbus/data/etc/systemd/system/multi-user.target.wants/dbus.service
@@ -0,0 +1 @@
+../dbus.service
\ No newline at end of file
diff --git a/remote/tools/dbus/data/etc/systemd/system/sockets.target.wants/dbus.socket b/remote/tools/dbus/data/etc/systemd/system/sockets.target.wants/dbus.socket
new file mode 120000
index 00000000..fe02d162
--- /dev/null
+++ b/remote/tools/dbus/data/etc/systemd/system/sockets.target.wants/dbus.socket
@@ -0,0 +1 @@
+../dbus.socket
\ No newline at end of file
diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build
index 940ba9f6..6c6faaf5 100644
--- a/remote/tools/dbus/dbus.build
+++ b/remote/tools/dbus/dbus.build
@@ -9,38 +9,25 @@ fetch_source() {
 }
 
 build() {
-	BUILDDIR=$TOOL_DIR/$TOOL/build
+	BUILDDIR=${TOOL_DIR}/${TOOL}/build
 
 	COPYLIST="list_dpkg_output"
-	[ -e $COPYLIST ] && rm $COPYLIST
+	[ -e ${COPYLIST} ] && rm ${COPYLIST}
 
 	for FILE in $(dpkg -L dbus | grep -v share/doc | grep -v share/man)
 	do
-        	[ ! -d $FILE ] && echo $FILE >> $COPYLIST
+        	[ ! -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
+	[ ! -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() {
-        :
+        # copy static dbus systemd unit files to stage3.2
+  	SYSTEMDDIR=${INIT_DIR}/etc/systemd/system
+	[ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR}
+	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
+
 }
diff --git a/remote/tools/dbus/dbus.conf b/remote/tools/dbus/dbus.conf
index f18d675f..9847862f 100644
--- a/remote/tools/dbus/dbus.conf
+++ b/remote/tools/dbus/dbus.conf
@@ -4,7 +4,6 @@ REQUIRED_BINARIES="	dbus-cleanup-sockets
 			dbus-monitor
 			dbus-send
 			dbus-daemon-launch-helper"
-REQUIRED_DIRECTORIES="	/etc/dbus-1
-			/usr/lib/systemd/system"
+REQUIRED_DIRECTORIES="	/etc/dbus-1"
 REQUIRED_FILES="	/etc/default/dbus
 			/etc/init/dbus.conf"
diff --git a/remote/tools/dbus/list_dpkg_output b/remote/tools/dbus/list_dpkg_output
deleted file mode 100644
index d451e927..00000000
--- a/remote/tools/dbus/list_dpkg_output
+++ /dev/null
@@ -1,16 +0,0 @@
-/etc/default/dbus
-/etc/init/dbus.conf
-/etc/dbus-1/system.conf
-/etc/dbus-1/session.conf
-/bin/dbus-cleanup-sockets
-/bin/dbus-daemon
-/bin/dbus-uuidgen
-/usr/bin/dbus-monitor
-/usr/bin/dbus-send
-/usr/lib/dbus-1.0/dbus-daemon-launch-helper
-/lib/systemd/system/dbus.socket
-/lib/systemd/system/dbus.service
-/etc/init.d/dbus
-/lib/systemd/system/multi-user.target.wants/dbus.service
-/lib/systemd/system/dbus.target.wants/dbus.socket
-/lib/systemd/system/sockets.target.wants/dbus.socket
diff --git a/remote/tools/udev/list_dpkg_output b/remote/tools/udev/list_dpkg_output
deleted file mode 100644
index 6506c20e..00000000
--- a/remote/tools/udev/list_dpkg_output
+++ /dev/null
@@ -1,127 +0,0 @@
-/etc/udev/udev.conf
-/etc/udev/rules.d/README
-/etc/init/udevtrigger.conf
-/etc/init/udev-finish.conf
-/etc/init/udev.conf
-/etc/init/udev-fallback-graphics.conf
-/etc/init/udevmonitor.conf
-/sbin/udevadm
-/sbin/udevd
-/usr/share/initramfs-tools/scripts/init-bottom/udev
-/usr/share/initramfs-tools/scripts/init-top/udev
-/usr/share/initramfs-tools/scripts/nfs-top/udev
-/usr/share/initramfs-tools/hooks/udev
-/usr/share/pkgconfig/udev.pc
-/usr/share/apport/package-hooks/udev.py
-/lib/udev/mtd_probe
-/lib/udev/cdrom_id
-/lib/udev/input_id
-/lib/udev/udev-acl
-/lib/udev/firmware
-/lib/udev/hotplug.functions
-/lib/udev/scsi_id
-/lib/udev/v4l_id
-/lib/udev/collect
-/lib/udev/usb_id
-/lib/udev/accelerometer
-/lib/udev/rule_generator.functions
-/lib/udev/keymap
-/lib/udev/keymaps/onkyo
-/lib/udev/keymaps/fujitsu-amilo_pro_edition_v3505
-/lib/udev/keymaps/module-lenovo
-/lib/udev/keymaps/toshiba-satellite_a100
-/lib/udev/keymaps/acer-aspire_5920g
-/lib/udev/keymaps/fujitsu-amilo_si_1520
-/lib/udev/keymaps/module-sony-old
-/lib/udev/keymaps/logitech-wave
-/lib/udev/keymaps/fujitsu-amilo_pa_2548
-/lib/udev/keymaps/micro-star
-/lib/udev/keymaps/maxdata-pro_7000
-/lib/udev/keymaps/module-asus-w3j
-/lib/udev/keymaps/everex-xt5000
-/lib/udev/keymaps/asus
-/lib/udev/keymaps/module-ibm
-/lib/udev/keymaps/logitech-wave-cordless
-/lib/udev/keymaps/inventec-symphony_6.0_7.0
-/lib/udev/keymaps/hewlett-packard
-/lib/udev/keymaps/hewlett-packard-presario-2100
-/lib/udev/keymaps/lg-x110
-/lib/udev/keymaps/hewlett-packard-2510p_2530p
-/lib/udev/keymaps/lenovo-thinkpad_x6_tablet
-/lib/udev/keymaps/hewlett-packard-tx2
-/lib/udev/keymaps/module-sony
-/lib/udev/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
-/lib/udev/keymaps/force-release/hp-other
-/lib/udev/keymaps/force-release/common-volume-keys
-/lib/udev/keymaps/force-release/dell-touchpad
-/lib/udev/keymaps/force-release/samsung-other
-/lib/udev/keymaps/module-sony-vgn
-/lib/udev/keymaps/dell-latitude-xt2
-/lib/udev/keymaps/zepto-znote
-/lib/udev/keymaps/acer-aspire_5720
-/lib/udev/keymaps/samsung-sq1us
-/lib/udev/keymaps/hewlett-packard-compaq_elitebook
-/lib/udev/keymaps/fujitsu-amilo_pro_v3205
-/lib/udev/keymaps/acer-aspire_8930
-/lib/udev/keymaps/medion-fid2060
-/lib/udev/keymaps/logitech-wave-pro-cordless
-/lib/udev/keymaps/hewlett-packard-pavilion
-/lib/udev/keymaps/fujitsu-esprimo_mobile_v6
-/lib/udev/keymaps/lenovo-3000
-/lib/udev/keymaps/fujitsu-esprimo_mobile_v5
-/lib/udev/keymaps/acer-travelmate_c300
-/lib/udev/keymaps/samsung-other
-/lib/udev/keymaps/toshiba-satellite_m30x
-/lib/udev/keymaps/acer
-/lib/udev/keymaps/lenovo-ideapad
-/lib/udev/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
-/lib/udev/keymaps/hewlett-packard-tablet
-/lib/udev/keymaps/medionnb-a555
-/lib/udev/keymaps/dell
-/lib/udev/keymaps/compaq-e_evo
-/lib/udev/keymaps/toshiba-satellite_a110
-/lib/udev/keymaps/olpc-xo
-/lib/udev/keymaps/samsung-sx20s
-/lib/udev/keymaps/acer-aspire_6920
-/lib/udev/keymaps/oqo-model2
-/lib/udev/keymaps/lenovo-thinkpad_x200_tablet
-/lib/udev/findkeyboards
-/lib/udev/pci-db
-/lib/udev/usb-db
-/lib/udev/path_id
-/lib/udev/write_cd_rules
-/lib/udev/write_net_rules
-/lib/udev/rules.d/40-ppc.rules
-/lib/udev/rules.d/61-accelerometer.rules
-/lib/udev/rules.d/75-probe_mtd.rules
-/lib/udev/rules.d/75-persistent-net-generator.rules
-/lib/udev/rules.d/README
-/lib/udev/rules.d/95-udev-late.rules
-/lib/udev/rules.d/80-drivers.rules
-/lib/udev/rules.d/60-persistent-input.rules
-/lib/udev/rules.d/75-net-description.rules
-/lib/udev/rules.d/60-persistent-alsa.rules
-/lib/udev/rules.d/95-keyboard-force-release.rules
-/lib/udev/rules.d/70-udev-acl.rules
-/lib/udev/rules.d/40-ia64.rules
-/lib/udev/rules.d/50-firmware.rules
-/lib/udev/rules.d/75-tty-description.rules
-/lib/udev/rules.d/50-udev-default.rules
-/lib/udev/rules.d/60-cdrom_id.rules
-/lib/udev/rules.d/95-keymap.rules
-/lib/udev/rules.d/60-persistent-storage.rules
-/lib/udev/rules.d/60-persistent-storage-tape.rules
-/lib/udev/rules.d/60-persistent-serial.rules
-/lib/udev/rules.d/75-cd-aliases-generator.rules
-/lib/udev/rules.d/78-graphics-card.rules
-/lib/udev/rules.d/60-persistent-v4l.rules
-/lib/udev/rules.d/42-qemu-usb.rules
-/lib/udev/rules.d/78-sound-card.rules
-/lib/udev/keyboard-force-release.sh
-/lib/udev/ata_id
-/etc/init.d/udev
-/etc/init.d/udevmonitor
-/etc/init.d/udev-finish
-/etc/init.d/udev-fallback-graphics
-/etc/init.d/udevtrigger
-/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck