diff options
| author | Simon Rettberg | 2013-03-19 19:42:41 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-03-19 19:42:41 +0100 |
| commit | 61b94929a4d429a8480dcc06487c52be15db5e1f (patch) | |
| tree | 871d76618b66216ec5adb6446907a7ea8bde8ebd /remote/modules/systemd/systemd.build | |
| parent | Tweak modules to work with openSUSE 12.1 (diff) | |
| parent | Enable /tmp on ID44 partition if available. (diff) | |
| download | tm-scripts-61b94929a4d429a8480dcc06487c52be15db5e1f.tar.gz tm-scripts-61b94929a4d429a8480dcc06487c52be15db5e1f.tar.xz tm-scripts-61b94929a4d429a8480dcc06487c52be15db5e1f.zip | |
Merge branch 'master' of ssh://openslx/openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/systemd/systemd.build')
| -rw-r--r-- | remote/modules/systemd/systemd.build | 18 |
1 files changed, 9 insertions, 9 deletions
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 } |