Skip to content

Commit

Permalink
Merge branch 'feature/qemu-esp-develop-8.1.3-20231206_v5.1' into 'rel…
Browse files Browse the repository at this point in the history 
…ease/v5.1'

feat(tools): update qemu to esp-develop-8.1.3-20231206 (v5.1)

See merge request espressif/esp-idf!27812
  • Loading branch information
@antmak
antmak committed Dec 11, 2023
2 parents 70f1bd5 + 850bf2b commit e60b023
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 17 deletions.
1 change: 1 addition & 0 deletions tools/docker/Dockerfile
View file
Expand Up @@ -22,6 +22,7 @@ RUN : \
libglib2.0-0 \
libncurses-dev \
libpixman-1-0 \
libsdl2-2.0-0 \
libslirp0 \
libusb-1.0-0-dev \
make \
Expand Down
7 changes: 2 additions & 5 deletions tools/test_idf_tools/test_idf_tools.py
View file
Expand Up @@ -85,9 +85,6 @@ def get_version_dict():
RISCV_ELF_ARCHIVE_PATTERN = RISCV_ELF + '-' \
+ (RISCV_ELF_VERSION[len('esp-'):] if RISCV_ELF_VERSION.startswith('esp-') else RISCV_ELF_VERSION)

QEMU_RISCV_ARCHIVE_PATTERN = 'esp-' + QEMU_RISCV
QEMU_XTENSA_ARCHIVE_PATTERN = 'esp-' + QEMU_XTENSA


class TestUsage(unittest.TestCase):

Expand Down Expand Up @@ -413,8 +410,8 @@ def test_tools_for_qemu_with_required(self):
self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
self.assert_tool_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
self.assert_tool_installed(output, ESP_ROM_ELFS, ESP_ROM_ELFS_VERSION)
self.assert_tool_installed(output, QEMU_RISCV, QEMU_RISCV_VERSION, QEMU_RISCV_ARCHIVE_PATTERN)
self.assert_tool_installed(output, QEMU_XTENSA, QEMU_XTENSA_VERSION, QEMU_XTENSA_ARCHIVE_PATTERN)
self.assert_tool_installed(output, QEMU_RISCV, QEMU_RISCV_VERSION)
self.assert_tool_installed(output, QEMU_XTENSA, QEMU_XTENSA_VERSION)
self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
self.assertEqual(required_tools_installed, output.count('Done'))

Expand Down
64 changes: 52 additions & 12 deletions tools/tools.json
View file
Expand Up @@ -1024,16 +1024,36 @@
"qemu-system-xtensa",
"--version"
],
"version_regex": "QEMU emulator version ([a-z0-9.-_]+)",
"version_regex": "QEMU emulator version [0-9.]+ \\(([a-z0-9.-_]+)\\)",
"versions": [
{
"linux-amd64": {
"sha256": "a7e5e779fd593cb15f6d197034dc2fb427ed9165a4743e2febc6f6a47dfcc618",
"size": 45962695,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.0.0-20230522/esp-qemu-xtensa-softmmu-develop_8.0.0_20230522-x86_64-linux-gnu.tar.bz2"
"sha256": "88176f41c2fb17448372b4a120109275270c0e6bc49af4938f9f82d48e02f126",
"size": 14537932,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-xtensa-softmmu-esp_develop_8.1.3_20231206-x86_64-linux-gnu.tar.xz"
},
"name": "8.0.0",
"status": "recommended"
"linux-arm64": {
"sha256": "37e15a038456e9692394e7ab7faf4d8e04b937476bb22c346e7ce0aaa579a003",
"size": 14084300,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-xtensa-softmmu-esp_develop_8.1.3_20231206-aarch64-linux-gnu.tar.xz"
},
"macos": {
"sha256": "e9321b29f59aa5c5f8d713ddcde301e46348493cdbf2dc12df2e047e6f456b58",
"size": 3345216,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-xtensa-softmmu-esp_develop_8.1.3_20231206-x86_64-apple-darwin.tar.xz"
},
"macos-arm64": {
"sha256": "ab5f2c0c7f9428dfdd970f1cd9cac66e9d455e4ba87308d42882f43580433cd6",
"size": 3150564,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-xtensa-softmmu-esp_develop_8.1.3_20231206-aarch64-apple-darwin.tar.xz"
},
"name": "esp_develop_8.1.3_20231206",
"status": "recommended",
"win64": {
"sha256": "cc1b0f87317e92aad71b40c409f404ce6df83bec0752feb6429eae65af606ae5",
"size": 32314176,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-xtensa-softmmu-esp_develop_8.1.3_20231206-x86_64-w64-mingw32.tar.xz"
}
}
]
},
Expand All @@ -1057,16 +1077,36 @@
"qemu-system-riscv32",
"--version"
],
"version_regex": "QEMU emulator version ([a-z0-9.-_]+)",
"version_regex": "QEMU emulator version [0-9.]+ \\(([a-z0-9.-_]+)\\)",
"versions": [
{
"linux-amd64": {
"sha256": "bc7607720ff3d7e3d39f3e1810b8795f376f4b9cf3783c8f2ed3f7f14ba74717",
"size": 47175493,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.0.0-20230522/esp-qemu-riscv32-softmmu-develop_8.0.0_20230522-x86_64-linux-gnu.tar.bz2"
"sha256": "88373441ce34d598da372e313f2ff0d6a6bed9a11f8152a2dde0be1cc89b917f",
"size": 15931252,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-riscv32-softmmu-esp_develop_8.1.3_20231206-x86_64-linux-gnu.tar.xz"
},
"name": "8.0.0",
"status": "recommended"
"linux-arm64": {
"sha256": "925be5f64c27fad9b982fb24870119fe2af7d1aa36b3607044f5db4d83633f8c",
"size": 15433748,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-riscv32-softmmu-esp_develop_8.1.3_20231206-aarch64-linux-gnu.tar.xz"
},
"macos": {
"sha256": "02fb7a928fe2f35debb561a1531458ef756c1b7dc2226afdb464eba81392920b",
"size": 3431904,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-riscv32-softmmu-esp_develop_8.1.3_20231206-x86_64-apple-darwin.tar.xz"
},
"macos-arm64": {
"sha256": "2a5836a02070964d05b947220906575e2f6a88dd68473eea72622705cb18105b",
"size": 3152032,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-riscv32-softmmu-esp_develop_8.1.3_20231206-aarch64-apple-darwin.tar.xz"
},
"name": "esp_develop_8.1.3_20231206",
"status": "recommended",
"win64": {
"sha256": "8ecef3ccb770cce5b82c0683c318eedd6da288d878151c7d002d89ae64e7c1bb",
"size": 34976352,
"url": "https://github.com/espressif/qemu/releases/download/esp-develop-8.1.3-20231206/qemu-riscv32-softmmu-esp_develop_8.1.3_20231206-x86_64-w64-mingw32.tar.xz"
}
}
]
}
Expand Down

0 comments on commit e60b023

Please sign in to comment.