Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

...

2 files changed, 24 insertions, 7 deletions

diff --git a/remote/modules/systemd/TODO b/remote/modules/systemd/TODO
new file mode 100644
index 00000000..4b17eb88
--- /dev/null
+++ b/remote/modules/systemd/TODO
@@ -0,0 +1,2 @@
+libkmod: libkmod gets installed systemwide at present. This should not
+	be the case.
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 358c59a6..a5291677 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -28,7 +28,11 @@ build () {
 
 	# Scientific Linux specials
 	if [ "$SYS_DISTRIBUTION" == "scientific" ]; then
-		pinfo "Scientific Linux detected ..."
+		pinfo "Scientific Linux detected ..."			# Freude, schöner Götterfunke!
+
+		# Some path mainpulations for followong utilities
+		OLDPATH=$PATH
+		export PATH="${MODULE_BUILD_DIR}/usr/local/bin/:$PATH"		# autoconf etc. needs new m4 etc.
 
 		# Utillinux stuff
 		pinfo "Building util-linux"
@@ -54,8 +58,7 @@ build () {
 		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "m4 make install failed."
 		cd - &> /dev/null
 
-		# Let's have some starting fun with autoconf, as we want systemd, which wants automake 1.13, which wants
-		# autoconf 2.65 or better...
+		# And have some more fun with autoconf, chain see above:
 		pinfo "Building autoconf Version $REQUIRED_AUTOCONF_VERSION."
 		cd "${MODULE_DIR}/src/autoconf-$REQUIRED_AUTOCONF_VERSION"
 		./configure || perror "./configure autoconf failed."
@@ -63,15 +66,22 @@ build () {
 		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "autoconf make install failed."
 		cd - &> /dev/null
 
-		# Now let's have some fun with automake, as config.log/systemd will whine later about SL's automake 1.11:
-		# AUTOMAKE='${SHELL} /root/tm-scripts/remote/modules/systemd/src/systemd-206/build-aux/missing automake-1.13'
+		# Now let's have some fun with automake, as config.log/automake will whine later about SL's automake 1.11:
+		# AUTOMAKE='${SHELL} [...] missing automake-1.13'. We use a newer automake than 1.11, if we are at it.
+                # Link fun, as configure searches in /usr/local/bin, ignores PATH above, also 'share':
+		ln -s "${MODULE_BUILD_DIR}/usr/local/bin/autom4te" /usr/local/bin/autom4te
+		ln -s "${MODULE_BUILD_DIR}/usr/local/share/autoconf" /usr/local/share/autoconf
+		# ... and manipulate perl library path, as else the libs will not be found by (system) perl:
+		OLDPERL5LIB="$PERL5LIB"
+                export PERL5LIB="${MODULE_BUILD_DIR}/usr/local/share/autoconf/:$PERL5LIB"
+
 		pinfo "Building automake Version $REQUIRED_AUTOMAKE_VERSION."
 		cd "${MODULE_DIR}/src/automake-$REQUIRED_AUTOMAKE_VERSION"
 		./configure || perror "./configure automake failed."
 		make || perror "automake make failed."
 		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "automake make install failed."
 		cd - &> /dev/null
-exit
+
 		# patching configure for Scientific Linux - cave - ugly hack!
 		pinfo "Scientific Linux detected; patching systemd/configure..."
 		cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
@@ -86,13 +96,18 @@ exit
 		LDFLAGS="$LDFLAGS -L${MODULE_BUILD_DIR}/usr/lib/ -ldl"
 		# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib/"
 		cd - &> /dev/null
+
+		# ... and tidy our manipulations with path, perllib, links etc.
+		export PERL5LIB="$OLDPERL5LIB"
+		export PATH="$OLDPATH"
+		unlink /usr/local/bin/autom4te
+		unlink /usr/local/share/autoconf
 	fi
 
 	#build systemd
 	pinfo "Building systemd"
 	cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
 	pinfo "calling configure"
-pinfo "-------$LDFLAGS------------$CPPFLAGS-----------------$LD_LIBRARY_PATH---------------------------------------------------"
 	./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 \