fix android-x86 net; upgrades

This commit is contained in:
Gwenhael Le Moine 2020-02-23 16:58:09 +01:00
parent ab32c4d217
commit 531515ac6b
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
5 changed files with 11 additions and 5 deletions

View file

@ -1,6 +1,8 @@
#!/bin/sh
# variables
RUNNING_USER=${RUNNING_USER:-gwh}
RUNNING_GROUP=${RUNNING_GROUP:-users}
BUILD=${BUILD:-1}
TAG=cyco
@ -28,9 +30,11 @@ VERSION="$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d
mkdir -p $PKG/opt
cp -r $REPOSITORY $PKG/opt/
chown -R ${RUNNING_USER}:${RUNNING_GROUP} $PKG/opt/$PRGNAM
mkdir -p $PKG/etc/rc.d/
cp -r $CWD/rc $PKG/etc/rc.d/rc.$PRGNAM
sed -i "s|RUNNING_USER|$RUNNING_USER|" $PKG/etc/rc.d/rc.$PRGNAM
cd $PKG/opt/$PRGNAM
# change default password
@ -40,11 +44,13 @@ pip3 install --target vendor -r requirements.txt
# correction
cd $PKG
chown -R root:root *
# embaumement
mkdir -p $PKG/install
# cat <<EOF > $PKG/install/doinst
# chown -R ${RUNNING_USER}:${RUNNING_GROUP} /opt/$PRGNAM
# EOF
cat <<EOF > $PKG/install/slack-desc
# HOW TO EDIT THIS FILE:

View file

@ -1,7 +1,7 @@
#!/bin/bash
#Slackware startup deamon script
USER=root
USER=RUNNING_USER
DAEMON="python3 /opt/calibre-web/cps.py"
PIDFILE=/var/run/calibre-web.pid

View file

@ -3,7 +3,7 @@
CWD=$(pwd)
PRGNAM=$(basename $CWD)
VERSION=${VERSION:-8.1-r2}
VERSION=${VERSION:-9.0-rc2}
BUILD=1
TAG=cyco
ARCH=$(uname -m)

View file

@ -43,7 +43,7 @@ elif [ -d $ANDROID_DATA_DIR/data ]; then
fi
fi
NET="-net nic,model=e1000 -net user -netdev user,id=mynet,hostfwd=tcp::5555-:5555 -device virtio-net-pci,netdev=mynet"
NET="-netdev user,id=mynet,hostfwd=tcp::$port-:5555 -device virtio-net-pci,netdev=mynet"
QEMU_DISPLAY="-vga std -display gtk"
run_qemu()

View file

@ -3,7 +3,7 @@
CWD=$(pwd)
PRGNAM=$(basename $CWD)
VERSION=${VERSION:-2.1.5965} #$(wget -O - -o /dev/null http://status.calibre-ebook.com/latest)}
VERSION=${VERSION:-2.1.9618}
ARCH=$(uname -m)
BUILD=${BUILD:-1}
TAG=${TAG:-cyco}