Bug 280495 - emulators/virtualbox-ose-kmod: Fix sleepqueue usage after FreeBSD src changes
Summary: emulators/virtualbox-ose-kmod: Fix sleepqueue usage after FreeBSD src changes
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Mark Johnston
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-07-29 13:43 UTC by Mark Johnston
Modified: 2024-07-30 00:15 UTC (History)
1 user (show)

See Also:
vvd: maintainer-feedback+


Attachments
proposed port patch (2.52 KB, patch)
2024-07-29 13:43 UTC, Mark Johnston
no flags Details | Diff
emulators/virtualbox-ose-kmod patch (2.54 KB, patch)
2024-07-29 18:31 UTC, Mark Johnston
no flags Details | Diff
emulators/virtualbox-ose-kmod-legacy patch (2.56 KB, patch)
2024-07-29 18:32 UTC, Mark Johnston
no flags Details | Diff
emulators/virtualbox-ose-kmod patch (2.93 KB, patch)
2024-07-29 20:15 UTC, Mark Johnston
vvd: maintainer-approval+
Details | Diff
emulators/virtualbox-ose-kmod-legacy patch (2.90 KB, patch)
2024-07-29 20:16 UTC, Mark Johnston
vvd: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mark Johnston freebsd_committer freebsd_triage 2024-07-29 13:43:47 UTC
Created attachment 252351 [details]
proposed port patch

Hi, yesterday I committed some changes to src which cause virtualbox-ose-kmod to fail to compile.  The fix is trivial, patch attached.
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2024-07-29 16:39:47 UTC
Is emulators/virtualbox-ose-legacy-kmod affected too?
Comment 2 Mark Johnston freebsd_committer freebsd_triage 2024-07-29 16:50:50 UTC
(In reply to Vladimir Druzenko from comment #1)
It is, I'll upload a patch shortly.  I also just realized that there's a mistake in the original patch, I'll regenerate that one too.
Comment 3 Mark Johnston freebsd_committer freebsd_triage 2024-07-29 18:31:37 UTC
Created attachment 252354 [details]
emulators/virtualbox-ose-kmod patch
Comment 4 Mark Johnston freebsd_committer freebsd_triage 2024-07-29 18:32:00 UTC
Created attachment 252355 [details]
emulators/virtualbox-ose-kmod-legacy patch
Comment 5 Mark Johnston freebsd_committer freebsd_triage 2024-07-29 18:33:07 UTC
Here are the two ports patches in git: https://github.com/markjdb/freebsd-ports/commits/main-virtualbox-sleepqueue/

I'm happy to push them myself if they are approved.
Comment 6 Vladimir Druzenko freebsd_committer freebsd_triage 2024-07-29 18:45:49 UTC
I don't think we need port bump.

Also patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h contains description (for 1st part) - IMHO better add description for 2nd part too.
Comment 7 Mark Johnston freebsd_committer freebsd_triage 2024-07-29 18:52:14 UTC
(In reply to Vladimir Druzenko from comment #6)
> I don't think we need port bump.

The handbook says, "PORTREVISION must be increased each time a change is made to the port that changes the generated package in any way."

https://docs.freebsd.org/en/books/porters-handbook/makefiles/index.html#makefile-portrevision

Maybe the bump is not needed indeed, I don't know.

> IMHO better add description for 2nd part too.

Why?  This is a routine KPI change, there is nothing interesting to document.  The comment explaining the existing patch is for something much more subtle.
Comment 8 Vladimir Druzenko freebsd_committer freebsd_triage 2024-07-29 19:10:07 UTC
(In reply to Mark Johnston from comment #7)
> The handbook says, "PORTREVISION must be increased each time a change is made to the port that changes the generated package in any way."
I don't want to force all users to update their production systems just like that - they are not affected - all releases are not affected.
Only the latest CURRENT is affected. And what's more, users can't build it before the patch, which means there is no package.

> Why?  This is a routine KPI change, there is nothing interesting to document.  The comment explaining the existing patch is for something much more subtle.
If you don't add it, it will seem like this description applies to this part of the patch too. A short phrase like "changes were made to src 1500022 that cause virtualbox-ose-kmod to not compile" is enough. My english is poor - you can probably formulate a better description. :-)
Comment 9 Mark Johnston freebsd_committer freebsd_triage 2024-07-29 20:15:02 UTC
Created attachment 252357 [details]
emulators/virtualbox-ose-kmod patch

Updated patch to remove the revision bump and improve patch description.
Comment 10 Mark Johnston freebsd_committer freebsd_triage 2024-07-29 20:16:50 UTC
Created attachment 252358 [details]
emulators/virtualbox-ose-kmod-legacy patch

Updated patch to remove the revision bump and improve patch description.
Comment 11 Vladimir Druzenko freebsd_committer freebsd_triage 2024-07-29 21:09:29 UTC
Approved.
Comment 12 commit-hook freebsd_committer freebsd_triage 2024-07-29 23:57:55 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=53bede4bcb3acee01ef26086c9cb5561fb7a20f1

commit 53bede4bcb3acee01ef26086c9cb5561fb7a20f1
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-07-29 13:18:10 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-07-29 23:57:11 +0000

    emulators/virtualbox-ose-kmod: Catch up with FreeBSD KPI changes

    After 1500021, kick_proc0() doesn't exist.

    PR:             280495
    Approved by:    vvd (maintainer)
    Reported by:    Michael Butler <imb@protected-networks.net>

 ...untime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h | 35 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)
Comment 13 commit-hook freebsd_committer freebsd_triage 2024-07-29 23:57:56 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c64a29abe541511b0875d568832d59347830d198

commit c64a29abe541511b0875d568832d59347830d198
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-07-29 17:57:13 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-07-29 23:57:11 +0000

    emulators/virtualbox-ose-kmod-legacy: Catch up with FreeBSD KPI changes

    After 1500021, kick_proc0() doesn't exist.

    PR:             280495
    Approved by:    vvd (maintainer)

 ...untime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h | 35 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)
Comment 14 Mark Johnston freebsd_committer freebsd_triage 2024-07-30 00:00:22 UTC
(In reply to Vladimir Druzenko from comment #11)
Thanks!
Comment 15 Vladimir Druzenko freebsd_committer freebsd_triage 2024-07-30 00:15:51 UTC
(In reply to Mark Johnston from comment #14)
Thank you!