diff options
| author | Manuel Schneider | 2014-07-10 12:55:42 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-07-10 12:55:42 +0200 |
| commit | e401500a177910c6b7be1c7dbe84d5c3903bd6b3 (patch) | |
| tree | 7c8292e1f6f0a1450b8736bdf08a98ef334b5d41 /remote | |
| parent | Revert "[setup_target] only link /{lib,bin} to /usr/{lib,bin} if it is that w... (diff) | |
| download | tm-scripts-e401500a177910c6b7be1c7dbe84d5c3903bd6b3.tar.gz tm-scripts-e401500a177910c6b7be1c7dbe84d5c3903bd6b3.tar.xz tm-scripts-e401500a177910c6b7be1c7dbe84d5c3903bd6b3.zip | |
Added moudules x11vnc and pvs2
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/pvs2/module.build | 20 | ||||
| -rw-r--r-- | remote/modules/pvs2/module.conf | 6 | ||||
| l--------- | remote/targets/stage32-bwlp/pvs2 | 1 | ||||
| l--------- | remote/targets/stage32-bwlp/x11vnc | 1 |
4 files changed, 21 insertions, 7 deletions
diff --git a/remote/modules/pvs2/module.build b/remote/modules/pvs2/module.build index 2ff35bfc..edcb49b0 100644 --- a/remote/modules/pvs2/module.build +++ b/remote/modules/pvs2/module.build @@ -5,17 +5,25 @@ fetch_source() { } build() { - local SRCDIR="${MODULE_DIR}/src/" + + local SRCDIR="${MODULE_DIR}/src/" + local BUILDDIR="${MODULE_DIR}/src/build" + local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/pvs2" # first activate qt 4 activate_qt 4 - 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)." + mkdir -p "$DESTDIR" + cd "$DESTDIR" || perror "Could not cd to $DESTDIR!" + + mkdir "$BUILDDIR" + cd "$BUILDDIR" + pinfo "Running cmake" + cmake .. || perror "'cmake $SRCDIR' failed." pinfo "Running make" - make || perror "'make' failed." + make || perror "'make' failed." + mv pvsmgr pvsclient "$DESTDIR" + cd "$MODULE_DIR" > /dev/null } post_copy() { : diff --git a/remote/modules/pvs2/module.conf b/remote/modules/pvs2/module.conf index c74bdf16..3914f994 100644 --- a/remote/modules/pvs2/module.conf +++ b/remote/modules/pvs2/module.conf @@ -1,9 +1,13 @@ REQUIRED_GIT="git://git.openslx.org/pvs2.git" REQUIRED_BINARIES=" - pvs2 + pvsmgr + pvsclient " REQUIRED_LIBRARIES=" " REQUIRED_SYSTEM_FILES=" " +REQUIRED_MODULES=" + x11vnc +" # TODO add libraries diff --git a/remote/targets/stage32-bwlp/pvs2 b/remote/targets/stage32-bwlp/pvs2 new file mode 120000 index 00000000..c2334014 --- /dev/null +++ b/remote/targets/stage32-bwlp/pvs2 @@ -0,0 +1 @@ +../../modules/pvs2/
\ No newline at end of file diff --git a/remote/targets/stage32-bwlp/x11vnc b/remote/targets/stage32-bwlp/x11vnc new file mode 120000 index 00000000..570bf726 --- /dev/null +++ b/remote/targets/stage32-bwlp/x11vnc @@ -0,0 +1 @@ +../../modules/x11vnc/
\ No newline at end of file |