Closed bzfbd closed 2 years ago
@wulf7 how hard would it be to update the ports got main and 13 to have this change. I believe I cannot commit https://reviews.freebsd.org/D35276 before that has happened.
Does 5.4-lts branch require this change?
I am kind-of lost in which branch is used for which port and release, so hard to tell for me. Let me checkout the branch and have a look. If you can tell me which port uses it that would be helpful.
It looks like the GPL implementation in 5.4-lts relies in the FreeBSD in-tree linux/kernel.h to have the structure and typeset for pm+message{_t} so would also need an #include_next
most likely but would then likely require more conflict resolution around
#ifndef SIMPLE_DEV_PM_OPS
graphics/drm-54-kmod
port is based on 5.4-lts
branch and graphics/drm-510-kmod
port is based on 5.10-lts
And drm-fbsd13-kmod-5.4.144.g20220223_1 is also based on 5.4-lts. I just learned how to map the tags back to branches (which only works after you checked out the branch locally at least once it seems, which always failed me before).
Can we do 5.10-lts without too much trouble now and I'll look into 5.4-lts the next days and let you know?
I'll try to handle 5.4-lts later today
It looks like the GPL implementation in 5.4-lts relies in the FreeBSD in-tree linux/kernel.h to have the structure and typeset for pm+message{_t} so would also need an
#include_next
most likely but would then likely require more conflict resolution around#ifndef SIMPLE_DEV_PM_OPS
I have added #include_next
to linux/pm.h
in 5.4-lts
branch. Could you test it with your changes?
I'll create PR with drm-kmod update if all OK
I started the one for main/master; I'll do main/5.10-lts and stable/13 with 5.4-lts in the morning. Thanks a lot for your help!
I've built all three combinations with https://reviews.freebsd.org/D35276 applied on amd64 and that seems to have built fine. Thanks a lot for taking care of all again. I'll wait for port updates and then push the change into FreeBSD.
Committed. Thanks a lot for testing it
add #include_next to pm.h to also have access to the in-tree file. This will be necessary in main and stable/13 in order to migrate pm_message_t from kernel.h to pm.h.
Sponsored by: The FreeBSD Foundation