diff options
| author | Simon Rettberg | 2013-11-20 17:13:44 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-20 17:13:44 +0100 |
| commit | 75bbc76a74ab5da1e59e0b7dc3e80a9405c16c77 (patch) | |
| tree | a19f6ce812ab4b760f7ba7871c6c3aa3786d30f0 | |
| parent | [vmchooser] run-virt: dnbd3 compatibility (diff) | |
| parent | [consolekit] Added missing consolekit to REQUIRED_INSTALLED_PACKAGES (ubuntu) (diff) | |
| download | tm-scripts-75bbc76a74ab5da1e59e0b7dc3e80a9405c16c77.tar.gz tm-scripts-75bbc76a74ab5da1e59e0b7dc3e80a9405c16c77.tar.xz tm-scripts-75bbc76a74ab5da1e59e0b7dc3e80a9405c16c77.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
| -rwxr-xr-x | mltk | 17 | ||||
| -rw-r--r-- | remote/modules/consolekit/consolekit.conf.ubuntu | 3 |
2 files changed, 15 insertions, 5 deletions
@@ -102,7 +102,8 @@ print_usage() { check_devtools() { # Checking for needed development tools, compilers etc. # Required: m4 make gcc g++ binutils - local DEV_TOOLS="gcc c++ g++ make m4 strip git depmod patch mksquashfs pkg-config qmake" # 'strip' as marker for binutils + # no qmake here, qmake (libqt4-devel) should be installed in a module! + local DEV_TOOLS="gcc c++ g++ make m4 strip git depmod patch mksquashfs pkg-config" # 'strip' as marker for binutils # DEV_CHECK marks missing dev-tools local DEV_TOOLS_MISSING="" @@ -115,11 +116,17 @@ check_devtools() { pinfo "Missing tools are: $DEV_TOOLS_MISSING" pinfo "For $SYS_DISTRIBUTION you probably need to run:" case $SYS_DISTRIBUTION in - ubuntu | debian) pinfo "apt-get install build-essential m4 squashfs-tools" ;; - # FIXME: Don't know how precise this filter works so we might want to have a better matching ... - opensuse) pinfo "zypper install -t pattern devel_basis libqt4-devel" ;; - *) perror "Cannot determine SYS_DISTRIBUTION: $SYS_DISTRIBUTION unknown!" ;; + ubuntu | debian) pinfo "apt-get install build-essential m4 squashfs-tools" + pinfo "to install missing development tools." + ;; + # FIXME: Don't know how precise this filter works so we might want to have a better matching ... + opensuse) pinfo "zypper install gcc gcc-c++ make m4 binutils git module-init-tools patch squashfs pkg-config" + pinfo "to install missing development tools." + ;; + *) perror "Cannot determine SYS_DISTRIBUTION: $SYS_DISTRIBUTION unknown!" + ;; esac + perror "Please install missing dependencies (see above) and try again!" fi } diff --git a/remote/modules/consolekit/consolekit.conf.ubuntu b/remote/modules/consolekit/consolekit.conf.ubuntu index 3b160bc9..e7f5e47d 100644 --- a/remote/modules/consolekit/consolekit.conf.ubuntu +++ b/remote/modules/consolekit/consolekit.conf.ubuntu @@ -1,3 +1,6 @@ +REQUIRED_INSTALLED_PACKAGES=" + consolekit +" REQUIRED_CONTENT_PACKAGES=" consolekit libpam-ck-connector |