From bb47e55e74330aa881a737545e94c4e1243219c0 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Sep 2017 19:08:20 +0800 Subject: [PATCH] v1.1 --- aq.sh | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/aq.sh b/aq.sh index 10c9fa1..7ade8e8 100755 --- a/aq.sh +++ b/aq.sh @@ -46,8 +46,8 @@ init() { --enable-fdt --enable-bluez --enable-kvm \ --enable-colo --enable-linux-aio --enable-cap-ng --enable-attr --enable-vhost-net --enable-bzip2 \ - --enable-coroutine-pool --enable-tpm --enable-libssh2 --enable-replication \ - --disable-libiscsi --disable-libnfs --disable-libusb \ + --enable-coroutine-pool --enable-tpm --disable-libssh2 --enable-replication \ + --disable-libiscsi --disable-libnfs --disable-libusb --disable-smartcard --disable-usb-redir --disable-glusterfs --disable-seccomp \ " QEMU_CONFIGURE_2_8_1_1=" ./configure --prefix=${QEMU_PREFIX} --target-list=arm-linux-user,arm-softmmu \ @@ -59,8 +59,8 @@ init() { --enable-fdt --enable-bluez --enable-kvm \ --enable-colo --enable-linux-aio --enable-cap-ng --enable-attr --enable-vhost-net --enable-bzip2 \ - --enable-coroutine-pool --enable-tpm --enable-libssh2 --enable-replication \ - --disable-libiscsi --disable-libnfs --disable-libusb \ + --enable-coroutine-pool --enable-tpm --disable-libssh2 --enable-replication \ + --disable-libiscsi --disable-libnfs --disable-libusb --disable-smartcard --disable-usb-redir --disable-glusterfs --disable-seccomp \ " QEMU_CONFIGURE_2_10_0_RC0=" ./configure --prefix=${QEMU_PREFIX} --target-list=arm-linux-user,arm-softmmu,i386-linux-user,i386-softmmu \ @@ -121,8 +121,6 @@ initdate() { } helloworld() { - vvv=$(echo $OS_VER | cut -b1) - test $OS = "ubuntu" && vvv=$(echo $OS_VER | awk -F '.' '{print$1}') cat <> /dev/null 2>&1 & + BGEXEC_LOG_STATUS_FILE=/tmp/QEMU.log + bg_exec $@ >> $BGEXEC_LOG_STATUS_FILE 2>&1 & wait_pid $! ! test -f $BGEXEC_EXIT_STATUS_FILE && exit 2 } @@ -297,7 +298,7 @@ pkg_install() { echo -ne done\\n fi echo -n "Debian apt build-dep " - DEBIAN_FRONTEND=noninteractive bg_wait apt-get -qqy --force-yes build-dep qemu-system $APT + DEBIAN_FRONTEND=noninteractive bg_wait apt-get -qqy --force-yes build-dep qemu-system if test $(cat $BGEXEC_EXIT_STATUS_FILE) != "0" ; then echo -ne fail\\n-----------------------------\\n exit 1 @@ -313,7 +314,7 @@ pkg_install() { echo -ne done\\n fi echo -n "Ubuntu apt install " - DEBIAN_FRONTEND=noninteractive bg_wait apt-get -qqy --force-yes install build-essential git + DEBIAN_FRONTEND=noninteractive bg_wait apt-get -qqy --force-yes install build-essential git $APT if test $(cat $BGEXEC_EXIT_STATUS_FILE) != "0" ; then echo -ne fail\\n-----------------------------\\n exit 1 @@ -349,7 +350,7 @@ src_download() { tar_extract() { if ! test -d $QEMU_SRC_DIR; then echo -n +Extract QEMU .... - tar -axf $QEMU_TAR_SRC -C $SRC >> /dev/null 2>&1 + tar -axf $QEMU_TAR_SRC -C $SRC >> $BGEXEC_LOG_STATUS_FILE 2>&1 if ! test -d $QEMU_SRC_DIR ; then echo -ne \\b\\b\\b\\bfail\\n exit 2 @@ -362,7 +363,7 @@ tar_extract() { tar_create() { if test -d $QEMU_PREFIX ; then echo -n +Create QEMU $QEMU_BIN_TAR_CREATE_SRC .... - tar -cjf $QEMU_BIN_TAR_CREATE_SRC $QEMU_PREFIX > /dev/null 2>&1 + tar -cjf $QEMU_BIN_TAR_CREATE_SRC $QEMU_PREFIX >> $BGEXEC_LOG_STATUS_FILE 2>&1 if ! test -f $QEMU_BIN_TAR_CREATE_SRC ; then echo -ne \\b\\b\\b\\bfail\\n exit 2 @@ -481,7 +482,7 @@ install() { else echo -ne done\\n fi - make $MAKE_J >> /dev/null 2>&1 & + make $MAKE_J >> $BGEXEC_LOG_STATUS_FILE 2>&1 & echo -n Make QEMU\ ;wait_pid $! if test -x $QEMU_SRC_DIR/arm-softmmu/qemu-system-arm ; then echo -ne done\\n @@ -489,7 +490,7 @@ install() { echo -ne fail\\n exit 3 fi - make install >> /dev/null 2>&1 & + make install >> $BGEXEC_LOG_STATUS_FILE 2>&1 & echo -n Make install QEMU\ ;wait_pid $! if test -x $QEMU_PREFIX/bin/qemu-system-arm ; then echo -ne done\\n @@ -516,7 +517,7 @@ install() { else echo -ne done\\n fi - make $MAKE_J >> /dev/null 2>&1 & + make $MAKE_J >> $BGEXEC_LOG_STATUS_FILE 2>&1 & echo -n Make QEMU\ ;wait_pid $! if test -x $QEMU_GIT_SRC_DIR/arm-softmmu/qemu-system-arm ; then echo -ne done\\n @@ -524,7 +525,7 @@ install() { echo -ne fail\\n exit 3 fi - make install >> /dev/null 2>&1 & + make install >> $BGEXEC_LOG_STATUS_FILE 2>&1 & echo -n Make install QEMU\ ;wait_pid $! if test -x $QEMU_PREFIX/bin/qemu-system-arm ; then echo -ne done\\n @@ -546,12 +547,12 @@ init_exec() { cat <