avatartwo/avatar2
1
0
Fork 0
mirror of https://github.com/avatartwo/avatar2.git synced 2026-10-11 22:29:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dev/target update (#49)

Browse Source 
* 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
This commit is contained in:
Marius Muench
2020-01-28 22:07:47 +01:00
committed by GitHub
parent 9908413231
commit 2fedf9b20e
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+1 -1
View File
@@ -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
.travis.yml
+6 -6
View File
@@ -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'
avatar2/installer/config.py
+1 -1
View File
@@ -30,7 +30,7 @@ TARGETS = OrderedDict(
'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',
setup.py
+2 -1
View File
@@ -15,7 +15,8 @@ setup(
'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',
targets/src/avatar-panda
+1 -1
Submodule targets/src/avatar-panda updated: 5cec152467...591701026d
targets/src/avatar-qemu
+1 -1
Submodule targets/src/avatar-qemu updated: 5c26fdaa11...d69c5f0358