diff options
author | Simon Rettberg | 2018-03-22 12:07:46 +0100 |
---|---|---|
committer | Simon Rettberg | 2018-03-22 12:07:46 +0100 |
commit | fbf1680bed450fb4258aacf1e3d313dc03397b0c (patch) | |
tree | bafea431f99d24c4bb0dfc11fa95ceb34046dd4c | |
parent | Forgot fith fcript (diff) | |
download | mltk-fbf1680bed450fb4258aacf1e3d313dc03397b0c.tar.gz mltk-fbf1680bed450fb4258aacf1e3d313dc03397b0c.tar.xz mltk-fbf1680bed450fb4258aacf1e3d313dc03397b0c.zip |
[vmchooser] Weg damit
-rw-r--r-- | core/modules/vmchooser/TODO | 4 | ||||
-rwxr-xr-x | core/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart | 12 | ||||
-rw-r--r-- | core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png | bin | 9187 -> 0 bytes | |||
-rw-r--r-- | core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png | bin | 3390 -> 0 bytes | |||
-rw-r--r-- | core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini | 4 | ||||
-rw-r--r-- | core/modules/vmchooser/module.build | 40 | ||||
-rw-r--r-- | core/modules/vmchooser/module.conf | 4 | ||||
-rw-r--r-- | core/modules/vmchooser/module.conf.debian | 5 | ||||
-rw-r--r-- | core/modules/vmchooser/module.conf.fedora | 4 | ||||
-rw-r--r-- | core/modules/vmchooser/module.conf.opensuse | 5 | ||||
-rw-r--r-- | core/modules/vmchooser/module.conf.ubuntu | 5 |
11 files changed, 0 insertions, 83 deletions
diff --git a/core/modules/vmchooser/TODO b/core/modules/vmchooser/TODO deleted file mode 100644 index 23252d6f..00000000 --- a/core/modules/vmchooser/TODO +++ /dev/null @@ -1,4 +0,0 @@ -currently nothing to do. - -done: - adapt globals.cpp globals.h to adopt the new structure of openslx-files: everything we do under /opt/openslx diff --git a/core/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart b/core/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart deleted file mode 100755 index be3235c1..00000000 --- a/core/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/ash - -SOURCEPATH="/opt/openslx/vmchooser/sessionstart.d" - -if [ -d "$SOURCEPATH" ]; then - for file in $SOURCEPATH/*; do - "$file" || slxlog "vmchooser-sessionstart" "Could not source $file at session start!" "$file" - done -fi - -exit 0 - diff --git a/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png b/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png Binary files differdeleted file mode 100644 index 900dd867..00000000 --- a/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-left.png +++ /dev/null diff --git a/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png b/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png Binary files differdeleted file mode 100644 index 8ca9347b..00000000 --- a/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx-right.png +++ /dev/null diff --git a/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini b/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini deleted file mode 100644 index 57a22821..00000000 --- a/core/modules/vmchooser/data/opt/openslx/vmchooser/themes/openslx/openslx.ini +++ /dev/null @@ -1,4 +0,0 @@ -background-color=#ffffff -image-right=openslx-right.png -image-left=openslx-left.png - diff --git a/core/modules/vmchooser/module.build b/core/modules/vmchooser/module.build deleted file mode 100644 index b42b89ca..00000000 --- a/core/modules/vmchooser/module.build +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -fetch_source() { - git clone "${REQUIRED_GIT}" src -} - -build() { - local SRCDIR="${MODULE_WORK_DIR}/src/" - - [ ! -d "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}" ] && mkdir -p "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}" - cd "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}" - - # patch globals.cpp and globals.h to use standardised paths /opt/openslx/... - if ! grep -q VMCHOOSER_SCRIPTS_PATH "$SRCDIR/src/globals.h"; then - sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"/g' "${SRCDIR}"/src/globals.h - sed -i 's/^#define VMCHOOSER_ETC_BASE_PATH.*/#define VMCHOOSER_ETC_BASE_PATH "\/opt\/openslx\/vmchooser\/config"/g' "${SRCDIR}"/src/globals.h - sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"\n#define VMCHOOSER_SCRIPTS_PATH "\/opt\/openslx\/scripts"/g' "${SRCDIR}"/src/globals.h - sed -i 's/^#define VMCHOOSER_THEME_BASE.*/#define VMCHOOSER_THEME_BASE "\/opt\/openslx\/vmchooser\/themes"/g' "${SRCDIR}"/src/globals.h - - sed -i 's/^QString binPath(VMCHOOSER_BIN_PATH);/QString binPath(VMCHOOSER_BIN_PATH);\nQString scriptsPath(VMCHOOSER_SCRIPTS_PATH);/g' "${SRCDIR}"/src/globals.cpp - sed -i 's/^QString runVmScript(binPath + "\/run-virt.sh");/QString runVmScript(scriptsPath + "\/vmchooser-run_virt");/g' "${SRCDIR}"/src/globals.cpp - sed -i 's/^QString filterScript(binPath + "\/xmlfilter.sh");/QString filterScript(scriptsPath + "\/vmchooser-xml_filter");/g' "${SRCDIR}"/src/globals.cpp - sed -i 's/^#define VMCHOOSER_VMPATH.*/#define VMCHOOSER_VMPATH "\/mnt\/vmstore"/g' "${SRCDIR}"/src/globals.h - fi - - pinfo "Running cmake" - - # activate qt 4 - activate_qt 4 - - cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed." - make || perror "'make' failed." - - cd - &> /dev/null -} - -post_copy() { - : -} - diff --git a/core/modules/vmchooser/module.conf b/core/modules/vmchooser/module.conf deleted file mode 100644 index f8facd2a..00000000 --- a/core/modules/vmchooser/module.conf +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -REQUIRED_GIT="git://git.openslx.org/openslx/tools/vmchooser.git" -REQUIRED_PREFIX="/opt/openslx/bin" -REQUIRED_BINARIES="vmchooser" diff --git a/core/modules/vmchooser/module.conf.debian b/core/modules/vmchooser/module.conf.debian deleted file mode 100644 index 1e09c702..00000000 --- a/core/modules/vmchooser/module.conf.debian +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -REQUIRED_INSTALLED_PACKAGES=" - cmake - libqt4-dev -" diff --git a/core/modules/vmchooser/module.conf.fedora b/core/modules/vmchooser/module.conf.fedora deleted file mode 100644 index cb27bc48..00000000 --- a/core/modules/vmchooser/module.conf.fedora +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -REQUIRED_INSTALLED_PACKAGES=" - qt-devel -" diff --git a/core/modules/vmchooser/module.conf.opensuse b/core/modules/vmchooser/module.conf.opensuse deleted file mode 100644 index d3bd2b76..00000000 --- a/core/modules/vmchooser/module.conf.opensuse +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -REQUIRED_INSTALLED_PACKAGES=" - cmake - libqt4-devel -" diff --git a/core/modules/vmchooser/module.conf.ubuntu b/core/modules/vmchooser/module.conf.ubuntu deleted file mode 100644 index 1e09c702..00000000 --- a/core/modules/vmchooser/module.conf.ubuntu +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -REQUIRED_INSTALLED_PACKAGES=" - cmake - libqt4-dev -" |