mirror of
https://github.com/copy/v86.git
synced 2025-12-31 04:23:15 +00:00
update buildroot image
with 6.8 kernel, virtio drivers (virtio-net, virtio-balloon, virtio-console) and some networking utils (socat and tcpdump) Thanks @SuperMaxusa
This commit is contained in:
parent
994dfa7d97
commit
725a4e3b47
8 changed files with 22 additions and 12 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
|
@ -90,7 +90,7 @@ jobs:
|
|||
|
||||
- name: Download uncached images
|
||||
if: steps.cache-images.outputs.cache-hit != 'true'
|
||||
run: wget -nv -P images/ https://i.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,mobius-fd-release5.img}
|
||||
run: wget -nv -P images/ https://i.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage68.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,mobius-fd-release5.img}
|
||||
|
||||
- name: Run api-tests
|
||||
run: make api-tests
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -249,9 +249,9 @@ $(CLOSURE):
|
|||
# don't upgrade until https://github.com/google/closure-compiler/issues/3972 is fixed
|
||||
wget -nv -O $(CLOSURE) https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20210601/closure-compiler-v20210601.jar
|
||||
|
||||
build/integration-test-fs/fs.json:
|
||||
build/integration-test-fs/fs.json: images/buildroot-bzimage68.bin
|
||||
mkdir -p build/integration-test-fs/flat
|
||||
cp images/buildroot-bzimage.bin build/integration-test-fs/bzImage
|
||||
cp images/buildroot-bzimage68.bin build/integration-test-fs/bzImage
|
||||
touch build/integration-test-fs/initrd
|
||||
cd build/integration-test-fs && tar cfv fs.tar bzImage initrd
|
||||
./tools/fs2json.py build/integration-test-fs/fs.tar --out build/integration-test-fs/fs.json
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ for a full setup on Debian or
|
|||
The disk images for testing are not included in this repository. You can
|
||||
download them directly from the website using:
|
||||
|
||||
`wget -P images/ https://i.copy.sh/{linux3.iso,linux.iso,linux4.iso,buildroot-bzimage.bin,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img}`
|
||||
`wget -P images/ https://i.copy.sh/{linux3.iso,linux.iso,linux4.iso,buildroot-bzimage68.bin,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img}`
|
||||
|
||||
Run integration tests: `make tests`
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ window.onload = function()
|
|||
url: "../bios/vgabios.bin",
|
||||
},
|
||||
bzimage: {
|
||||
url: "../images/buildroot-bzimage.bin",
|
||||
url: "../images/buildroot-bzimage68.bin",
|
||||
},
|
||||
autostart: true,
|
||||
disable_keyboard: true,
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@ window.onload = function()
|
|||
url: "../bios/vgabios.bin",
|
||||
},
|
||||
bzimage: {
|
||||
url: "../images/buildroot-bzimage.bin",
|
||||
size: 5166352,
|
||||
url: "../images/buildroot-bzimage68.bin",
|
||||
async: false,
|
||||
},
|
||||
filesystem: {},
|
||||
|
|
|
|||
|
|
@ -463,6 +463,17 @@
|
|||
filesystem: {},
|
||||
cmdline: "tsc=reliable mitigations=off random.trust_cpu=on",
|
||||
},
|
||||
{
|
||||
id: "buildroot6",
|
||||
bzimage: {
|
||||
url: host + "buildroot-bzimage68.bin",
|
||||
size: 10068480,
|
||||
async: false,
|
||||
},
|
||||
name: "Buildroot Linux",
|
||||
filesystem: {},
|
||||
cmdline: "tsc=reliable mitigations=off random.trust_cpu=on",
|
||||
},
|
||||
{
|
||||
id: "basiclinux",
|
||||
hda: {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ const config_async_cdrom = {
|
|||
vga_bios: { url: __dirname + "/../../bios/vgabios.bin" },
|
||||
cdrom: { url: __dirname + "/../../images/linux4.iso", async: true },
|
||||
autostart: true,
|
||||
memory_size: 32 * 1024 * 1024,
|
||||
memory_size: 64 * 1024 * 1024,
|
||||
filesystem: {},
|
||||
screen_dummy: true,
|
||||
disable_jit: +process.env.DISABLE_JIT,
|
||||
|
|
@ -26,7 +26,7 @@ const config_sync_cdrom = {
|
|||
vga_bios: { url: __dirname + "/../../bios/vgabios.bin" },
|
||||
cdrom: { url: __dirname + "/../../images/linux4.iso", async: false },
|
||||
autostart: true,
|
||||
memory_size: 32 * 1024 * 1024,
|
||||
memory_size: 64 * 1024 * 1024,
|
||||
filesystem: {},
|
||||
screen_dummy: true,
|
||||
disable_jit: +process.env.DISABLE_JIT,
|
||||
|
|
@ -37,9 +37,9 @@ const config_filesystem = {
|
|||
bios: { url: __dirname + "/../../bios/seabios.bin" },
|
||||
vga_bios: { url: __dirname + "/../../bios/vgabios.bin" },
|
||||
autostart: true,
|
||||
memory_size: 32 * 1024 * 1024,
|
||||
memory_size: 64 * 1024 * 1024,
|
||||
filesystem: {},
|
||||
bzimage: { url: __dirname + "/../../images/buildroot-bzimage.bin" },
|
||||
bzimage: { url: __dirname + "/../../images/buildroot-bzimage68.bin" },
|
||||
cmdline: "tsc=reliable mitigations=off random.trust_cpu=on",
|
||||
network_relay_url: "<UNUSED>",
|
||||
screen_dummy: true,
|
||||
|
|
|
|||
|
|
@ -320,7 +320,7 @@ if(cluster.isMaster)
|
|||
},
|
||||
{
|
||||
name: "Linux bzImage",
|
||||
bzimage: root_path + "/images/buildroot-bzimage.bin",
|
||||
bzimage: root_path + "/images/buildroot-bzimage68.bin",
|
||||
cmdline: "auto",
|
||||
timeout: 200,
|
||||
expected_texts: [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue