diff --git a/build.sh b/build.sh index 9c2e552..e145979 100755 --- a/build.sh +++ b/build.sh @@ -59,7 +59,7 @@ dockerbuild(){ if [ -n "$BUILDERNAME" ];then docker run -e DEB_BUILD_OPTIONS=$DEB_OPT -e PKGDIR=$SH_PATH/packages/$PKGNAME/$PKGNAME -v $SH_PATH/:$SH_PATH --name $PKGNAME --rm $BUILDERNAME || errlog "builderror" else - docker run -e DEB_BUILD_OPTIONS=$DEB_OPT -e PKGDIR=$SH_PATH/packages/$PKGNAME/$PKGNAME -v $SH_PATH/:$SH_PATH --name $PKGNAME --rm pvebuilder|| errlog "builderror" + docker run -it -e DEB_BUILD_OPTIONS=$DEB_OPT -e PKGDIR=$SH_PATH/packages/$PKGNAME/$PKGNAME -v $SH_PATH/:$SH_PATH --name $PKGNAME --rm pvebuilder bash|| errlog "builderror" fi } @@ -105,7 +105,15 @@ upload_pkg(){ update_submodues(){ rm $SH_PATH/packages/$PKGNAME/$PKGNAME/ -rf mkdir $SH_PATH/packages/$PKGNAME/$PKGNAME/ - git submodule update --init --recursive "$SH_PATH/packages/$PKGNAME/$PKGNAME" + # qemu is currently using Zeex/subhook, but Zeex/subhook is corrupted + if [ "$PKGNAME" == "pve-qemu" ];then + SKIP_SUBMODULE=1 + fi + if [ -n "$SKIP_SUBMODULE" ];then + git submodule update --init "$SH_PATH/packages/$PKGNAME/$PKGNAME" + else + git submodule update --init --recursive "$SH_PATH/packages/$PKGNAME/$PKGNAME" + fi } update_submodues || errlog "Failed to update submodule" diff --git a/packages/pve-qemu/autobuild.sh b/packages/pve-qemu/autobuild.sh index f16fb9f..e234e11 100644 --- a/packages/pve-qemu/autobuild.sh +++ b/packages/pve-qemu/autobuild.sh @@ -7,6 +7,17 @@ errlog(){ } +update_submodule(){ + cd $SH_DIR/$PKGNAME + echo "init submodule" + git submodule update --init --depth=1 + # replace Zeex/subhook + echo "set submodule url" + cd qemu/roms/edk2/ + git submodule set-url UnitTestFrameworkPkg/Library/SubhookLib/subhook https://github.com/tianocore/edk2-subhook + git submodule update --init --recursive --depth=1 +} + exec_build(){ apt update apt install libpve-access-control librados2 librados-dev -y @@ -27,5 +38,6 @@ echo "This is $PKGNAME build scripts" SH_PATH=$(realpath "$0") SH_DIR=$(dirname $SH_PATH) +update_submodule cd $SH_DIR/$PKGNAME exec_build