From da0084106fbd7a11fb0156bc673947a4f482b2d2 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 19 Mar 2013 15:02:52 +0100
Subject: copy_static_files function now called on each module

---
 remote/modules/systemd/systemd.build | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'remote/modules/systemd')

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 450e743b..bb58fc1c 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -32,9 +32,6 @@ build () {
 }
 
 post_copy() {
-	# copy static data files
-	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "copying data files failed."
-		
 	# dont clear systemd log at startup
 	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
 
-- 
cgit v1.2.3-55-g7522


From 2668c259b71369bd39ac222894c15363d6668c40 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 19 Mar 2013 16:00:42 +0100
Subject: use all cores by make through MAKEFLAGS

---
 helper/system.inc                      |  4 ++++
 remote/modules/busybox/busybox.build   |  2 +-
 remote/modules/plymouth/plymouth.build |  2 +-
 remote/modules/systemd/systemd.build   | 18 +++++++++---------
 remote/modules/systemd/systemd.conf    |  2 ++
 5 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'remote/modules/systemd')

diff --git a/helper/system.inc b/helper/system.inc
index 1245687b..b9c61b98 100644
--- a/helper/system.inc
+++ b/helper/system.inc
@@ -8,3 +8,7 @@ ARCH_TRIPLET=$(ldd $SHELL|grep libc | awk -F "/" '{print $3}')
 # determine kernel version
 KERNEL_VERSION=$(uname -r)
 [ ! -z $KERNEL_VERSION ] || pwarning "Could not determine kernel version."
+
+# determine number of CPU cores
+CPU_CORES=$(cat /proc/cpuinfo | grep processor | wc -l)
+export MAKEFLAGS="-j$[$CPU_CORES +1]"
diff --git a/remote/modules/busybox/busybox.build b/remote/modules/busybox/busybox.build
index bc2adc64..d11a3828 100644
--- a/remote/modules/busybox/busybox.build
+++ b/remote/modules/busybox/busybox.build
@@ -14,7 +14,7 @@ build()
 	if [ ! -e .built ]; then
 		cd src
 		pinfo "Running make"
-		make -j5 || perror "failed."
+		make || perror "failed."
 		pinfo "Running make install"
 		make CONFIG_PREFIX="${MODULE_DIR}"/build/"${PREFIX}" install || perror "failed"
 		cd -
diff --git a/remote/modules/plymouth/plymouth.build b/remote/modules/plymouth/plymouth.build
index fbaa428a..d5e9c594 100644
--- a/remote/modules/plymouth/plymouth.build
+++ b/remote/modules/plymouth/plymouth.build
@@ -11,7 +11,7 @@ build() {
 		pinfo "Running configure" 
 		./configure --enable-systemd-integration --disable-gtk --disable-static --prefix=""|| perror "failed."
 		pinfo "Running make"
-		make -j5 || perror "failed"
+		make || perror "failed"
 		pinfo "Running make install" 
 		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed"
 		cd -
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index bb58fc1c..57fb705e 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -3,8 +3,7 @@
 fetch_source () {
 	if [ ! -e .fetched_source ]; then 
 		download_untar "$URL" "src/"
-		local LIBKMOD_VERSION="kmod-12"
-		download_untar "http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz" "src/"
+		download_untar "$LIBKMOD_URL" "src/"
 		touch .fetched_source
 	fi
 }	
@@ -12,21 +11,22 @@ fetch_source () {
 build () {
 	if [ ! -e .built ]; then
 		#build libkmod
-		cd "src/$LIBKMOD_VERSION/"
+		cd "${MODULE_DIR}/src/$LIBKMOD_VERSION"
+		pwarning "$(pwd)"
 		./configure
-		make -j5
-		make install
-		cd -
+		make || perror "make failed."
+		make install || perror "make install failed."
+		cd - &> /dev/null
 
 		#build systemd
-		cd "src/$VERSION/"
+		cd "${MODULE_DIR}/src/$VERSION"
 		pinfo "calling configure"
 		./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
 		pinfo "calling make"
-		make -j5 || perror "make failed."
+		make || perror "make failed."
 		pinfo "calling make install"
 		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed."
-		cd -
+		cd - &> /dev/null
 		touch .built
 	fi
 }
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index c5e72aeb..634828bd 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -1,5 +1,7 @@
 VERSION=systemd-197
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
+LIBKMOD_VERSION="kmod-12"
+LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz"
 REQUIRED_DEPENDENCIES="	intltool
 			gperf
 			dbus
-- 
cgit v1.2.3-55-g7522