https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271826
--- Comment #25 from Mitch <mitch_...@hotmail.com> ---
Hello everyone,
In my attempt to build a Kernel without c583b02587, I was initially confronted
to this conflict below
mitch@bsd:~/freebsd-src $ git status
On branch tracking-branch
You are currently reverting commit c583b0258728.
(fix conflicts and run "git revert --continue")
(use "git revert --skip" to skip this patch)
(use "git revert --abort" to cancel the revert operation)
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: sys/conf/files.powerpc
modified: sys/powerpc/powermac/macio.c
modified: sys/powerpc/powermac/platform_powermac.c
Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: sys/powerpc/powermac/platform_powermac.h
deleted by them: sys/powerpc/powermac/tbgpio.c
I've simply removed both files mentioned above in the unmerged section and I
was able to build a Kernel which I assume was the right thing to do, if not
please let me know.
Thanks to Warner's instructions I then cross compiled a test kernel against the
main branch from the freebsd source tree which appears to be the current 15
revision.
You can find it here :
https://box.ochem.net/cloud/index.php/s/Q6aCBiFdWrk69rb
I haven't test it myself but I assume you could simply rename it to kernel.txz
and do an in place replacement for testing purposes.
If needed I could also build a Stable/14 version of it.
Cheers,
Mitch
--
You are receiving this mail because:
You are the assignee for the bug.
