From dddfaf3f55ac31720bc7cba7c7e05bfe5bb6c0c6 Mon Sep 17 00:00:00 2001 From: "Dongjia \"toka\" Zhang" Date: Sat, 5 Nov 2022 12:43:36 +0900 Subject: [PATCH] Remove QEMU-Nyx & packer submodules --- .gitmodules | 6 ------ libafl_nyx/QEMU-Nyx | 1 - libafl_nyx/build_nyx_support.sh | 14 ++++++++++++++ libafl_nyx/packer | 1 - 4 files changed, 14 insertions(+), 8 deletions(-) delete mode 160000 libafl_nyx/QEMU-Nyx delete mode 160000 libafl_nyx/packer diff --git a/.gitmodules b/.gitmodules index 6f398f40b2..47d2bed34e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "libafl_concolic/symcc_runtime/symcc"] path = libafl_concolic/symcc_runtime/symcc url = https://github.com/AFLplusplus/symcc.git -[submodule "libafl_nyx/QEMU-Nyx"] - path = libafl_nyx/QEMU-Nyx - url = https://github.com/nyx-fuzz/QEMU-Nyx.git -[submodule "libafl_nyx/packer"] - path = libafl_nyx/packer - url = https://github.com/syheliel/packer.git diff --git a/libafl_nyx/QEMU-Nyx b/libafl_nyx/QEMU-Nyx deleted file mode 160000 index 80f22f77d6..0000000000 --- a/libafl_nyx/QEMU-Nyx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 80f22f77d6aab14e62bf11c80db4e210bbca5fb5 diff --git a/libafl_nyx/build_nyx_support.sh b/libafl_nyx/build_nyx_support.sh index bb3f00be4e..9819812615 100755 --- a/libafl_nyx/build_nyx_support.sh +++ b/libafl_nyx/build_nyx_support.sh @@ -9,6 +9,20 @@ echo "[*] Making sure all Nyx is checked out" git status 1>/dev/null 2>/dev/null +if [ ! -d ./QEMU-Nyx ]; then + git clone https://github.com/nyx-fuzz/QEMU-Nyx.git || exit 1 + pushd QEMU-Nyx + git reset --hard 80f22f77d6aab14e62bf11c80db4e210bbca5fb5 + popd +fi + +if [ ! -d ./packer ]; then + git clone https://github.com/syheliel/packer.git || exit 1 + pushd QEMU-Nyx + git reset --hard 86b159bafc0b2ba8feeaa8761a45b6201d34084f + popd +fi + git submodule init || exit 1 echo "[*] initializing QEMU-Nyx submodule" git submodule update ./QEMU-Nyx 2>/dev/null # ignore errors diff --git a/libafl_nyx/packer b/libafl_nyx/packer deleted file mode 160000 index 86b159bafc..0000000000 --- a/libafl_nyx/packer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 86b159bafc0b2ba8feeaa8761a45b6201d34084f