diff options
| author | root | 2015-02-18 16:21:37 +0100 |
|---|---|---|
| committer | root | 2015-02-18 16:21:37 +0100 |
| commit | a6cf0da3f7d564f00e66d21e5aae0baecb14a6cf (patch) | |
| tree | 950b8734d3b44e884776cd6c578843d19e47d86d | |
| parent | [mltk] Added openSuse prerequisite tool cmake to zypper list (diff) | |
| download | tm-scripts-a6cf0da3f7d564f00e66d21e5aae0baecb14a6cf.tar.gz tm-scripts-a6cf0da3f7d564f00e66d21e5aae0baecb14a6cf.tar.xz tm-scripts-a6cf0da3f7d564f00e66d21e5aae0baecb14a6cf.zip | |
[sssd, beamergui] openSuse 13.2 sssd config file, beamergui build modif.
| -rw-r--r-- | remote/modules/beamergui/module.build | 7 | ||||
| -rw-r--r-- | remote/modules/sssd/module.conf.opensuse.13.2 | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/remote/modules/beamergui/module.build b/remote/modules/beamergui/module.build index 2ff35bfc..1afde34e 100644 --- a/remote/modules/beamergui/module.build +++ b/remote/modules/beamergui/module.build @@ -6,6 +6,11 @@ fetch_source() { build() { local SRCDIR="${MODULE_DIR}/src/" + if [[ "$SYS_DISTRIBUTION" == "opensuse" && "$SYS_VERSION" == "13.2" ]]; then + QMAKE="/usr/$LIB64/qt4/bin/qmake" + else + QMAKE="$(which qmake-qt4)" + fi # first activate qt 4 activate_qt 4 @@ -13,7 +18,7 @@ build() { mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!" pinfo "Running qmake" - qmake-qt4 "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'qmake-qt4' failed (e.g. not installed)." + "$QMAKE" "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'qmake-qt4' failed (e.g. not installed)." pinfo "Running make" make || perror "'make' failed." } diff --git a/remote/modules/sssd/module.conf.opensuse.13.2 b/remote/modules/sssd/module.conf.opensuse.13.2 index 8b70524a..ae16996e 100644 --- a/remote/modules/sssd/module.conf.opensuse.13.2 +++ b/remote/modules/sssd/module.conf.opensuse.13.2 @@ -1,3 +1,13 @@ +REQUIRED_FILES=" + /etc/sssd + /etc/systemd/system/sssd.service +" + +REQUIRED_DIRECTORIES=" + /$LIB64 + /usr/lib +" + REQUIRED_INSTALLED_PACKAGES=" sssd sssd-ldap @@ -8,5 +18,5 @@ REQUIRED_CONTENT_PACKAGES=" sssd sssd-ldap libldb1 - libnss_nss_idmap0 + libsss_nss_idmap0 " |