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

dkms: update to 3.0.6 and update other related packages #37139

Closed
wants to merge 4 commits into from

Conversation

subnut
Copy link
Contributor

@subnut subnut commented May 15, 2022

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, x86_64-glibc

@unspecd unspecd mentioned this pull request May 15, 2022
@subnut subnut marked this pull request as draft May 16, 2022 03:45
@subnut subnut marked this pull request as ready for review May 16, 2022 05:04
srcpkgs/broadcom-wl-dkms/template Outdated Show resolved Hide resolved
srcpkgs/dkms/template Outdated Show resolved Hide resolved
srcpkgs/xbps-triggers/files/dkms Outdated Show resolved Hide resolved
@subnut subnut marked this pull request as draft May 18, 2022 03:22
@subnut subnut force-pushed the dkms branch 4 times, most recently from 0dd65a0 to 1ae0908 Compare May 18, 2022 05:04
@subnut subnut marked this pull request as ready for review May 18, 2022 05:04
@subnut subnut requested a review from ahesford May 18, 2022 05:04
srcpkgs/xbps-triggers/files/dkms Outdated Show resolved Hide resolved
srcpkgs/xbps-triggers/files/dkms Outdated Show resolved Hide resolved
@subnut subnut marked this pull request as draft May 18, 2022 14:40
@subnut subnut marked this pull request as ready for review May 18, 2022 16:38
@subnut subnut requested a review from ahesford May 18, 2022 16:39
@subnut subnut force-pushed the dkms branch 3 times, most recently from 2b8aa65 to 0f5aa33 Compare May 18, 2022 17:37
srcpkgs/xbps-triggers/files/dkms Outdated Show resolved Hide resolved
srcpkgs/xbps-triggers/files/dkms Outdated Show resolved Hide resolved
@subnut subnut changed the title dkms: update to 3.0.3 and update other related packages dkms: update to 3.0.4 and update other related packages Jun 22, 2022
@subnut subnut marked this pull request as ready for review June 22, 2022 08:10
@subnut
Copy link
Contributor Author

subnut commented Jun 22, 2022

Sorry for the delay, I am busy.


@ahesford It makes the logic simpler IMO.

I've updated the logic again, and this time I've only utilized the expected format instead of using workarounds like $kver = added. Hope this alleviates your concerns.

If you have any better suggestions, do share. I'll implement it ASAP.


Thanks for the <<-EOF tip BTW. Didn't know that.

@subnut
Copy link
Contributor Author

subnut commented Jun 22, 2022

srcpkgs/xbps-triggers/files/dkms Outdated Show resolved Hide resolved
Copy link
Member

@ahesford ahesford left a comment

Choose a reason for hiding this comment

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

This seems acceptable, but we need to test thoroughly. Accidentally breaking DKMS with trigger and hook changes would be bad news.

@ahesford ahesford dismissed their stale review June 28, 2022 12:23

Request is no longer relevant.

@subnut subnut force-pushed the dkms branch 2 times, most recently from 1140382 to b1b9214 Compare July 20, 2022 12:17
@subnut subnut changed the title dkms: update to 3.0.4 and update other related packages dkms: update to 3.0.6 and update other related packages Jul 20, 2022
@subnut
Copy link
Contributor Author

subnut commented Jul 20, 2022

Updated to latest release and rebased on master.

srcpkgs/dkms/template Outdated Show resolved Hide resolved
Copy link
Member

@ahesford ahesford left a comment

Choose a reason for hiding this comment

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

Welp, this isn't ready to go after all. The trigger and kernel hook need some fixes.

srcpkgs/dkms/files/kernel.d/dkms.prerm Outdated Show resolved Hide resolved
srcpkgs/xbps-triggers/files/dkms Outdated Show resolved Hide resolved
files/kernel.d/dkms.prerm has been updated to match the
kernel_prerm.d_dkms file distributed with dkms 3.0.6

Also, note that these dkms.conf directives have been deprecated since
dkms 2.8.8
- MODULES_CONF
- MODULES_CONF_ALIAS_TYPE
- MODULES_CONF_OBSOLETES
- MODULES_CONF_OBSOLETE_ONLY
- REMAKE_INITRD

Also, note that the output of `dkms status` was changed in version 2.8.6
old -	zfs, 2.1.4, 5.15.39_1, x86_64: installed
new -	zfs/2.1.4, 5.15.39_1, x86_64: installed
The output format of `dkms status` has changed in v2.8.6
old -   zfs, 2.1.4, 5.15.39_1, x86_64: installed
new -   zfs/2.1.4, 5.15.39_1, x86_64: installed
So, I've re-worked the _modver and _kver detection logic.

NOTE: The detection logic should ideally be identical to the detection
logic in srcpkgs/dkms/files/kernel.d/dkms.prerm

Also, there was a bug. If a package tried to install a dkms module that
failed to build for *all* of the installed kernels, then the output of
dkms status for that module would be -

old -   module-name, x.y.z: added
new -   module-name/x.y.z: added

Which would cause the dkms trigger to set _kver to "added", and then the
following call to `dkms remove` would set the flag `-k $_kver`, and dkms
would get confused trying to find a kernel of version "added".

This commit fixes that bug.
@subnut
Copy link
Contributor Author

subnut commented Jul 31, 2022

Sorry for the IFS blunder 😅
Life's been very hectic recently.

@subnut subnut marked this pull request as ready for review July 31, 2022 18:41
@subnut

This comment was marked as off-topic.

@dataCobra
Copy link
Contributor

Hey @subnut,

is there something I can help you with?

@ahesford ahesford closed this in 6e8977c Aug 29, 2022
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.

None yet

3 participants