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

3 files changed, 70 insertions, 155 deletions

diff --git a/remote/tools/udev/build.udev b/remote/tools/udev/build.udev
deleted file mode 100644
index 5ae37220..00000000
--- a/remote/tools/udev/build.udev
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-install_dependencies() {
-  echo "No dependencies."
-}
-
-fetch_source() {
-  echo "Extracting from running system..."
-}
-
-build() {
-
-  COPYLIST="filestocopy"
-
-  for FILE in $(dpkg -L udev | 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/udev/udev.build b/remote/tools/udev/udev.build
new file mode 100644
index 00000000..c949d748
--- /dev/null
+++ b/remote/tools/udev/udev.build
@@ -0,0 +1,48 @@
+#!/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 udev | 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/udev/udev.conf b/remote/tools/udev/udev.conf
index 8562fef6..2f8b4286 100644
--- a/remote/tools/udev/udev.conf
+++ b/remote/tools/udev/udev.conf
@@ -1,131 +1,22 @@
-REQUIRED_BINARIES="findkeyboards
-accelerometer
-scsi_id
-v4l_id
-firmware
-udev-acl
-keymap
-ata_id
-mtd_probe
-write_cd_rules
-write_net_rules
-pci-db
-cdrom_id
-usb-db
-collect
-udev
-udevadm
-udevd"
-REQUIRED_FILES="udev.conf
-udevmonitor.conf
-udev-finish.conf
-udev-fallback-graphics.conf
-udevtrigger.conf
-udev.py
-udev
-hewlett-packard-compaq_elitebook
-medion-fid2060
-genius-slimstar-320
-asus
-fujitsu-amilo_pa_2548
-module-asus-w3j
-hewlett-packard
-acer
-hewlett-packard-pavilion
-lenovo-thinkpad_x200_tablet
-module-lenovo
-logitech-wave
-acer-aspire_5920g
-fujitsu-esprimo_mobile_v6
-lenovo-thinkpad-usb-keyboard-trackpoint
-hewlett-packard-2510p_2530p
-module-ibm
-acer-aspire_5720
-compaq-e_evo
-dell-latitude-xt2
-acer-aspire_8930
-dell
-ibm-thinkpad-usb-keyboard-trackpoint
-samsung-other
-zepto-znote
-fujitsu-amilo_li_2732
-samsung-sq1us
-maxdata-pro_7000
-lenovo-thinkpad_x6_tablet
-acer-travelmate_c300
-samsung-sx20s
-medionnb-a555
-everex-xt5000
-logitech-wave-pro-cordless
-hewlett-packard-tx2
-toshiba-satellite_m30x
-fujitsu-amilo_si_1520
-lg-x110
-fujitsu-amilo_pro_v3205
-inventec-symphony_6.0_7.0
-onkyo
-lenovo-3000
-module-sony
-module-sony-vgn
-hewlett-packard-tablet
-module-sony-old
-dell-xps
-hp-other
-common-volume-keys
-dell-touchpad
-samsung-other
-samsung-90x3a
-toshiba-satellite_a110
-olpc-xo
-fujitsu-amilo_pro_edition_v3505
-acer-aspire_6920
-toshiba-satellite_a100
-logitech-wave-cordless
-lenovo-ideapad
-oqo-model2
-micro-star
-fujitsu-esprimo_mobile_v5
-hewlett-packard-presario-2100
-60-persistent-storage.rules
-75-cd-aliases-generator.rules
-75-probe_mtd.rules
-95-keymap.rules
-60-persistent-storage-tape.rules
-75-tty-description.rules
-60-cdrom_id.rules
-60-persistent-v4l.rules
-78-graphics-card.rules
-75-net-description.rules
-61-accelerometer.rules
-50-udev-default.rules
-40-ia64.rules
-60-persistent-serial.rules
-60-persistent-input.rules
-50-firmware.rules
-70-udev-acl.rules
-95-udev-late.rules
-42-qemu-usb.rules
-75-persistent-net-generator.rules
-60-persistent-alsa.rules
-95-keyboard-force-release.rules
-40-ppc.rules
-80-drivers.rules
-78-sound-card.rules
-rule_generator.functions
-hotplug.functions
-keyboard-force-release.sh
-udev-kernel.socket
-udev-trigger.service
-udev.service
-udev-control.socket
-udev-settle.service
-udevtrigger
-udevmonitor
-udev-finish
-udev
-udev-fallback-graphics
-udev-acl.ck
-udev-kernel.socket
-udev-control.socket
-udev-trigger.service
-udev.service"
+REQUIRED_BINARIES="	accelerometer
+			scsi_id
+			v4l_id
+			firmware
+			udev-acl
+			keymap
+			ata_id
+			mtd_probe
+			write_cd_rules
+			write_net_rules
+			pci-db
+			cdrom_id
+			usb-db
+			collect
+			udev
+			udevadm
+			udevd"
+REQUIRED_DIRECTORIES="	/etc/udev
+			/lib/udev
+			/usr/lib/systemd/system"
+REQUIRED_FILES="	/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
+			/lib/udev/findkeyboards"