From bf3ec32baf41bdbba2bcc7aea28811dbac9dd982 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 19 Nov 2012 14:37:29 +0100
Subject: build script paths fixes

---
 remote/1                             | 28 ----------------------------
 remote/setup-tools.sh                |  9 ++++++---
 remote/tools/plymouth/build.plymouth |  2 +-
 remote/tools/systemd/build.systemd   |  2 +-
 remote/tools/systemd/systemd.conf    | 18 +++++++++++++++++-
 5 files changed, 25 insertions(+), 34 deletions(-)
 delete mode 100644 remote/1

diff --git a/remote/1 b/remote/1
deleted file mode 100644
index 9fd65f79..00000000
--- a/remote/1
+++ /dev/null
@@ -1,28 +0,0 @@
-execve("stage3.2/openslx/bin/busybox", ["stage3.2/openslx/bin/busybox", "2"], [/* 51 vars */]) = 0
-brk(0)                                  = 0x85d0000
-access("/etc/ld.so.nohwcap", F_OK)      = -1 ENOENT (No such file or directory)
-mmap2(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb771a000
-access("/etc/ld.so.preload", R_OK)      = -1 ENOENT (No such file or directory)
-open("/etc/ld.so.cache", O_RDONLY)      = 3
-fstat64(3, {st_mode=S_IFREG|0644, st_size=96487, ...}) = 0
-mmap2(NULL, 96487, PROT_READ, MAP_PRIVATE, 3, 0) = 0xb7702000
-close(3)                                = 0
-access("/etc/ld.so.nohwcap", F_OK)      = -1 ENOENT (No such file or directory)
-open("/lib/i386-linux-gnu/libc.so.6", O_RDONLY) = 3
-read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0p\222\1\0004\0\0\0"..., 512) = 512
-fstat64(3, {st_mode=S_IFREG|0755, st_size=1568968, ...}) = 0
-mmap2(NULL, 1579544, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb7580000
-mmap2(0xb76fc000, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x17c) = 0xb76fc000
-mmap2(0xb76ff000, 10776, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0xb76ff000
-close(3)                                = 0
-mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb757f000
-set_thread_area({entry_number:-1 -> 6, base_addr:0xb757f8d0, limit:1048575, seg_32bit:1, contents:0, read_exec_only:0, limit_in_pages:1, seg_not_present:0, useable:1}) = 0
-mprotect(0xb76fc000, 8192, PROT_READ)   = 0
-mprotect(0x80d2000, 4096, PROT_READ)    = 0
-mprotect(0xb773b000, 4096, PROT_READ)   = 0
-munmap(0xb7702000, 96487)               = 0
-getuid32()                              = 1000
-write(2, "2", 12)                        = 1
-write(2, ": applet not found\n", 19: applet not found
-)    = 19
-exit_group(1)                           = ?
diff --git a/remote/setup-tools.sh b/remote/setup-tools.sh
index e61d8903..cfd2a83e 100755
--- a/remote/setup-tools.sh
+++ b/remote/setup-tools.sh
@@ -79,9 +79,12 @@ copyfileswithdependencies ()
 	done 
 
 	# fast hack
-    LDLINUX=$(ldd $FILE | grep ld-linux | awk '{print $1}' |cut -c2-)
-	echo "/$LDLINUX" >> $COPYFILES_LIST
-	tar -cpv $(readlink -f "/$LDLINUX") | tar -xpv -C $INIT_DIR
+        LDLINUX=$(ldd $FILE | grep ld-linux | awk '{print $1}' |cut -c2-)
+	if [ -z $LDLINUX ] 
+	then 
+		echo "/$LDLINUX" >> $COPYFILES_LIST
+		tar -cpv $(readlink -f "/$LDLINUX") | tar -xpv -C $INIT_DIR
+        fi
 
 	for FILENAME in $REQUIRED_FILES
 	do
diff --git a/remote/tools/plymouth/build.plymouth b/remote/tools/plymouth/build.plymouth
index af459be8..21df7909 100644
--- a/remote/tools/plymouth/build.plymouth
+++ b/remote/tools/plymouth/build.plymouth
@@ -21,7 +21,7 @@ build() {
     cd src/$VERSION
     ./configure --enable-systemd-integration
     make
-	[ ! -d ../build/$TARGET_DIR ] && mkdir -p ../build/$TARGET_DIR
+	[ ! -d $TOOL_DIR/$TOOL/build/$TARGET_DIR ] && mkdir -p $TOOL_DIR/$TOOL/build/$TARGET_DIR
 	DESTDIR=$TOOL_DIR/$TOOL/build make install
     cd -
     touch .built
diff --git a/remote/tools/systemd/build.systemd b/remote/tools/systemd/build.systemd
index 40c76327..af57f8da 100644
--- a/remote/tools/systemd/build.systemd
+++ b/remote/tools/systemd/build.systemd
@@ -14,7 +14,7 @@ fetch_source ()
 install_dependencies()
 {
 	# quick fix for missing libkmod repo...
-	add-apt-repository --yes ppa:pitti/systemd
+	add-apt-repository --force-yes ppa:pitti/systemd
 	apt-get update --force-yes
 	apt-get install --force-yes $DEPS
 }
diff --git a/remote/tools/systemd/systemd.conf b/remote/tools/systemd/systemd.conf
index 187da182..0bcd18eb 100644
--- a/remote/tools/systemd/systemd.conf
+++ b/remote/tools/systemd/systemd.conf
@@ -249,4 +249,20 @@ org.freedesktop.locale1.policy
 org.freedesktop.login1.policy
 org.freedesktop.systemd1.policy
 org.freedesktop.timedate1.policy
-kbd-model-map"
+kbd-model-map
+libsystemd-daemon.la
+libsystemd-daemon.so
+libsystemd-daemon.so.0
+libsystemd-daemon.so.0.0.1
+libsystemd-id128.la
+libsystemd-id128.so
+libsystemd-id128.so.0
+libsystemd-id128.so.0.0.2
+libsystemd-journal.la
+libsystemd-journal.so
+libsystemd-journal.so.0
+libsystemd-journal.so.0.0.2
+libsystemd-login.la
+libsystemd-login.so
+libsystemd-login.so.0
+libsystemd-login.so.0.2.0"
-- 
cgit v1.2.3-55-g7522