plymouth usr/ prefix fix, systemd conditional adding of repository, and minor tweaks§

6 files changed, 38 insertions, 12 deletions

diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf
index fb4aebc3..60e6d9c3 100644
--- a/remote/tools/base/base.conf
+++ b/remote/tools/base/base.conf
@@ -40,5 +40,4 @@ REQUIRED_FILES="	/etc/passwd
 			/etc/nsswitch.conf
 			/etc/securetty
 			/etc/default/locale
-			/etc/fstab
-			/etc/mtab"
+			/etc/fstab"
diff --git a/remote/tools/plymouth/plymouth.build b/remote/tools/plymouth/plymouth.build
index 9217be78..9f89f3bd 100644
--- a/remote/tools/plymouth/plymouth.build
+++ b/remote/tools/plymouth/plymouth.build
@@ -18,14 +18,36 @@ fetch_source() {
 
 build() {
   if [ ! -e .built ]; then
+
+    BUILDDIR=$TOOL_DIR/$TOOL/build
+
     cd src/$VERSION
-    ./configure --enable-systemd-integration --prefix=""
+    ./configure --enable-systemd-integration
     make
-	[ ! -d $TOOL_DIR/$TOOL/build/$TARGET_DIR ] && mkdir -p $TOOL_DIR/$TOOL/build/$TARGET_DIR
-	DESTDIR=$TOOL_DIR/$TOOL/build make install
+	[ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
+	DESTDIR=$BUILDDIR make install
     cd -
     touch .built
   fi
+
+  # 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/plymouth/plymouth.conf b/remote/tools/plymouth/plymouth.conf
index 91252be6..4ade02d6 100644
--- a/remote/tools/plymouth/plymouth.conf
+++ b/remote/tools/plymouth/plymouth.conf
@@ -7,7 +7,7 @@ DEPS="			libpng-dev
 			libdrm-dev"
 REQUIRED_BINARIES="	plymouth
 			plymouthd"
-REQUIRED_DIRECTORIES="	/lib/systemd/system
+REQUIRED_DIRECTORIES="	/usr/lib/systemd/system
 			/usr/local/bin
 			/usr/local/etc
 			/usr/local/include
diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build
index 5b361472..922b7fcb 100644
--- a/remote/tools/systemd/systemd.build
+++ b/remote/tools/systemd/systemd.build
@@ -12,9 +12,14 @@ fetch_source () {
 
 install_dependencies() {
 	# quick fix for missing libkmod repo...
-	add-apt-repository --yes ppa:pitti/systemd
-	apt-get update --force-yes
-	apt-get install --force-yes $DEPS
+	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
+	apt-get install -y $DEPS
 }
 
 build () {
diff --git a/remote/tools/udev/udev.build b/remote/tools/udev/udev.build
index c949d748..fe1b74e9 100644
--- a/remote/tools/udev/udev.build
+++ b/remote/tools/udev/udev.build
@@ -38,8 +38,9 @@ build() {
   # 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
+  # delete original location, removing only $TARLIST leave directories
+  # so simply delete everything under ./lib/systemd
+  rm -rf ./lib/systemd 
   cd -
 }
 
diff --git a/remote/tools/udev/udev.conf b/remote/tools/udev/udev.conf
index 2f8b4286..1e7a6cde 100644
--- a/remote/tools/udev/udev.conf
+++ b/remote/tools/udev/udev.conf
@@ -12,7 +12,6 @@ REQUIRED_BINARIES="	accelerometer
 			cdrom_id
 			usb-db
 			collect
-			udev
 			udevadm
 			udevd"
 REQUIRED_DIRECTORIES="	/etc/udev