Differential D40168
x11/nvidia-driver: Add Makefile.version and patch for nvidia-drm Authored by ashafer_badland.io on May 19 2023, 9:44 PM. Tags None Referenced Files
Details This moves the version string into a makefile that can be included from child ports. This also adds a patch to nvidia-modeset that handles a deadlock with queueing events observed with nvidia-drm. This fix is only needed in 535, future versions will have a proper implementation included with them.
Diff Detail
Event TimelineComment Actions Updating this review to only add Makefile.version instead of updating the Also add a patch to be used for nvidia-drm Comment Actions Bump version to 535.86.05 Any thoughts on getting this merged? This is the prerequisite for an nvidia-drm Blocking: https://github.com/amshafer/freebsd-ports/commit/5066bdf47d2e119d35d9dc66ec920e1ea16af82e Comment Actions I think you should remove the distversion thing, that will break the legacy ports and seems unnecessary. Comment Actions
This is the main reason for this diff. Austin needs to pull in x11/nvidia-driver's version into another ports he's preparing. Comment Actions It is not necessary to do it like this. There is an implied version contract with this port and x11/linux-nvidia-libs as well. If it is centralized, it needs to accommodate the entire nvidia-driver situation because this will cause build failures. Comment Actions I see the optional assignment so I guess that part is fine. Ultimately it's not my port but if danfe is not going to comment I have no objections. Comment Actions I originally added NVIDIA_DISTVERSION since we will need to have multiple nvidia-drm-kmod ports which match the different versions of drm-kmod. For now basically nvidia-drm-510-kmod and nvidia-drm-515-kmod. It seemed easiest to have one Makefile.version in nvidia-driver which defines the version number to avoid having to update it by hand in all the ports that depend on nvidia-drm, instead you'd only have to update the distinfos. I added something similar to drm-kmod a bit ago. My goal was make one common nvidia-drm-kmod Makefile.common which uses NVIDIA_DISTVERSION, NVIDIA_GH_TAGNAME, and DRM_KMOD_GH_TAGNAME to select the versions of everything, and each nvidia-drm-*-kmod port imports the Makefile.versions it wants to reference. I don't feel very strongly on this strategy, so if you'd like it to be removed it can be. Also open to suggested changes if there's a better way to do that. The patch this adds is the real dealbreaker, as without that there is a deadlock on loading nvidia-drm.ko Comment Actions I've been thinking about this one-line Makefile.version for a while and still not sure whether I like it, but could not find a better way that wouldn't require spawning make(1) and reparsing the Makefile just to obtain a version, so I guess it's okay at the end of the day. We can revisit this approach later if needed.
| ||||||||||||||||||||||||||||||||||||||