Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to mes-0.26.1. #471

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Update to mes-0.26.1. #471

merged 1 commit into from
Jun 25, 2024

Conversation

stikonas
Copy link
Collaborator

@stikonas stikonas commented Jun 9, 2024

Somehow this seems to break kernel bootstrap... Not sure why.

Also tcc riscv64 checksum still needs updating.

@stikonas stikonas requested review from Googulator and fosslinux June 9, 2024 18:26
@stikonas stikonas marked this pull request as draft June 9, 2024 18:26
@stikonas stikonas changed the base branch from master to 1.0 June 9, 2024 18:27
@stikonas stikonas force-pushed the mes_0.26.1 branch 3 times, most recently from 78ac492 to 163eb03 Compare June 10, 2024 19:26
@stikonas
Copy link
Collaborator Author

Looks like Fiwix hasn't started booting yet when crash happens:

Fiwix ext2 initrd created successfully.
 +> if match xFalse xTrue 
kexec-fiwix: starting kernel /boot/fiwix...

kexec-fiwix: Fiwix kernel file length: 375788
kexec-fiwix: Reading kernel...
ELF virtual entry point       : 0x80100030
ELF program header offset     : 0x34
ELF number of program  headers: 2
ELF size of program  headers  : 32
kexec-fiwix: Placing kernel in memory...
ELF physical entry point      : 0x100030
header 0:
    p_offset: 0x00001000
    p_paddr : 0x00100000
    p_filesz: 0x0004b5a4
    p_memsz : 0x0004b5a4
header 1:
    p_offset: 0x0004c5a4
    p_paddr : 0x0014c5a4
    p_filesz: 0x0000f4c4
    p_memsz : 0x00037df0
Preparing multiboot info for kernel...
Found image at filenum 9095
initrd_src: 0x68221188
initrd_len: 0x54500000
kexec-fiwix: Memory map file length: 192
kexec-fiwix: Reading memory map file...
Preparing trampoline...
kexec-fiwix: jumping to trampoline..

@stikonas
Copy link
Collaborator Author

Hmm, downgrading back just tcc to the old version works. So one of those patches...

@stikonas stikonas changed the base branch from 1.0 to master June 23, 2024 18:49
@stikonas stikonas marked this pull request as ready for review June 23, 2024 18:50
@stikonas
Copy link
Collaborator Author

For now I've removed tinycc upgrade as it was causing issues with Fiwix. It should be easier to debug if we decouple mes and tinycc upgrade.

This means that riscv64 bootstrap regressed a bit (as new mes removed some special casing for tcc assembly support but we are not using that newer tcc yet), hence I changed target branch to master.

@stikonas
Copy link
Collaborator Author

stikonas commented Jun 23, 2024

CI is expected to eventually fail due to openssl download URL (see #472).

I've tested both qemu and bwrap modes and it seems to work (qemu is quite slow under Fiwix but I don't think I'm causing that).

Copy link
Collaborator

@Googulator Googulator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good - please update parts.rst and rebase so we can get a clean CI.

@stikonas stikonas changed the title [DRAFT] Update to mes-0.26.1. Update to mes-0.26.1. Jun 25, 2024
@Googulator Googulator merged commit 18da5ad into fosslinux:master Jun 25, 2024
6 checks passed
@stikonas stikonas deleted the mes_0.26.1 branch June 25, 2024 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants