From f1d7e588e39544aeddc16efceadcbd3bd8920379 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 10 Jun 2013 13:35:35 +0200 Subject: [rootfs-stage31] revert changing mac of eth0 --- remote/modules/kernel/kernel.build | 3 +++ remote/modules/kernel/patch-speaker | 6 ++++++ remote/rootfs/rootfs-stage31/data/bin/setup_network | 7 ++++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100755 remote/modules/kernel/patch-speaker (limited to 'remote') diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build index 27e00ac1..59bc8e99 100644 --- a/remote/modules/kernel/kernel.build +++ b/remote/modules/kernel/kernel.build @@ -26,6 +26,9 @@ fetch_source() { else pinfo "aufs detected in kernel source :)" fi + + # fix pc speaker + ./patch-speaker } build() { diff --git a/remote/modules/kernel/patch-speaker b/remote/modules/kernel/patch-speaker new file mode 100755 index 00000000..5d5a9f9a --- /dev/null +++ b/remote/modules/kernel/patch-speaker @@ -0,0 +1,6 @@ +#!/bin/bash + +if ! grep notes "ksrc/drivers/input/misc/pcspkr.c" > /dev/null; then + echo "Patching pc speaker :-)" + sed -i.nomusic -r 's#^static.*int.*pcspkr_event#static const int notes[] = { /*tetris*/ 1319, 988, 1047, 1175, 1047, 988, 880, 880, 1047, 1319, 1175, 1047, 988, 1047, 1175, 1319, 1047, 880, 880, 1175, 1397, 1760, 1568, 1397, 1319, 1047, 1319, 1175, 1047, 988, 988, 1047, 1175, 1319, 1047, 880, 880, /*mario*/ 660, 660, 660, 510, 660, 770, 380, 510, 380, 320, 440, 480, 450, 430, 380, 660, 760, 860, 700, 760, 660, 520, 580, 480, 510, 380, 320, 440, 480, 450, 430, 380, 660, 760, 860, 700, 760, 660, 520, 580, 480, 500, 760, 720, 680, 620, 650, 380, 430, 500, 430, 500, 570, 500, 760, 720, 680, 620, 650, 1020, 1020, 1020, 380, 500, 760, 720, 680, 620, 650, 380, 430, 500, 430, 500, 570, 500, 760, 720, 680, 620, 650, 1020, 1020, 1020, 380, 500, 760, 720, 680, 620, 650, 380, 430, 500, 430, 500, 570, 585, 550, 500, 380, 500, 500, 500, 500, 500, 500, 500, 580, 660, 500, 430, 380, 500, 500, 500, 500, 580, 660, 870, 760, 500, 500, 500, 500, 580, 660, 500, 430, 380, 660, 660, 660, 510, 660, 770, 380, /* elise */ 420, 400, 420, 400, 420, 315, 370, 335, 282, 180, 215, 282, 315, 213, 262, 315, 335, 213, 420, 400, 420, 400, 420, 315, 370, 335, 282, 180, 215, 282, 315, 213, 330, 315, 282 };\nstatic int notePos = 0;\n\n&#g;s#\s*if \(value > 20 && value < 32767\)#\n if (value) value = notes[notePos++ % (sizeof(notes) / sizeof(notes[0]))];\n\n&#g' "ksrc/drivers/input/misc/pcspkr.c" +fi diff --git a/remote/rootfs/rootfs-stage31/data/bin/setup_network b/remote/rootfs/rootfs-stage31/data/bin/setup_network index 57872244..8aedeaf1 100755 --- a/remote/rootfs/rootfs-stage31/data/bin/setup_network +++ b/remote/rootfs/rootfs-stage31/data/bin/setup_network @@ -14,9 +14,10 @@ BRIDGE="br0" SLAVE="eth0" BRIDGEMAC="$MAC" -# Flip mac address of original interface - this var is not local so init sees the changes too -MAC="$(echo "$MAC" | awk -F ':' '{printf $1 ":" $2 ":" $5 ":" $3 ":" $6 ":" $4}')" -ip link set addr "$MAC" "$SLAVE" +# Following was supposed to prevent scripts from getting confused by multiple interfaces with same MAC - does not work though +## Flip mac address of original interface - this var is not local so init sees the changes too +#MAC="$(echo "$MAC" | awk -F ':' '{printf $1 ":" $2 ":" $5 ":" $3 ":" $6 ":" $4}')" +#ip link set addr "$MAC" "$SLAVE" brctl addbr "$BRIDGE" || drop_shell "Could not create bridge $BRIDGE" brctl stp "$BRIDGE" 0 -- cgit v1.2.3-55-g7522 From e79ddcf985910078a2f27414240d2c1e0a883848 Mon Sep 17 00:00:00 2001 From: Michael Neves Date: Mon, 10 Jun 2013 14:56:07 +0200 Subject: [vmplayer] enable sound and 3D in vmplayer --- .../vmchooser/data/etc/openslx/vmchooser/virtualization.conf | 8 -------- remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 6 ++---- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 remote/modules/vmchooser/data/etc/openslx/vmchooser/virtualization.conf (limited to 'remote') diff --git a/remote/modules/vmchooser/data/etc/openslx/vmchooser/virtualization.conf b/remote/modules/vmchooser/data/etc/openslx/vmchooser/virtualization.conf deleted file mode 100644 index 8887ee6f..00000000 --- a/remote/modules/vmchooser/data/etc/openslx/vmchooser/virtualization.conf +++ /dev/null @@ -1,8 +0,0 @@ -totalmem=1000 -cpu_cores=1 -host_arch=i686 -vtflag=0 -hostmacaddr=00:0c:29:4e:ee:57 -hostip=132.230.4.54 -hostname=slx-client -cdrom_0=/dev/sr0 diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include index 837513d2..d3fa9981 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -174,8 +174,7 @@ ethernet0.address = \"00:50:56:${VM_ID}:${machostpart}\" ethernet0.wakeOnPcktRcv = \"FALSE\" # sound -#TODO: enable sound -sound.present = \"FALSE\" +sound.present = \"TRUE\" sound.fileName = \"-1\" sound.autodetect = \"TRUE\" sound.virtualdev = \"${sound}\" @@ -343,8 +342,7 @@ sound="es1371" # check for 3D configuration setting case "${enable3d}" in *true*|*yes*) - #TODO: enable 3D - enable3d="FALSE" + enable3d="TRUE" ;; *) enable3d="FALSE" -- cgit v1.2.3-55-g7522 From fa1c2cf93b27191a77a31fc0fa718f66de2c2956 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 10 Jun 2013 16:13:03 +0200 Subject: [systemd] patch PATH environment variable in systemd-src --- helper/binutil.inc | 22 +++++++++++----------- remote/modules/systemd/systemd.build | 5 ++++- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'remote') diff --git a/helper/binutil.inc b/helper/binutil.inc index 72a43ad2..9ad9e104 100644 --- a/helper/binutil.inc +++ b/helper/binutil.inc @@ -45,21 +45,21 @@ get_dynamic_dependencies() { if [ "x$1" == "x-l" ]; then LOCALSEARCH=1 shift - [ ! -d $1 ] && perror "Directory given does not exist, exiting." - LOCALSEARCHDIR=$1 + [ ! -d "$1" ] && perror "Directory '$1' does not exist, exiting." + LOCALSEARCHDIR="$1" shift fi # main loop over the list of binaries while [ $# != 0 ]; do - local BINARY=$1 + local BINARY="$1" shift # now run ldd on it and save the output in $LDD_OUT local LDD_OUT="ldd_output" - if ldd $BINARY > $LDD_OUT; then + if ldd "$BINARY" > "$LDD_OUT"; then # Case 1: file is a dynamic executable - for LIB in $(cat $LDD_OUT | grep -v "${CURRENT_BLACKLIST}" | awk '{print $1 $2 $3}'); do + for LIB in $(cat "$LDD_OUT" | grep -v "${CURRENT_BLACKLIST}" | awk '{print $1 $2 $3}'); do # split the entry into an array, ex: # libm.so.6 => /lib/libm.so.6 would be split into: # LIBLINK[0] LIBLINK[1] @@ -70,10 +70,10 @@ get_dynamic_dependencies() { else # Case 2: not a dynamic, do nothing pdebug "\t\t\t(Not a dynamic.)" - rm -f $LDD_OUT + rm -f "$LDD_OUT" continue fi - rm -f $LDD_OUT + rm -f "$LDD_OUT" done } @@ -92,16 +92,16 @@ get_dynamic_dependencies() { # If the local was activated in get_dynamic_dependencies # this will search for the library in LOCALSEARCHDIR first. # If its not found, then it will look system-wide. -lib_search(){ +lib_search() { # if activated, start by searching the lib locally if [ "x$LOCALSEARCH" == "x1" ]; then - cd $LOCALSEARCHDIR + cd "$LOCALSEARCHDIR" local LOCAL_MATCHES=$(find . -name "${LIBLINK[0]}") # | awk -F '.' '{print $1}')".so\*) - cd - &>/dev/null + cd - >/dev/null if [ "x${LOCAL_MATCHES}" != "x" ]; then for LOCALLIB in ${LOCAL_MATCHES}; do - get_link_chain "${LOCALSEARCHDIR}"/"${LOCALLIB}" "${LOCALSEARCHDIR}" + get_link_chain "${LOCALSEARCHDIR}/${LOCALLIB}" "${LOCALSEARCHDIR}" get_dynamic_dependencies -l "${LOCALSEARCHDIR}" "${LOCALLIB}" CURRENT_BLACKLIST+="\|${LIBLINK[0]}" done diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index a84cc7b3..a0a57b4d 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -3,7 +3,10 @@ fetch_source () { download_untar "$REQUIRED_URL" "src/" download_untar "$REQUIRED_LIBKMOD_URL" "src/" -} + # Patch PATH environment + sed -s -i -r 's#"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin(:/sbin:/bin)?"#& ":/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"#g' src/systemd-*/src/core/main.c + sed -s -i -r 's#"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"#& ":/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"#g' src/systemd-*/src/nspawn/nspawn.c +} build () { #build libkmod -- cgit v1.2.3-55-g7522 From 7cc24161052f2127f906ed1c1cd9564959ef9f25 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 10 Jun 2013 16:56:35 +0200 Subject: [binutil.h] Consider $REQUIRED_LDD_BLACKLIST when fetching dynamic dependencies [kdm] Blacklist libQtWebKit - it's 25M and of no use (yet?) --- helper/binutil.inc | 4 ++-- remote/modules/kdm/kdm.conf | 2 +- remote/setup_target | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'remote') diff --git a/helper/binutil.inc b/helper/binutil.inc index 9ad9e104..497ae75b 100644 --- a/helper/binutil.inc +++ b/helper/binutil.inc @@ -18,7 +18,7 @@ # ############################################################ # We use a blacklist mechanism to exclude common libraries. -# This improve runtime quite a bit... +# This improves runtime quite a bit... BLACKLIST="ld-linux linux-gate linux-vdso libc.so" # Initialise flag and path for local search @@ -59,7 +59,7 @@ get_dynamic_dependencies() { local LDD_OUT="ldd_output" if ldd "$BINARY" > "$LDD_OUT"; then # Case 1: file is a dynamic executable - for LIB in $(cat "$LDD_OUT" | grep -v "${CURRENT_BLACKLIST}" | awk '{print $1 $2 $3}'); do + for LIB in $(grep -v "${CURRENT_BLACKLIST}${REQUIRED_LDD_BLACKLIST}" "$LDD_OUT" | awk '{print $1 $2 $3}'); do # split the entry into an array, ex: # libm.so.6 => /lib/libm.so.6 would be split into: # LIBLINK[0] LIBLINK[1] diff --git a/remote/modules/kdm/kdm.conf b/remote/modules/kdm/kdm.conf index d59f0009..dd054cc2 100644 --- a/remote/modules/kdm/kdm.conf +++ b/remote/modules/kdm/kdm.conf @@ -30,4 +30,4 @@ REQUIRED_SYSTEM_FILES=" /usr/share/icons/oxygen/16x16/actions/system-reboot.png /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf /usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf /usr/share/icons/default/index.theme" - +REQUIRED_LDD_BLACKLIST="\|libQtWebKit" diff --git a/remote/setup_target b/remote/setup_target index 369cdbac..286daf3a 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -46,11 +46,11 @@ read_build () { copy_files_with_deps () { - [ ! -d $MODULE_BUILD_DIR ] && pinfo "No build directory found, skipping dependency copying" && return 0 - cd $MODULE_BUILD_DIR + [ ! -d "$MODULE_BUILD_DIR" ] && pinfo "No build directory found, skipping dependency copying" && return 0 + cd "$MODULE_BUILD_DIR" COPYFILES_LIST="list_wanted_stage3.2" - [ -e ${COPYFILES_LIST} ] && rm ${COPYFILES_LIST} + [ -e "${COPYFILES_LIST}" ] && rm "${COPYFILES_LIST}" [ ! -z "${REQUIRED_BINARIES}" ] && pinfo "Gathering required binaries from config file..." @@ -58,7 +58,7 @@ copy_files_with_deps () { do local FILE_CANDIDATES=$( find . -name "${FILENAME}" -a \( -type f -o -type l \) ) # only do if more than one candidate found - if [ $(echo $FILE_CANDIDATES | wc -w) -gt 1 ]; then + if [ "$(echo $FILE_CANDIDATES | wc -w)" -gt 1 ]; then pdebug "Candidates for $FILENAME are: $(echo $FILE_CANDIDATES)" local FINAL_LIST="" for FILE in $FILE_CANDIDATES; do @@ -82,7 +82,7 @@ copy_files_with_deps () { fi for FILE in $FINAL_LIST; do pdebug "* $FILE" - strip $FILE || pwarning "Could not strip '${FILE}'" + strip "$FILE" || pwarning "Could not strip '${FILE}'" get_link_chain "${MODULE_BUILD_DIR}/${FILE}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}" get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${FILE}" >> "${COPYFILES_LIST}" done @@ -94,7 +94,7 @@ copy_files_with_deps () { for LOCATION in $(find . -name ${LIB}.so\*) do pdebug "* $LOCATION" - strip $LOCATION || pwarning "Could not strip '${LOCATION}'" + strip "$LOCATION" || pwarning "Could not strip '${LOCATION}'" get_link_chain "${MODULE_BUILD_DIR}/${LOCATION}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}" get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${LOCATION}" >> "${COPYFILES_LIST}" done @@ -141,10 +141,10 @@ generate_target() { TARGET_BUILD_DIR="${MODE_DIR}/builds/${TARGET}" [ -e "${ROOT_DIR}/logs/${TARGET}.size" ] && . "${ROOT_DIR}/logs/${TARGET}.size" || echo "declare -A BUILD_SIZE" >> "${ROOT_DIR}/logs/${TARGET}.size" - [ -d $TARGET_DIR ] || perror "Given target directory does not exist: $TARGET_DIR" + [ -d "$TARGET_DIR" ] || perror "Given target directory does not exist: $TARGET_DIR" - [[ $TARGET == builds || $TARGET == modules ]] && \ - perror "Target directory cannot be named 'builds' nor 'modules'." + [[ "$TARGET" == "builds" || "$TARGET" == "modules" ]] && \ + perror "Target directory cannot be named 'builds' or 'modules'." pinfo "Generating '$TARGET_BUILD_DIR' for '$TARGET'" -- cgit v1.2.3-55-g7522 From 3d281a68fdf32770e143349f1dba87a6f7c284f2 Mon Sep 17 00:00:00 2001 From: Michael Neves Date: Mon, 10 Jun 2013 18:43:48 +0200 Subject: [alsa] new sound module IMPORTANT: sound only works as root due to ConsoleKit problem. --- remote/modules/alsa/alsa.build | 16 ++++++++++++++++ remote/modules/alsa/alsa.conf | 8 ++++++++ remote/modules/alsa/alsa.conf.zypper | 8 ++++++++ remote/targets/stage32/alsa | 1 + 4 files changed, 33 insertions(+) create mode 100644 remote/modules/alsa/alsa.build create mode 100644 remote/modules/alsa/alsa.conf create mode 100644 remote/modules/alsa/alsa.conf.zypper create mode 120000 remote/targets/stage32/alsa (limited to 'remote') diff --git a/remote/modules/alsa/alsa.build b/remote/modules/alsa/alsa.build new file mode 100644 index 00000000..03e55d72 --- /dev/null +++ b/remote/modules/alsa/alsa.build @@ -0,0 +1,16 @@ +fetch_source() { + : +} + +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/alsa/alsa.conf b/remote/modules/alsa/alsa.conf new file mode 100644 index 00000000..17baaaf8 --- /dev/null +++ b/remote/modules/alsa/alsa.conf @@ -0,0 +1,8 @@ +REQUIRED_CONTENT_PACKAGES=" alsa-utils + libasound2 +" +REQUIRED_BINARIES=" amixer +" +REQUIRED_DIRECTORIES=" /usr/share/alsa +" + diff --git a/remote/modules/alsa/alsa.conf.zypper b/remote/modules/alsa/alsa.conf.zypper new file mode 100644 index 00000000..68f0cd5e --- /dev/null +++ b/remote/modules/alsa/alsa.conf.zypper @@ -0,0 +1,8 @@ +REQUIRED_CONTEND_PACKAGES=" alsa-utils + libasound2 +" +REQUIRED_BINARIES=" amixer +" +REQUIRED_DIRECTORIES=" /usr/share/alsa +" + diff --git a/remote/targets/stage32/alsa b/remote/targets/stage32/alsa new file mode 120000 index 00000000..7e13d263 --- /dev/null +++ b/remote/targets/stage32/alsa @@ -0,0 +1 @@ +../../modules/alsa \ No newline at end of file -- cgit v1.2.3-55-g7522 From cebd1f023ab2f6cef7a70742b7766ee3abdcc298 Mon Sep 17 00:00:00 2001 From: Michael Neves Date: Mon, 10 Jun 2013 18:44:29 +0200 Subject: [vmchooser] remote old vmchooser test target. --- remote/targets/stage32-vmchooser/busybox | 1 - remote/targets/stage32-vmchooser/consolekit | 1 - remote/targets/stage32-vmchooser/dbus | 1 - remote/targets/stage32-vmchooser/debug | 1 - remote/targets/stage32-vmchooser/kdm | 1 - remote/targets/stage32-vmchooser/kernel | 1 - remote/targets/stage32-vmchooser/pam | 1 - remote/targets/stage32-vmchooser/plymouth | 1 - remote/targets/stage32-vmchooser/policykit | 1 - remote/targets/stage32-vmchooser/rootfs-stage32 | 1 - remote/targets/stage32-vmchooser/rsyslogd | 1 - remote/targets/stage32-vmchooser/sshd | 1 - remote/targets/stage32-vmchooser/systemd | 1 - remote/targets/stage32-vmchooser/vmchooser | 1 - remote/targets/stage32-vmchooser/xorg | 1 - 15 files changed, 15 deletions(-) delete mode 120000 remote/targets/stage32-vmchooser/busybox delete mode 120000 remote/targets/stage32-vmchooser/consolekit delete mode 120000 remote/targets/stage32-vmchooser/dbus delete mode 120000 remote/targets/stage32-vmchooser/debug delete mode 120000 remote/targets/stage32-vmchooser/kdm delete mode 120000 remote/targets/stage32-vmchooser/kernel delete mode 120000 remote/targets/stage32-vmchooser/pam delete mode 120000 remote/targets/stage32-vmchooser/plymouth delete mode 120000 remote/targets/stage32-vmchooser/policykit delete mode 120000 remote/targets/stage32-vmchooser/rootfs-stage32 delete mode 120000 remote/targets/stage32-vmchooser/rsyslogd delete mode 120000 remote/targets/stage32-vmchooser/sshd delete mode 120000 remote/targets/stage32-vmchooser/systemd delete mode 120000 remote/targets/stage32-vmchooser/vmchooser delete mode 120000 remote/targets/stage32-vmchooser/xorg (limited to 'remote') diff --git a/remote/targets/stage32-vmchooser/busybox b/remote/targets/stage32-vmchooser/busybox deleted file mode 120000 index 4f45cedf..00000000 --- a/remote/targets/stage32-vmchooser/busybox +++ /dev/null @@ -1 +0,0 @@ -../../modules/busybox \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/consolekit b/remote/targets/stage32-vmchooser/consolekit deleted file mode 120000 index 261968c7..00000000 --- a/remote/targets/stage32-vmchooser/consolekit +++ /dev/null @@ -1 +0,0 @@ -../../modules/consolekit \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/dbus b/remote/targets/stage32-vmchooser/dbus deleted file mode 120000 index dd148715..00000000 --- a/remote/targets/stage32-vmchooser/dbus +++ /dev/null @@ -1 +0,0 @@ -../../modules/dbus \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/debug b/remote/targets/stage32-vmchooser/debug deleted file mode 120000 index c05237d6..00000000 --- a/remote/targets/stage32-vmchooser/debug +++ /dev/null @@ -1 +0,0 @@ -../../modules/debug \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/kdm b/remote/targets/stage32-vmchooser/kdm deleted file mode 120000 index 727ed5b5..00000000 --- a/remote/targets/stage32-vmchooser/kdm +++ /dev/null @@ -1 +0,0 @@ -../../modules/kdm \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/kernel b/remote/targets/stage32-vmchooser/kernel deleted file mode 120000 index 044f086d..00000000 --- a/remote/targets/stage32-vmchooser/kernel +++ /dev/null @@ -1 +0,0 @@ -../../modules/kernel \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/pam b/remote/targets/stage32-vmchooser/pam deleted file mode 120000 index 588acdbf..00000000 --- a/remote/targets/stage32-vmchooser/pam +++ /dev/null @@ -1 +0,0 @@ -../../modules/pam \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/plymouth b/remote/targets/stage32-vmchooser/plymouth deleted file mode 120000 index 66a16832..00000000 --- a/remote/targets/stage32-vmchooser/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../modules/plymouth \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/policykit b/remote/targets/stage32-vmchooser/policykit deleted file mode 120000 index 39b77c7f..00000000 --- a/remote/targets/stage32-vmchooser/policykit +++ /dev/null @@ -1 +0,0 @@ -../../modules/policykit \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/rootfs-stage32 b/remote/targets/stage32-vmchooser/rootfs-stage32 deleted file mode 120000 index 96dcbb86..00000000 --- a/remote/targets/stage32-vmchooser/rootfs-stage32 +++ /dev/null @@ -1 +0,0 @@ -../../rootfs/rootfs-stage32 \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/rsyslogd b/remote/targets/stage32-vmchooser/rsyslogd deleted file mode 120000 index 339d02f8..00000000 --- a/remote/targets/stage32-vmchooser/rsyslogd +++ /dev/null @@ -1 +0,0 @@ -../../modules/rsyslogd \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/sshd b/remote/targets/stage32-vmchooser/sshd deleted file mode 120000 index 56b4e4b5..00000000 --- a/remote/targets/stage32-vmchooser/sshd +++ /dev/null @@ -1 +0,0 @@ -../../modules/sshd \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/systemd b/remote/targets/stage32-vmchooser/systemd deleted file mode 120000 index 2dc58bd3..00000000 --- a/remote/targets/stage32-vmchooser/systemd +++ /dev/null @@ -1 +0,0 @@ -../../modules/systemd \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/vmchooser b/remote/targets/stage32-vmchooser/vmchooser deleted file mode 120000 index 4d883e71..00000000 --- a/remote/targets/stage32-vmchooser/vmchooser +++ /dev/null @@ -1 +0,0 @@ -../../modules/vmchooser/ \ No newline at end of file diff --git a/remote/targets/stage32-vmchooser/xorg b/remote/targets/stage32-vmchooser/xorg deleted file mode 120000 index a9494860..00000000 --- a/remote/targets/stage32-vmchooser/xorg +++ /dev/null @@ -1 +0,0 @@ -../../modules/xorg \ No newline at end of file -- cgit v1.2.3-55-g7522 From 8e184e0fcb66996e4427587b28620c827dda20f1 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 11 Jun 2013 11:43:37 +0200 Subject: identical --- remote/modules/alsa/alsa.conf.zypper | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 remote/modules/alsa/alsa.conf.zypper (limited to 'remote') diff --git a/remote/modules/alsa/alsa.conf.zypper b/remote/modules/alsa/alsa.conf.zypper deleted file mode 100644 index 68f0cd5e..00000000 --- a/remote/modules/alsa/alsa.conf.zypper +++ /dev/null @@ -1,8 +0,0 @@ -REQUIRED_CONTEND_PACKAGES=" alsa-utils - libasound2 -" -REQUIRED_BINARIES=" amixer -" -REQUIRED_DIRECTORIES=" /usr/share/alsa -" - -- cgit v1.2.3-55-g7522 From 27732611c8a6b3e7aeae47b98927e1a23d20b1a6 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 11 Jun 2013 15:21:19 +0200 Subject: [vmplayer] clean up run-virt.include: drop support for old player versions [vmplayer] limit RAM to 3800MB on 32bit [xorg] include libglx on openSUSE [rootfs-stage32] add gfx driver loading service - currently not actually loading them, but checking for i915 gfx to enable 3D support in VMWare Player --- .../data/etc/openslx/vmware/run-virt.include | 448 +++++++++++---------- .../modules/vmplayer/data/opt/openslx/bin/vmplayer | 4 + remote/modules/xorg/xorg.conf.zypper | 1 + .../etc/systemd/system/load-gfx-driver.service | 9 + .../sysinit.target.wants/load-gfx-driver.service | 1 + .../data/opt/openslx/bin/load-gfx-driver | 16 + remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 7 +- .../rootfs-stage32/rootfs-stage32.conf.zypper | 7 +- remote/targets/stage32-opensuse/alsa | 1 + 9 files changed, 274 insertions(+), 220 deletions(-) create mode 100644 remote/rootfs/rootfs-stage32/data/etc/systemd/system/load-gfx-driver.service create mode 120000 remote/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/load-gfx-driver.service create mode 100755 remote/rootfs/rootfs-stage32/data/opt/openslx/bin/load-gfx-driver create mode 120000 remote/targets/stage32-opensuse/alsa (limited to 'remote') diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include index d3fa9981..9b0fea91 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -20,7 +20,7 @@ runvmwareconfheader () { -echo "# This configuration file was generated by $0" >${conffile} +echo "# This configuration file was generated by $0" > "$conffile" # check for the ostype case "${vmostype}" in @@ -48,6 +48,7 @@ case "${vmostype}" in ;; windows7*) shfolders="TRUE" + enable3d="TRUE" ;; windows8*) shfolders="TRUE" @@ -71,120 +72,104 @@ case "${vmostype}" in shfolders="FALSE" ;; esac -case "$vmversion" in - *) - svga_autodetect="TRUE" - numvcpus="1" - echo ".encoding = \"UTF-8\" -# version specific stuff - all versions -config.version = \"8\"" >>${conffile} - ;; -esac -case "$vmversion" in - 2.*|3.*|4.*|5.*|6.*|7.*|8.*|9.*) - [ ${shfolders} == FALSE ] || echo " -# version specific stuff - ver. 2.*|3.*|6.*|7.*|8.*|9.* -sharedFolder.option = \"alwaysEnabled\"" >>${conffile} - ;; -esac -case "$vmversion" in - 2.5|3.*|4.*|5.*|6.5|7.*|8.*|9.*) - if [ "${cpu_cores}" -ge "2" 2>/dev/null ]; then - numvcpus="2" - fi - if [ "${mem}" -ge "8000" 2>/dev/null ]; then - mem=8000 - fi - cap3d="TRUE" # helper var for loging output - echo " -# version specific stuff - ver. 2.5|3.*|6.5|7.* -ehci.present = \"TRUE\" -mks.enable3d = \"${enable3d}\"" >>${conffile} - ;; -esac -case "$vmversion" in - 3.*|4.*|7.*|8.*|9.*) - numvcpus="${cpu_cores}" - if [ "${cpu_cores}" -ge "4" 2>/dev/null ]; then - numvcpus="4" - fi - # svga_autodetect="FALSE" # if defined manual, see below - echo " + +svga_autodetect="TRUE" + +numvcpus="${cpu_cores}" +[ "${cpu_cores}" -ge "4" 2>/dev/null ] && numvcpus="4" + +if [ "x$shfolders" != "xFALSE" ]; then + ENABLE_SHARE='sharedFolder.option = "alwaysEnabled"' +else + ENABLE_SHARE='' +fi + +[ "${mem}" -ge "8000" ] && mem=8000 + +cap3d="WHAT IS THIS VAR USED FOR?" # helper var for loging output + +cat >> "$conffile" <>${conffile} - ;; -esac +cpuid.coresPerSocket = "$cpu_cores" +maxvcpus = "4" +monitor.virtual_mmu = "automatic" +monitor.virtual_exec = "automatic" +floppy1.clientDevice = "FALSE" +floppy1.readonly = "TRUE" -echo " # id -virtualHW.version = \"${hwver}\" -displayName = \"${displayname}\" -guestOS = \"${vmostype}\" +virtualHW.version = "$hwver" +displayName = "$displayname" +guestOS = "$vmostype" # CPU/MEM -numvcpus = \"${numvcpus}\" -memsize = \"${mem}\" -MemAllowAutoScaleDown = \"FALSE\" -MemTrimRate = \"-1\" +numvcpus = "$numvcpus" +memsize = "$mem" +MemAllowAutoScaleDown = "FALSE" +MemTrimRate = "-1" # ide-disks -ide0:0.present = \"${ide}\" -ide0:0.fileName = \"${diskfile}\" -ide0:0.mode = \"independent-nonpersistent\" -ide1:0.present = \"${cdrom0}\" -ide1:0.autodetect = \"TRUE\" -ide1:0.fileName = \"auto detect\" -ide1:0.deviceType = \"cdrom-raw\" -ide1:1.present = \"${cdrom1}\" -ide1:1.autodetect = \"TRUE\" -ide1:1.fileName = \"auto detect\" -ide1:1.deviceType = \"cdrom-raw\" +ide0:0.present = "$ide" +ide0:0.fileName = "$diskfile" +ide0:0.mode = "independent-nonpersistent" +ide1:0.present = "$cdrom0" +ide1:0.autodetect = "TRUE" +ide1:0.fileName = "auto detect" +ide1:0.deviceType = "cdrom-raw" +ide1:1.present = "$cdrom1" +ide1:1.autodetect = "TRUE" +ide1:1.fileName = "auto detect" +ide1:1.deviceType = "cdrom-raw" # scsi-disks -scsi0.present = \"${scsi}\" -scsi0:0.present = \"${scsi}\" -scsi0:0.fileName = \"${diskfile}\" -scsi0.virtualDev = \"${hddrv}\" -scsi0:0.mode = \"independent-nonpersistent\" +scsi0.present = "$scsi" +scsi0:0.present = "$scsi" +scsi0:0.fileName = "$diskfile" +scsi0.virtualDev = "$hddrv" +scsi0:0.mode = "independent-nonpersistent" # floppies -floppy0.present = \"${floppy0}\" -floppy0.startConnected = \"FALSE\" -floppy0.autodetect = \"TRUE\" -floppy0.fileName = \"auto detect\" +floppy0.present = "$floppy0" +floppy0.startConnected = "FALSE" +floppy0.autodetect = "TRUE" +floppy0.fileName = "auto detect" + # we need floppy b: for our windows client configuration -floppy1.present = \"${floppy1}\" -floppy1.startConnected = \"TRUE\" -floppy1.fileType = \"file\" -floppy1.fileName = \"${floppy1name}\" +floppy1.present = "$floppy1" +floppy1.startConnected = "TRUE" +floppy1.fileType = "file" +floppy1.fileName = "$floppy1name" # nics -ethernet0.present = \"TRUE\" -ethernet0.addressType = \"static\" -${network_virtualDev} -ethernet0.connectionType = \"${network_kind}\" -#ethernet1.connectionType = \"custom\" -#ethernet1.vnet = \"/dev/vmnet2\" -ethernet0.address = \"00:50:56:${VM_ID}:${machostpart}\" -ethernet0.wakeOnPcktRcv = \"FALSE\" +ethernet0.present = "TRUE" +ethernet0.addressType = "static" +$network_virtualDev +ethernet0.connectionType = "$network_kind" +#ethernet1.connectionType = "custom" +#ethernet1.vnet = "/dev/vmnet2" +ethernet0.address = "00:50:56:$VM_ID:$machostpart" +ethernet0.wakeOnPcktRcv = "FALSE" # sound -sound.present = \"TRUE\" -sound.fileName = \"-1\" -sound.autodetect = \"TRUE\" -sound.virtualdev = \"${sound}\" +sound.present = "TRUE" +sound.fileName = "-1" +sound.autodetect = "TRUE" +sound.virtualdev = "$sound" # svga -svga.autodetect = \"${svga_autodetect}\" +svga.autodetect = "$svga_autodetect" # usb -usb.present = \"TRUE\" -usb.generic.autoconnect = \"TRUE\" +usb.present = "TRUE" +usb.generic.autoconnect = "TRUE" # pci configuration usb.pciSlotNumber = "16" @@ -194,35 +179,37 @@ ehci.pciSlotNumber = "19" scsi0.pciSlotNumber = "20" # shared folders -sharedFolder0.present = \"${shfolders}\" -sharedFolder0.enabled = \"${shfolders}\" -sharedFolder0.expiration = \"never\" -sharedFolder0.guestName = \"${sharename}\" -sharedFolder0.hostPath = \"${sharepath}\" -sharedFolder0.readAccess = \"TRUE\" -sharedFolder0.writeAccess = \"TRUE\" -sharedFolder.maxNum = \"1\" +$ENABLE_SHARE +sharedFolder0.present = "$shfolders" +sharedFolder0.enabled = "$shfolders" +sharedFolder0.expiration = "never" +sharedFolder0.guestName = "$sharename" +sharedFolder0.hostPath = "$sharepath" +sharedFolder0.readAccess = "TRUE" +sharedFolder0.writeAccess = "TRUE" +sharedFolder.maxNum = "1" # dirs/configs -tmpDirectory = \"${redodir}\" -redoLogDir = \"${redodir}\" -mainMem.useNamedFile = \"TRUE\" -snapshot.disabled = \"TRUE\" -tools.syncTime = \"TRUE\" -isolation.tools.hgfs.disable = \"FALSE\" -hgfs.mapRootShare = \"TRUE\" -isolation.tools.dnd.disable = \"FALSE\" -isolation.tools.copy.enable = \"TRUE\" -isolation.tools.paste.enabled = \"TRUE\" +tmpDirectory = "$redodir" +redoLogDir = "$redodir" +mainMem.useNamedFile = "TRUE" +snapshot.disabled = "TRUE" +tools.syncTime = "TRUE" +isolation.tools.hgfs.disable = "FALSE" +hgfs.mapRootShare = "TRUE" +isolation.tools.dnd.disable = "FALSE" +isolation.tools.copy.enable = "TRUE" +isolation.tools.paste.enabled = "TRUE" # serial port -serial0.present = \"${serial}\" -${serialdev} +serial0.present = "$serial" +$serialdev # parallel port -parallel0.present = \"${parallel}\" -parallel0.bidirectional = \"${paralbidi}\" -${paraldev}" >>${conffile} +parallel0.present = "$parallel" +parallel0.bidirectional = "$paralbidi" +$paraldev +HEREEND # set the appropriate permissions for the vmware config file chmod u+rwx ${conffile} >/dev/null 2>&1 @@ -230,67 +217,72 @@ chmod u+rwx ${conffile} >/dev/null 2>&1 preferencesheader () { -echo ".encoding = \"UTF-8\" + cat > "$vmhome/preferences" <${vmhome}/preferences +HEREEND # different eula parameters from Workstation 9+/ Player 5+ -case "$vmversion" in + case "$vmversion" in 3.*|4.*|7.*|8.*) - echo " -pref.eula.size = \"2\" -pref.eula.0.appName = \"VMware Player\" -pref.eula.0.buildNumber = \"${vmbuild}\" -pref.eula.1.appName = \"VMware Workstation\" -pref.eula.1.buildNumber = \"${vmbuild}\"" >>${vmhome}/preferences + cat >> "$vmhome/preferences" <>${vmhome}/preferences + cat >> "$vmhome/preferences" </dev/null 2>&1 -mkdir -p ${confdir} >/dev/null 2>&1 -mkdir -p ${vmhome}/dndlogs >/dev/null 2>&1 -touch ${vmhome}/dndlogs/dndlog.conf >/dev/null 2>&1 +mkdir -p "$redodir" >/dev/null 2>&1 +mkdir -p "$confdir" >/dev/null 2>&1 +mkdir -p "$vmhome/dndlogs" >/dev/null 2>&1 +touch "$vmhome/dndlogs/dndlog.conf" >/dev/null 2>&1 # create preferences preferencesheader # create VMware startup file runvmwareconfheader + # link to conffile if confdir != redodir -ln -s ${conffile} ${redodir}/run-vmware.conf >/dev/null 2>&1 +ln -s "$conffile" "$redodir/run-vmware.conf" >/dev/null 2>&1 # sync is needed to ensure that data is really written to virtual disk sync @@ -423,7 +439,7 @@ sync # own nvram. We need it for floppy drive b, default nvram has just drive a # TODO: optimize, currently kinda inefficient, too much copys, but we # don't know which one is installed... -cp /etc/openslx/vmware/nvram ${confdir}/nvram 2>/dev/null +cp "/etc/openslx/vmware/nvram" "$confdir/nvram" 2>/dev/null # logging and stdout diff --git a/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer b/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer index 030e9175..147f514f 100755 --- a/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer +++ b/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer @@ -1,6 +1,10 @@ #!/bin/sh # radically simplified version of the original script vmplayer by VMware Inc. PREFIX=/usr/lib/vmware # depends on the vmware location + +# HACK: Let the OpenGL driver report s3tc capability even if not present, so 3D will be enabled +export force_s3tc_enable=true + exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ "$PREFIX"'/lib' \ "$PREFIX"'/bin/vmplayer' \ diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper index e0636dd7..33aba5eb 100644 --- a/remote/modules/xorg/xorg.conf.zypper +++ b/remote/modules/xorg/xorg.conf.zypper @@ -23,6 +23,7 @@ REQUIRED_CONTENT_PACKAGES=" xorg-x11 xkeyboard-config xkbcomp dejavu-fonts + libxcb-glx0 kdm-branding-openSUSE" REQUIRED_BINARIES=" Xorg gtf diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/load-gfx-driver.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/load-gfx-driver.service new file mode 100644 index 00000000..bdf3258c --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/load-gfx-driver.service @@ -0,0 +1,9 @@ +[Unit] +Description=Load DRM GFX driver and 3D +Before=sysinit.target shutdown.target +DefaultDependencies=no + +[Service] +Type=oneshot +ExecStart=/opt/openslx/bin/load-gfx-driver +RemainAfterExit=yes diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/load-gfx-driver.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/load-gfx-driver.service new file mode 120000 index 00000000..b72d0453 --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/load-gfx-driver.service @@ -0,0 +1 @@ +../load-gfx-driver.service \ No newline at end of file diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/load-gfx-driver b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/load-gfx-driver new file mode 100755 index 00000000..04fbea6e --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/load-gfx-driver @@ -0,0 +1,16 @@ +#!/bin/bash + +PCIFILE=/tmp/lspci-output + +if ! lspci -n > "$PCIFILE"; then + echo "lspci -n failed..." + exit 1 +fi + +if grep -E ' 8086:0152( |$)' "$PCIFILE" > /dev/null; then + echo "i915 - enable 3D" + echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" +fi + +exit 0 + diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index a2dd3987..5437621d 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -50,7 +50,8 @@ REQUIRED_LIBRARIES=" libcap libresolv libau" REQUIRED_DIRECTORIES="/lib/xtables" -REQUIRED_FILES=" /etc/issue +REQUIRED_FILES=" + /etc/issue /etc/inputrc /etc/localtime /etc/login.defs @@ -61,7 +62,9 @@ REQUIRED_FILES=" /etc/issue /etc/netconfig /etc/modprobe.d/blacklist.conf /etc/fonts/fonts.conf - /etc/X11/app-defaults/Xvidtune" + /etc/X11/app-defaults/Xvidtune + /etc/ld.so.cache +" REQUIRED_KERNEL_MODULES=" kernel/drivers/cpufreq kernel/drivers/memstick kernel/drivers/mfd diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper index 89ffb6a1..70fa2a2f 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper @@ -20,7 +20,8 @@ REQUIRED_LIBRARIES=" libcap libtinfo libresolv libau" -REQUIRED_FILES=" /etc/issue +REQUIRED_FILES=" + /etc/issue /etc/inputrc /etc/localtime /etc/login.defs @@ -29,7 +30,9 @@ REQUIRED_FILES=" /etc/issue /etc/services /etc/networks /etc/netconfig - /usr/share/X11/app-defaults/Xvidtune" + /usr/share/X11/app-defaults/Xvidtune + /etc/ld.so.cache +" REQUIRED_KERNEL_MODULES=" kernel/drivers/cpufreq kernel/drivers/memstick kernel/drivers/mfd diff --git a/remote/targets/stage32-opensuse/alsa b/remote/targets/stage32-opensuse/alsa new file mode 120000 index 00000000..7e13d263 --- /dev/null +++ b/remote/targets/stage32-opensuse/alsa @@ -0,0 +1 @@ +../../modules/alsa \ No newline at end of file -- cgit v1.2.3-55-g7522