From 2fedf9b20ecbae717cfa4199765e82717e3591bd Mon Sep 17 00:00:00 2001 From: Marius Muench Date: Tue, 28 Jan 2020 22:07:47 +0100 Subject: [PATCH] Dev/target update (#49) * updated ref to qemu * updated ref to panda * modify panda-exec path for CI * update panda-ref * updated references to MAINLINED avatar changeds in panda * fix pygdbmi version for python<3.5 pygdbmi droppsed support for python 2.7 and 3.x<3.5 with v0.9.0.3, hence we fallback to 0.9.0.2 in those cases --- .gitmodules | 2 +- .travis.yml | 12 ++++++------ avatar2/installer/config.py | 2 +- setup.py | 3 ++- targets/src/avatar-panda | 2 +- targets/src/avatar-qemu | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index e045dfa783..272ebacba4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = ../avatar-qemu.git [submodule "targets/src/avatar-panda"] path = targets/src/avatar-panda - url = ../avatar-panda.git + url = https://github.com/panda-re/panda diff --git a/.travis.yml b/.travis.yml index 2e1344d6a5..6ec67774d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,12 +49,12 @@ script: - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/qemu/arm-softmmu/qemu-system-arm nosetests-3.4 ./tests/pyperipheral/test_pyperipheral.py' - docker exec ubuntu bash -c 'cd avatar2/ && echo Yes | bash ./targets/build_panda.sh' - - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/qemu-system-arm nosetests-2.7 ./tests/test_qemutarget.py' - - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/qemu-system-arm nosetests-3.4 ./tests/test_qemutarget.py' - - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/qemu-system-arm nosetests-2.7 ./tests/pyperipheral/test_pyperipheral.py' - - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/qemu-system-arm nosetests-3.4 ./tests/pyperipheral/test_pyperipheral.py' - - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/qemu-system-arm AVATAR2_PANDA_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/qemu-system-arm nosetests-2.7 ./tests/smoke/panda_thumb.py' - - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/qemu-system-arm AVATAR2_PANDA_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/qemu-system-arm nosetests-3.4 ./tests/smoke/panda_thumb.py' + - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/panda-system-arm nosetests-2.7 ./tests/test_qemutarget.py' + - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/panda-system-arm nosetests-3.4 ./tests/test_qemutarget.py' + - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/panda-system-arm nosetests-2.7 ./tests/pyperipheral/test_pyperipheral.py' + - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/panda-system-arm nosetests-3.4 ./tests/pyperipheral/test_pyperipheral.py' + - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/panda-system-arm AVATAR2_PANDA_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/panda-system-arm nosetests-2.7 ./tests/smoke/panda_thumb.py' + - docker exec ubuntu bash -c 'cd avatar2/ && AVATAR2_GDB_EXECUTABLE=gdb-multiarch AVATAR2_QEMU_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/panda-system-arm AVATAR2_PANDA_EXECUTABLE=./targets/build/panda/panda/arm-softmmu/panda-system-arm nosetests-3.4 ./tests/smoke/panda_thumb.py' - docker exec ubuntu bash -c 'cd avatar2/ && python2 ./tests/hello_world.py' - docker exec ubuntu bash -c 'cd avatar2/ && python3 ./tests/hello_world.py' diff --git a/avatar2/installer/config.py b/avatar2/installer/config.py index e3bfc15dcd..e46341242f 100644 --- a/avatar2/installer/config.py +++ b/avatar2/installer/config.py @@ -30,7 +30,7 @@ 'install_cmd': ['git submodule update --init dtc', './configure', 'make'], }), - (PANDA, {'git': 'https://github.com/avatartwo/avatar-panda', + (PANDA, {'git': 'https://github.com/panda-re/panda', 'configure': '--disable-sdl --target-list=arm-softmmu', 'make': '', 'rel_path': 'arm-softmmu/qemu-system-arm', diff --git a/setup.py b/setup.py index 29be93bf3f..9ec14b43b5 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,8 @@ 'avatar2/installer' ], install_requires=[ - 'pygdbmi>=0.7.3.1', + 'pygdbmi==0.9.0.2;python_version<"3.5"', + 'pygdbmi;python_version>="3.5"', 'intervaltree', 'posix_ipc>=1.0.0', 'capstone>=3.0.4', diff --git a/targets/src/avatar-panda b/targets/src/avatar-panda index 5cec152467..591701026d 160000 --- a/targets/src/avatar-panda +++ b/targets/src/avatar-panda @@ -1 +1 @@ -Subproject commit 5cec152467e04b032deedf99a84eaf28cec729ba +Subproject commit 591701026db5ea7c1c85a7729d2cc8554a49d795 diff --git a/targets/src/avatar-qemu b/targets/src/avatar-qemu index 5c26fdaa11..d69c5f0358 160000 --- a/targets/src/avatar-qemu +++ b/targets/src/avatar-qemu @@ -1 +1 @@ -Subproject commit 5c26fdaa11733068df2f268a9c15816646125d00 +Subproject commit d69c5f0358b9775af2dc0b6ce03b7ecf44f456bf