diff options
| author | Jonathan Bauer | 2014-07-28 17:26:53 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-07-28 17:26:53 +0200 |
| commit | 1f1bf871dbb5c399a466f207d8338981e2202869 (patch) | |
| tree | d08a63aba59b55e041df892453afc7b174f28de4 | |
| parent | [rfs-s31] fix busybox copying v2 (diff) | |
| download | tm-scripts-1f1bf871dbb5c399a466f207d8338981e2202869.tar.gz tm-scripts-1f1bf871dbb5c399a466f207d8338981e2202869.tar.xz tm-scripts-1f1bf871dbb5c399a466f207d8338981e2202869.zip | |
[pvs2] also copy the qt4-svg package to stage32
This is needed for embedded svg's to be read by QT
| -rw-r--r-- | remote/modules/pvs2/module.build | 28 | ||||
| -rw-r--r-- | remote/modules/pvs2/module.conf | 2 | ||||
| -rw-r--r-- | remote/modules/pvs2/module.conf.ubuntu | 8 |
3 files changed, 24 insertions, 14 deletions
diff --git a/remote/modules/pvs2/module.build b/remote/modules/pvs2/module.build index 68acf68a..8277aa1c 100644 --- a/remote/modules/pvs2/module.build +++ b/remote/modules/pvs2/module.build @@ -6,23 +6,29 @@ fetch_source() { build() { - local SRCDIR="${MODULE_DIR}/src/" - local BUILDDIR="$SRCDIR/build/" - local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/bin" + local SRCDIR="${MODULE_DIR}/src/" + local BUILDDIR="$SRCDIR/build/" + local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/bin" # first activate qt 4 activate_qt 4 - mkdir -p "$DESTDIR" || perror "Could not mkdir $DESTDIR!" - mkdir -p "$BUILDDIR" || perror "Could not mkdir $BUILDDIR!" - cd "$BUILDDIR" || perror "Could not cd to $BUILDDIR!" + mkdir -p "$DESTDIR" || perror "Could not mkdir $DESTDIR!" + mkdir -p "$BUILDDIR" || perror "Could not mkdir $BUILDDIR!" + cd "$BUILDDIR" || perror "Could not cd to $BUILDDIR!" - pinfo "Running cmake" - cmake .. || perror "'cmake ..' failed." + pinfo "Running cmake" + cmake .. || perror "'cmake ..' failed." pinfo "Running make" - make || perror "'make' failed." - mv pvsmgr pvsclient $DESTDIR - cd - > /dev/null + make || perror "'make' failed." + mv pvsmgr pvsclient $DESTDIR + cd - > /dev/null + + # needed for copying REQUIRED_CONTENT_PACKAGES to build/ + COPYLIST="list_dpkg_output" + [ -e "$COPYLIST" ] && rm "$COPYLIST" + list_packet_files >> "$COPYLIST" + tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" } post_copy() { : diff --git a/remote/modules/pvs2/module.conf b/remote/modules/pvs2/module.conf index 3914f994..9ef50afd 100644 --- a/remote/modules/pvs2/module.conf +++ b/remote/modules/pvs2/module.conf @@ -8,6 +8,6 @@ REQUIRED_LIBRARIES=" REQUIRED_SYSTEM_FILES=" " REQUIRED_MODULES=" - x11vnc + x11vnc " # TODO add libraries diff --git a/remote/modules/pvs2/module.conf.ubuntu b/remote/modules/pvs2/module.conf.ubuntu index f031a225..bcaa8e60 100644 --- a/remote/modules/pvs2/module.conf.ubuntu +++ b/remote/modules/pvs2/module.conf.ubuntu @@ -1,6 +1,10 @@ REQUIRED_INSTALLED_PACKAGES=" -libqt4-dev -libvncserver-dev + libqt4-dev + libvncserver-dev " REQUIRED_CONTENT_PACKAGES=" + libqt4-svg +" +REQUIRED_DIRECTORIES=" + /usr/lib/ " |