diff options
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/busybox/module.conf | 4 | ||||
| -rw-r--r-- | remote/modules/kernel/module.build | 10 | ||||
| -rw-r--r-- | remote/modules/nvidia_libs/module.conf | 1 | ||||
| -rw-r--r-- | remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient | 10 | ||||
| -rw-r--r-- | remote/modules/pvs2/module.conf.fedora | 6 | ||||
| -rw-r--r-- | remote/modules/vmware/module.conf | 1 | ||||
| -rw-r--r-- | remote/modules/x11vnc/module.conf.fedora | 6 |
7 files changed, 23 insertions, 15 deletions
diff --git a/remote/modules/busybox/module.conf b/remote/modules/busybox/module.conf index 82d1731e..6acfa16c 100644 --- a/remote/modules/busybox/module.conf +++ b/remote/modules/busybox/module.conf @@ -2,6 +2,6 @@ REQUIRED_GIT="git://git.busybox.net/busybox" REQUIRED_BRANCH="1_22_1" REQUIRED_BINARIES="busybox" REQUIRED_DIRECTORIES=" - /usr/bin - /usr/sbin + /bin + /sbin " diff --git a/remote/modules/kernel/module.build b/remote/modules/kernel/module.build index 1d2aad7a..7d840c7b 100644 --- a/remote/modules/kernel/module.build +++ b/remote/modules/kernel/module.build @@ -2,17 +2,18 @@ # This overrides get_kernel_version from kernel.inc, so the variables will be set properly get_kernel_version() { + # Do not use MODULE_DIR here as this function might run when we process another module! [ -n "${TARGET_KERNEL_LONG}" ] && return 0 - [ ! -e "${MODULE_DIR}/ksrc/include/generated/utsrelease.h" ] && return 0 + [ ! -e "${TARGET_DIR}/kernel/ksrc/include/generated/utsrelease.h" ] && return 0 # determine kernel version that will be running in the generated system # declare kernel version stuff - declare -rg TARGET_KERNEL_LONG=$(grep 'UTS_RELEASE' "${MODULE_DIR}/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}') + declare -rg TARGET_KERNEL_LONG=$(grep 'UTS_RELEASE' "${TARGET_DIR}/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}') declare -rg TARGET_KERNEL_SHORT=$(echo "$TARGET_KERNEL_LONG" | grep -o -E '^[0-9\.]+') # declare path to kernel headers and modules/firmware - declare -rg KERNEL_HEADERS_DIR="${MODULE_DIR}/ksrc" - declare -rg KERNEL_BASE_DIR="${MODULE_DIR}/build" + declare -rg KERNEL_HEADERS_DIR="${TARGET_DIR}/kernel/ksrc" + declare -rg KERNEL_BASE_DIR="${TARGET_DIR}/kernel/build" # print debug info pinfo "TARGET_KERNEL_LONG: '$TARGET_KERNEL_LONG'" @@ -23,7 +24,6 @@ get_kernel_version() { fetch_source() { pdebug "getting kernel sources via git ...." [ -d ./ksrc ] && rm -rf ./ksrc - set -x git clone --depth 1 "${REQUIRED_GIT}" -b "${REQUIRED_GIT_BRANCH}" ksrc || perror "Could not clone kernel git." # check for aufs local RSL=$(find ksrc/ -type d -name aufs) diff --git a/remote/modules/nvidia_libs/module.conf b/remote/modules/nvidia_libs/module.conf index 274b3d4d..f54c114c 100644 --- a/remote/modules/nvidia_libs/module.conf +++ b/remote/modules/nvidia_libs/module.conf @@ -1,7 +1,6 @@ REQUIRED_VERSION="331.38" REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run" REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA" -REQUIRED_ORIGINAL_USR_SPLIT="yes" # Don't symlink /bin to /usr/bin etc. in build dir REQUIRED_FILES=" /etc/OpenCL/vendors/nvidia.icd diff --git a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient index 75ba0709..b33889df 100644 --- a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient +++ b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient @@ -1,11 +1,9 @@ #!/bin/ash # If the ENV var PVS has been set by vmchooser start pvsclient -if [ -n "$PVS" -a "$PVS" = "true" ]; then - if [ -n "$PVS_SESSIONID" ]; then - pvsclient --session-id "$PVS_SESSIONID" & - else - pvsclient & - fi +if [ -n "$PVS_SESSIONID" ]; then + pvsclient --session-id "$PVS_SESSIONID" & +else + pvsclient & fi diff --git a/remote/modules/pvs2/module.conf.fedora b/remote/modules/pvs2/module.conf.fedora new file mode 100644 index 00000000..6d2cd0f6 --- /dev/null +++ b/remote/modules/pvs2/module.conf.fedora @@ -0,0 +1,6 @@ +REQUIRED_INSTALLED_PACKAGES=" + qt-devel + libvncserver-devel +" +REQUIRED_CONTENT_PACKAGES=" +" diff --git a/remote/modules/vmware/module.conf b/remote/modules/vmware/module.conf index 42d73343..749a0838 100644 --- a/remote/modules/vmware/module.conf +++ b/remote/modules/vmware/module.conf @@ -1,5 +1,4 @@ REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/" -REQUIRED_ORIGINAL_USR_SPLIT="yes" # Don't symlink /bin to /usr/bin etc. in build dir REQUIRED_TYPE="workstation" REQUIRED_MODULES="kernel" REQUIRED_DIRECTORIES=" diff --git a/remote/modules/x11vnc/module.conf.fedora b/remote/modules/x11vnc/module.conf.fedora new file mode 100644 index 00000000..43ae3119 --- /dev/null +++ b/remote/modules/x11vnc/module.conf.fedora @@ -0,0 +1,6 @@ +REQUIRED_INSTALLED_PACKAGES=" + x11vnc +" +REQUIRED_CONTENT_PACKAGES=" + x11vnc +" |