From 0fd04debb2424a75cf15ddc436989e01a293976b Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 10 Sep 2013 16:10:59 +0200
Subject: [systemd] Cave: Possible breaker: build file doesn't install kmod
 anymore into base system.

---
 remote/modules/systemd/systemd.build | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 3a5baf07..b1228f17 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -15,16 +15,29 @@ build () {
 	cd "${MODULE_DIR}/src/$REQUIRED_LIBKMOD_VERSION"
 	./configure || perror "./configure kmod failed."
 	make || perror "kmod make failed."
-	make install || perror "kmod make install failed."
+	DESTDIR="${MODULE_BUILD_DIR}" make install || perror "kmod make install failed."
 	cd - &> /dev/null
 
 	#build systemd
 	pinfo "Building systemd"
 	cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
 	pinfo "calling configure"
+	
+	# Save potentially pre-used paths/flages
+	OLDLDFLAGS="$LDFLAGS"
+	OLDCPPFLAGS="$CPPFLAGS"
+	OLDPKG_CONFIG_PATH="PKG_CONFIG_PATH"
+
+
+	LDFLAGS="$LDFLAGS -L${MODULE_BUILD_DIR}/usr/$LIB64" \
+	CPPFLAGS="-I${MODULE_BUILD_DIR}/usr/include"
+	PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/$LIB64/pkgconfig"
+
+	pinfo "-------- $KMOD_LIBS ----------"
 	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \
 			--disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \
 			--disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \
+			--enable-kmod \
 			|| perror "configure failed."
 	pinfo "calling make"
 	make || perror "make failed."
@@ -32,6 +45,11 @@ build () {
 	DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed."
 	cd - &> /dev/null
 
+	# Restore used flags/paths:
+	LDFLAGS="$OLDLDFLAGS"
+	CPPFLAGS="$OLDCPPFLAGS"
+	PKG_CONFIG_PATH="$OLDPKG_CONFIG_PATH"
+
 	# Delete unneeded services
 	pinfo "Deleting unneeded services"
 	local SERVICE=
-- 
cgit v1.2.3-55-g7522