diff options
| -rw-r--r-- | system/virtualxt/README | 36 | ||||
| -rw-r--r-- | system/virtualxt/virtualxt-wrapper.sh | 32 | ||||
| -rw-r--r-- | system/virtualxt/virtualxt.SlackBuild | 39 | ||||
| -rw-r--r-- | system/virtualxt/virtualxt.info | 6 |
4 files changed, 37 insertions, 76 deletions
diff --git a/system/virtualxt/README b/system/virtualxt/README index 3c5be46b1ef0..113ecf586e6b 100644 --- a/system/virtualxt/README +++ b/system/virtualxt/README @@ -16,12 +16,13 @@ by a comma. For example: -EXCLUDE_MODULES=fdc,network ./virtualxt.SlackBuild +EXCLUDE_MODULES=serial,network,covox ./virtualxt.SlackBuild The following modules cannot be excluded: adlib arstech_isa +bios cga ch36x_isa chipset @@ -31,43 +32,38 @@ ems joystick mouse rifs -serial_dbg +rtc +uart The virtualxt binary is built with an SDL2 frontend and meant to be run by a non-root user. The user will need to be added to the "users" group because the binary will open the provided boot images in read- -write mode and "users" has write access to those images. +write mode, and "users" has write access to those images. For example: usermod -aG users bob -The user's current working directory must be the same directory where -the virtualxt binary is installed. Because of this requirement, the -binary cannot be installed to a traditional location (e.g. /usr/bin/). +Either the LD_LIBRARY_PATH or LD_PRELOAD variable must be configured +to point to /usr/lib64/virtualxt. For bash users, this can be +accomplished as follows: -A wrapper script, virtualxt-wrapper.sh, has been provided so that the -user does not have to change to the directory where the virtualxt -binary is installed. This wrapper script may be found in -/usr/share/virtualxt/ and copied to a traditional location for -storing binaries. +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/virtualxt +echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/virtualxt" \ + >> ~/.bashrc -For example: +...or... -cp /usr/share/virtualxt/virtualxt-wrapper.sh \ - /usr/bin/virtualxt-wrapper.sh -chmod +x /usr/bin/virtualxt-wrapper.sh +LD_PRELOAD=/usr/lib64/virtualxt/libvxt.so virtualxt -The wrapper script may then be executed as if the user's current -working directory is actually the directory where the virtualxt binary -is installed. +The path to the boot image must be specified when running virtualxt. For example: -virtualxt-wrapper.sh -a boot/freedos.img +virtualxt -a /usr/share/virtualxt/boot/freedos.img If after upgrading from a previous version of virtualxt the console fails to start, then you may need to generate a new config file as follows: -virtualxt-wrapper.sh --clean +virtualxt --clean diff --git a/system/virtualxt/virtualxt-wrapper.sh b/system/virtualxt/virtualxt-wrapper.sh deleted file mode 100644 index 57a53b756155..000000000000 --- a/system/virtualxt/virtualxt-wrapper.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -## WRAPPER SCRIPT -## Changes current directory to virtualxt directory and passes arguments to -## actual virtualxt binary - -# Copyright 2023 Sean Eubanks <seanmeu@protonmail.com>, Cheraw, SC, USA -# All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -VIRTUALXT_HOME=/opt/virtualxt -ARGS_STR="$*" - -cd $VIRTUALXT_HOME -./virtualxt $ARGS_STR diff --git a/system/virtualxt/virtualxt.SlackBuild b/system/virtualxt/virtualxt.SlackBuild index ea63c7692443..c7fdc8623fa6 100644 --- a/system/virtualxt/virtualxt.SlackBuild +++ b/system/virtualxt/virtualxt.SlackBuild @@ -5,20 +5,20 @@ # Copyright 2023 Sean Eubanks <seanmeu@protonmail.com>, Cheraw, SC, USA # All rights reserved. # -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: # -# The above copyright notice and this permission notice shall be included in +# The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virtualxt -VERSION=${VERSION:-0.9} +VERSION=${VERSION:-0.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf virtualxt-$VERSION -unzip $CWD/$PRGNAM-$VERSION.zip +unzip $CWD/v$VERSION.zip cd virtualxt-$VERSION chown -R root:root . find -L . \ @@ -94,12 +94,13 @@ else fi make sdl2-frontend modules -# Create destination directory structure and copy files -# virtualxt binary expects bios and boot directories to be in same directory -DSTDIR=$PKG/opt/$PRGNAM +install -D -m 0755 build/bin/virtualxt $PKG/usr/bin/virtualxt +mkdir -p $PKG/usr/lib64/virtualxt +install -D -m 0755 build/bin/libvxt.so $PKG/usr/lib64/virtualxt/libvxt.so + +# Install BIOS, disk images, and modules +DSTDIR=$PKG/usr/share/$PRGNAM mkdir -p $DSTDIR -install -D -m 0755 build/bin/virtualxt $DSTDIR/virtualxt -install -D -m 0755 build/bin/libvxt.so $DSTDIR/libvxt.so mkdir $DSTDIR/bios && cp bios/*.bin bios/*.ROM $DSTDIR/bios/ mkdir $DSTDIR/boot && cp boot/*.img $DSTDIR/boot/ mkdir $DSTDIR/modules && cp modules/*.vxt $DSTDIR/modules/ @@ -120,10 +121,6 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Copy optional wrapper script -mkdir -p $PKG/usr/share/$PRGNAM -cat $CWD/virtualxt-wrapper.sh > $PKG/usr/share/$PRGNAM/virtualxt-wrapper.sh - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/virtualxt/virtualxt.info b/system/virtualxt/virtualxt.info index 8369dc71f399..61bf4d74fdb0 100644 --- a/system/virtualxt/virtualxt.info +++ b/system/virtualxt/virtualxt.info @@ -1,8 +1,8 @@ PRGNAM="virtualxt" -VERSION="0.9" +VERSION="0.10" HOMEPAGE="https://phix.itch.io/virtualxt" -DOWNLOAD="https://github.com/andreas-jonsson/virtualxt/archive/v0.9/virtualxt-0.9.zip" -MD5SUM="bd94d9d4d6e2d4f9f1ec9cd28a773ad5" +DOWNLOAD="https://github.com/andreas-jonsson/virtualxt/archive/v0.10/virtualxt-0.10.zip" +MD5SUM="880dd53bfddcc5b91fcb4a4a2303bb1f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="premake5" |