diff options
| author | Michael Neves | 2013-02-28 15:00:24 +0100 |
|---|---|---|
| committer | Michael Neves | 2013-02-28 15:00:24 +0100 |
| commit | e4e4261fbb5fce8e2f2a612fc303bb366200b0f3 (patch) | |
| tree | a4757ccec8ad9f07dd9bf8f40e8fb8e2da6135da /remote/tools/systemd | |
| parent | small fixes (diff) | |
| parent | Generalization: (diff) | |
| download | tm-scripts-e4e4261fbb5fce8e2f2a612fc303bb366200b0f3.tar.gz tm-scripts-e4e4261fbb5fce8e2f2a612fc303bb366200b0f3.tar.xz tm-scripts-e4e4261fbb5fce8e2f2a612fc303bb366200b0f3.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
helper/fileutil.inc
remote/tools/base/base.build
Diffstat (limited to 'remote/tools/systemd')
| -rw-r--r-- | remote/tools/systemd/systemd.build | 37 | ||||
| -rw-r--r-- | remote/tools/systemd/systemd.conf | 2 |
2 files changed, 12 insertions, 27 deletions
diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build index 7d9588c0..1d5a9a87 100644 --- a/remote/tools/systemd/systemd.build +++ b/remote/tools/systemd/systemd.build @@ -5,34 +5,19 @@ fetch_source () { touch .fetched_source } -install_dependencies() { - # quick fix for missing libkmod repo... - #libkmod=$(apt-cache search libkmod-dev) - #if [[ -z $libkmod ]]; - #then - # echo "libkmod cannot be found. Adding ppa:pitti/systemd" - # add-apt-repository --yes ppa:pitti/systemd - # apt-get update --force-yes - #fi - # install libkmod from source - # TODO: Use download_untar - local libkmodversion=kmod-12 - if [ ! -d $libkmodversion ]; then - wget http://www.kernel.org/pub/linux/utils/kernel/kmod/${libkmodversion}.tar.gz - tar xf $libkmodversion.tar.gz - rm ${libkmodversion}.tar.gz - cd $libkmodversion - ./configure - make -j5 - make install - cd - - fi - - apt-get install -y $DEPS -} - build () { if [ ! -e .built ]; then + local libkmodversion=kmod-12 + if [ ! -d $libkmodversion ]; then + wget http://www.kernel.org/pub/linux/utils/kernel/kmod/${libkmodversion}.tar.gz + tar xf $libkmodversion.tar.gz + rm ${libkmodversion}.tar.gz + cd $libkmodversion + ./configure + make -j5 + make install + cd - + fi cd "src/$VERSION/" pinfo "calling configure" ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed." diff --git a/remote/tools/systemd/systemd.conf b/remote/tools/systemd/systemd.conf index 98cd8ba9..c5e72aeb 100644 --- a/remote/tools/systemd/systemd.conf +++ b/remote/tools/systemd/systemd.conf @@ -1,6 +1,6 @@ VERSION=systemd-197 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz -DEPS=" intltool +REQUIRED_DEPENDENCIES=" intltool gperf dbus pkg-config |