[systemd] Reversion, without Scientific Linux - please notice

systemd.build.scientific for that use.

1 files changed, 0 insertions, 86 deletions

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index a5291677..3a5baf07 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -4,14 +4,6 @@ fetch_source () {
 	download_untar "$REQUIRED_URL" "src/"
 	download_untar "$REQUIRED_LIBKMOD_URL" "src/"
 
-	# Another nice hack for Scientific Linux - experimental.
-	if [ "$SYS_DISTRIBUTION" == "scientific" ]; then
-		download_untar "$REQUIRED_UTILLINUX_URL" "src/" || perror "Cannot download util-linux!"
-		download_untar "$REQUIRED_M4_URL" "src/" || perror "Cannot download m4 version $REQUIRED_AUTOMAKE_VERSION!"
-		download_untar "$REQUIRED_AUTOCONF_URL" "src/" || perror "Cannot download autoconf version $REQUIRED_AUTOCONF_VERSION!"
-		download_untar "$REQUIRED_AUTOMAKE_URL" "src/" || perror "Cannot download automake version $REQUIRED_AUTOMAKE_VERSION!"
-	fi
-
 	# Patch PATH environment
 	sed -s -i -r 's#"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin(:/sbin:/bin)?"#& ":/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"#g' src/systemd-*/src/core/main.c
 	sed -s -i -r 's#"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"#& ":/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"#g' src/systemd-*/src/nspawn/nspawn.c
@@ -26,84 +18,6 @@ build () {
 	make install || perror "kmod make install failed."
 	cd - &> /dev/null
 
-	# Scientific Linux specials
-	if [ "$SYS_DISTRIBUTION" == "scientific" ]; then
-		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"
-		cd "${MODULE_DIR}/src/util-linux-$REQUIRED_UTILLINUX_VERSION"
-		./configure --disable-libuuid --disable-libmount --without-ncurses \
-			--disable-mount --disable-losetup --disable-cytune --disable-fsck --disable-partx --disable-uuidd \
-			--disable-mountpoint --disable-fallocate --disable-unshare --disable-nsenter --disable-setpriv \
-			--disable-eject --disable-agetty --disable-cramfs --disable-bfs --disable-fdformat --disable-hwclock \
-			--disable-wdctl --disable-switch_root --disable-pivot_root --disable-kill --disable-utmpdump --disable-raw \
-			--disable-rename --disable-login --disable-sulogin --disable-su --disable-runuser --disable-ul --disable-more \
-			--disable-pg --disable-schedutils --disable-wall --disable-bash-completion \
-			|| perror "./configure util-linux failed."
-		make || perror "util-linux make failed."
-		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "util-linux make install failed."
-		cd - &> /dev/null
-
-		# Let's have some starting fun with m4, as we want systemd, which wants automake 1.13, which wants autoconf,
-		# which wants m4 ...
-		pinfo "Building m4 Version $REQUIRED_M4_VERSION."
-		cd "${MODULE_DIR}/src/m4-$REQUIRED_M4_VERSION"
-		./configure || perror "./configure m4 failed."
-		make || perror "m4 make failed."
-		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "m4 make install failed."
-		cd - &> /dev/null
-
-		# 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."
-		make || perror "autoconf make failed."
-		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/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
-
-		# patching configure for Scientific Linux - cave - ugly hack!
-		pinfo "Scientific Linux detected; patching systemd/configure..."
-		cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
-		sed 's/dbus-1 >= 1.3.2/dbus-1 >= 1.2.24/g' configure > configure.patched
-		mv configure configure.orig
-		mv configure.patched configure
-		chmod +x configure
-
-		# For later compiling systemd
-		pinfo "-------------${MODULE_BUILD_DIR}--------------"
-		CPPFLAGS="-I${MODULE_BUILD_DIR}/usr/include/"
-		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"