summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/modules/beamergui/module.conf9
-rw-r--r--core/modules/beamergui/module.conf.ubuntu6
-rw-r--r--core/modules/lightdm-greeter-bwlp/module.conf6
-rw-r--r--core/modules/lightdm-greeter-bwlp/module.conf.ubuntu2
-rw-r--r--core/modules/pvs2/module.conf6
-rw-r--r--core/modules/pvs2/module.conf.ubuntu5
-rw-r--r--core/modules/slxbrowser/module.conf4
-rw-r--r--core/modules/slxbrowser/module.conf.ubuntu5
-rw-r--r--core/modules/vmchooser2/module.conf3
-rw-r--r--core/modules/vmchooser2/module.conf.ubuntu6
-rw-r--r--core/modules/vmchooser2/module.conf.ubuntu.177
-rw-r--r--core/modules/vmchooser2/module.conf.ubuntu.187
l---------core/targets/stage32-bwlp/qt5core1
13 files changed, 17 insertions, 50 deletions
diff --git a/core/modules/beamergui/module.conf b/core/modules/beamergui/module.conf
index 97d1e350..65cc1dce 100644
--- a/core/modules/beamergui/module.conf
+++ b/core/modules/beamergui/module.conf
@@ -1,11 +1,10 @@
#!/bin/bash
+REQUIRED_MODULES="
+ qt5core
+"
REQUIRED_GIT="git://git.openslx.org/openslx-ng/beamergui.git"
REQUIRED_BINARIES="
beamergui
parse-edid
"
-REQUIRED_LIBRARIES="
-"
-REQUIRED_SYSTEM_FILES="
-"
-# TODO add libraries
+
diff --git a/core/modules/beamergui/module.conf.ubuntu b/core/modules/beamergui/module.conf.ubuntu
index f13ea924..0a8ca142 100644
--- a/core/modules/beamergui/module.conf.ubuntu
+++ b/core/modules/beamergui/module.conf.ubuntu
@@ -1,12 +1,6 @@
#!/bin/bash
REQUIRED_INSTALLED_PACKAGES="
- libqt5gui5
libxrandr-dev
- qt5-qmake
- qtbase5-dev
- qtbase5-dev-tools
- qttools5-dev
- qttools5-dev-tools
"
REQUIRED_CONTENT_PACKAGES="
libxrandr-dev
diff --git a/core/modules/lightdm-greeter-bwlp/module.conf b/core/modules/lightdm-greeter-bwlp/module.conf
index f203328f..7ceb0bc7 100644
--- a/core/modules/lightdm-greeter-bwlp/module.conf
+++ b/core/modules/lightdm-greeter-bwlp/module.conf
@@ -1,10 +1,12 @@
-REQUIRED_MODULE="lightdm"
+REQUIRED_MODULEs="
+ lightdm
+ qt5core
+"
REQUIRED_GIT="git://git.openslx.org/openslx-ng/slxgreeter"
REQUIRED_BINARIES="
qt-lightdm-greeter
"
REQUIRED_LIBRARIES=""
REQUIRED_DIRECTORIES="
- /usr/lib
/usr/share/xgreeters
"
diff --git a/core/modules/lightdm-greeter-bwlp/module.conf.ubuntu b/core/modules/lightdm-greeter-bwlp/module.conf.ubuntu
index 49f304ba..6aa87ce6 100644
--- a/core/modules/lightdm-greeter-bwlp/module.conf.ubuntu
+++ b/core/modules/lightdm-greeter-bwlp/module.conf.ubuntu
@@ -1,10 +1,8 @@
#!/bin/bash
REQUIRED_INSTALLED_PACKAGES="
liblightdm-qt5-3-dev
- libqt5svg5-dev
"
REQUIRED_CONTENT_PACKAGES="
liblightdm-qt5-3-0
- libqt5svg5
"
diff --git a/core/modules/pvs2/module.conf b/core/modules/pvs2/module.conf
index b3b97b7e..7d918d60 100644
--- a/core/modules/pvs2/module.conf
+++ b/core/modules/pvs2/module.conf
@@ -9,12 +9,8 @@ REQUIRED_BINARIES="
REQUIRED_DIRECTORIES="
/opt/openslx/pvs2/
"
-REQUIRED_LIBRARIES="
- libqjpeg
-"
-REQUIRED_SYSTEM_FILES="
-"
REQUIRED_MODULES="
+ qt5core
x11vnc
"
# TODO add libraries
diff --git a/core/modules/pvs2/module.conf.ubuntu b/core/modules/pvs2/module.conf.ubuntu
index 1391c073..83877b5a 100644
--- a/core/modules/pvs2/module.conf.ubuntu
+++ b/core/modules/pvs2/module.conf.ubuntu
@@ -1,17 +1,12 @@
#!/bin/bash
REQUIRED_INSTALLED_PACKAGES="
libxss-dev
- libqt5gui5
- libqt5svg5-dev
libqt5x11extras5-dev
- qttools5-dev
- qttools5-dev-tools
libvncserver-dev
xinput
wmctrl
"
REQUIRED_CONTENT_PACKAGES="
- libqt5gui5
xinput
wmctrl
"
diff --git a/core/modules/slxbrowser/module.conf b/core/modules/slxbrowser/module.conf
index b31f5f8a..cbf2e6b1 100644
--- a/core/modules/slxbrowser/module.conf
+++ b/core/modules/slxbrowser/module.conf
@@ -1,8 +1,10 @@
#!/bin/bash
+REQUIRED_MODULES="
+ qt5core
+"
REQUIRED_GIT="git://git.openslx.org/openslx-ng/slxbrowser.git"
REQUIRED_PREFIX="/opt/openslx/bin"
REQUIRED_BINARIES="slxbrowser"
REQUIRED_LIBRARIES="
- libqxcb
libgstplayback
"
diff --git a/core/modules/slxbrowser/module.conf.ubuntu b/core/modules/slxbrowser/module.conf.ubuntu
index d60cc2b4..edb70374 100644
--- a/core/modules/slxbrowser/module.conf.ubuntu
+++ b/core/modules/slxbrowser/module.conf.ubuntu
@@ -1,10 +1,7 @@
#!/bin/bash
REQUIRED_INSTALLED_PACKAGES="
- cmake
- libqt5webkit5-dev
- libqt5gui5
+ libqt5webkit5-dev
"
REQUIRED_CONTENT_PACKAGES="
- libqt5gui5
gstreamer1.0-plugins-base
"
diff --git a/core/modules/vmchooser2/module.conf b/core/modules/vmchooser2/module.conf
index 1dcebb9a..c62a84c9 100644
--- a/core/modules/vmchooser2/module.conf
+++ b/core/modules/vmchooser2/module.conf
@@ -1,4 +1,7 @@
#!/bin/bash
+REQUIRED_MODULES="
+ qt5core
+"
REQUIRED_GIT="git://git.openslx.org/openslx-ng/vmchooser2.git"
REQUIRED_PREFIX="/opt/openslx/bin"
REQUIRED_BINARIES="vmchooser.real"
diff --git a/core/modules/vmchooser2/module.conf.ubuntu b/core/modules/vmchooser2/module.conf.ubuntu
deleted file mode 100644
index 286d01f1..00000000
--- a/core/modules/vmchooser2/module.conf.ubuntu
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
- cmake
- libqt5gui5
- qttools5-dev
-"
diff --git a/core/modules/vmchooser2/module.conf.ubuntu.17 b/core/modules/vmchooser2/module.conf.ubuntu.17
deleted file mode 100644
index 597eb825..00000000
--- a/core/modules/vmchooser2/module.conf.ubuntu.17
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
- cmake
- libqt5gui5
- libqt5x11extras5-dev
- qttools5-dev-tools
-"
diff --git a/core/modules/vmchooser2/module.conf.ubuntu.18 b/core/modules/vmchooser2/module.conf.ubuntu.18
deleted file mode 100644
index 597eb825..00000000
--- a/core/modules/vmchooser2/module.conf.ubuntu.18
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
- cmake
- libqt5gui5
- libqt5x11extras5-dev
- qttools5-dev-tools
-"
diff --git a/core/targets/stage32-bwlp/qt5core b/core/targets/stage32-bwlp/qt5core
new file mode 120000
index 00000000..18ee398d
--- /dev/null
+++ b/core/targets/stage32-bwlp/qt5core
@@ -0,0 +1 @@
+../../modules/qt5core \ No newline at end of file