diff options
| author | Simon Rettberg | 2013-09-10 16:50:51 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-09-10 16:50:51 +0200 |
| commit | 45c5fb51ab57823b2bb67c93f0c486d13da81eaa (patch) | |
| tree | 2f2885a75b0faf6150f4ed574c9900e6dcf47661 /remote/modules/systemd | |
| parent | [sshd] Disallow ssh login for "demo" user as the password is a little easy to... (diff) | |
| parent | [systemd] Cave: Possible breaker: build file doesn't install kmod anymore int... (diff) | |
| download | tm-scripts-45c5fb51ab57823b2bb67c93f0c486d13da81eaa.tar.gz tm-scripts-45c5fb51ab57823b2bb67c93f0c486d13da81eaa.tar.xz tm-scripts-45c5fb51ab57823b2bb67c93f0c486d13da81eaa.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/systemd')
| -rw-r--r-- | remote/modules/systemd/systemd.build | 20 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.conf | 2 |
2 files changed, 20 insertions, 2 deletions
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= diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf index ea042020..3cb6196a 100644 --- a/remote/modules/systemd/systemd.conf +++ b/remote/modules/systemd/systemd.conf @@ -1,6 +1,6 @@ REQUIRED_VERSION="systemd-204" REQUIRED_URL="http://www.freedesktop.org/software/systemd/${REQUIRED_VERSION}.tar.xz" -REQUIRED_LIBKMOD_VERSION="kmod-12" +REQUIRED_LIBKMOD_VERSION="kmod-14" REQUIRED_LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${REQUIRED_LIBKMOD_VERSION}.tar.gz" REQUIRED_DISABLED_SERVICES=" tmp.mount |