fix android-x86 net; upgrades
This commit is contained in:
parent
ab32c4d217
commit
531515ac6b
5 changed files with 11 additions and 5 deletions
|
@ -1,6 +1,8 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# variables
|
# variables
|
||||||
|
RUNNING_USER=${RUNNING_USER:-gwh}
|
||||||
|
RUNNING_GROUP=${RUNNING_GROUP:-users}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-1}
|
||||||
|
|
||||||
TAG=cyco
|
TAG=cyco
|
||||||
|
@ -28,9 +30,11 @@ VERSION="$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d
|
||||||
|
|
||||||
mkdir -p $PKG/opt
|
mkdir -p $PKG/opt
|
||||||
cp -r $REPOSITORY $PKG/opt/
|
cp -r $REPOSITORY $PKG/opt/
|
||||||
|
chown -R ${RUNNING_USER}:${RUNNING_GROUP} $PKG/opt/$PRGNAM
|
||||||
|
|
||||||
mkdir -p $PKG/etc/rc.d/
|
mkdir -p $PKG/etc/rc.d/
|
||||||
cp -r $CWD/rc $PKG/etc/rc.d/rc.$PRGNAM
|
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
|
cd $PKG/opt/$PRGNAM
|
||||||
# change default password
|
# change default password
|
||||||
|
@ -40,11 +44,13 @@ pip3 install --target vendor -r requirements.txt
|
||||||
|
|
||||||
# correction
|
# correction
|
||||||
cd $PKG
|
cd $PKG
|
||||||
chown -R root:root *
|
|
||||||
|
|
||||||
# embaumement
|
# embaumement
|
||||||
mkdir -p $PKG/install
|
mkdir -p $PKG/install
|
||||||
|
|
||||||
|
# cat <<EOF > $PKG/install/doinst
|
||||||
|
# chown -R ${RUNNING_USER}:${RUNNING_GROUP} /opt/$PRGNAM
|
||||||
|
# EOF
|
||||||
|
|
||||||
cat <<EOF > $PKG/install/slack-desc
|
cat <<EOF > $PKG/install/slack-desc
|
||||||
# HOW TO EDIT THIS FILE:
|
# HOW TO EDIT THIS FILE:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#Slackware startup deamon script
|
#Slackware startup deamon script
|
||||||
|
|
||||||
USER=root
|
USER=RUNNING_USER
|
||||||
|
|
||||||
DAEMON="python3 /opt/calibre-web/cps.py"
|
DAEMON="python3 /opt/calibre-web/cps.py"
|
||||||
PIDFILE=/var/run/calibre-web.pid
|
PIDFILE=/var/run/calibre-web.pid
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
CWD=$(pwd)
|
CWD=$(pwd)
|
||||||
|
|
||||||
PRGNAM=$(basename $CWD)
|
PRGNAM=$(basename $CWD)
|
||||||
VERSION=${VERSION:-8.1-r2}
|
VERSION=${VERSION:-9.0-rc2}
|
||||||
BUILD=1
|
BUILD=1
|
||||||
TAG=cyco
|
TAG=cyco
|
||||||
ARCH=$(uname -m)
|
ARCH=$(uname -m)
|
||||||
|
|
|
@ -43,7 +43,7 @@ elif [ -d $ANDROID_DATA_DIR/data ]; then
|
||||||
fi
|
fi
|
||||||
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"
|
QEMU_DISPLAY="-vga std -display gtk"
|
||||||
|
|
||||||
run_qemu()
|
run_qemu()
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
CWD=$(pwd)
|
CWD=$(pwd)
|
||||||
|
|
||||||
PRGNAM=$(basename $CWD)
|
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)
|
ARCH=$(uname -m)
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-1}
|
||||||
TAG=${TAG:-cyco}
|
TAG=${TAG:-cyco}
|
||||||
|
|
Loading…
Reference in a new issue