virtual_oss after 1500066
ClosedPublic
Actions

Authored by christos on Wed, Sep 17, 3:13 PM.

Details

Reviewers

diizzy
arrowd
fuz

Commits

R11:05b748dac1da: audio/virtual_oss_ctl: Do not depend on audio/virtual_oss after 1500066

Summary

virtual_oss is part of base from 15.0 onwards, so instead of depending
on audio/virtual_oss for those versions, build using the base system
sources instead.

While here, since audio/virtual_oss' upstream has been moved to
FreeBSD's GitHub, use that in GH_TUPLE. Also use the latest version.

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 67447
Build 64330: arc lint + arc unit

Event Timeline

christos requested review of this revision.Wed, Sep 17, 3:13 PM

christos created this revision.

Harbormaster completed remote builds in B67124: Diff 162265.Wed, Sep 17, 3:13 PM

christos added inline comments.Wed, Sep 17, 3:14 PM

audio/virtual_oss_ctl/Makefile
35	This needs sources to be present in the system.
38	Is there a way to avoid this and just depend on `audio/virtual_oss` without this?
audio/virtual_oss_ctl/distinfo
5	On >=15.0 we do not need this, is there a way to make this conditional?

diizzy added inline comments.Wed, Sep 17, 7:48 PM

audio/virtual_oss_ctl/Makefile
30	This is not in yet and you should match OSVERSION exactly

christos added inline comments.Wed, Sep 17, 7:51 PM

audio/virtual_oss_ctl/Makefile
30	I know it's not in. virtual_oss is meant to be part of 15.0, hence why the if statement.

diizzy added inline comments.Wed, Sep 17, 7:55 PM

audio/virtual_oss_ctl/Makefile
30	Even if it is 1500000 is incorrect as we're already way past that.... https://cgit.freebsd.org/src/tree/sys/sys/param.h?h=stable/15#n77

christos added inline comments.Thu, Sep 18, 10:03 AM

audio/virtual_oss_ctl/Makefile
30	I can bump `__FreeBSD_version` with the virtual_oss-in-base commit, and use that value here to make sure we are 100% checking from the time virtual_oss in in base.

christos mentioned this in D52308: virtual_oss: Port to base.Fri, Sep 19, 1:02 PM

diizzy added inline comments.Thu, Sep 25, 3:13 AM

audio/virtual_oss_ctl/Makefile
38	Not really unless we create a fork and use release tarballs, also to be aware of https://github.blog/2023-02-21-update-on-the-future-stability-of-source-code-archives-and-hashes/

I will bump stable/15's __FreeBSD_version once I MFC virtual_oss to stable/15 in the next days, and will update the port here accordingly.

LGTM, but I did not test this in Poudriere. @christos let me know if you want me to do it.

audio/virtual_oss_ctl/distinfo
5	No need to. As long as `GH_TUPLE` is under `.if`, this tarball won't be added to `DISTFILES` and thus will not be downloaded, nor checked for a correct hashsum.

This revision is now accepted and ready to land.Tue, Sep 30, 3:41 PM

In D52593#1206348, @arrowd wrote:

LGTM, but I did not test this in Poudriere. @christos let me know if you want me to do it.

Please do if you have some spare time.

christos retitled this revision from audio/virtual_oss_ctl: Do not depend on audio/virtual_oss on >= FreeBSD 15.0 to audio/virtual_oss_ctl: Do not depend on audio/virtual_oss after 1500066.Wed, Oct 1, 11:35 AM

christos edited the summary of this revision. (Show Details)

Use proper __FreeBSD_version value. I have the stable/15 MFC ready for
commit, with __FreeBSD_version bumped to 1500066.

This revision now requires review to proceed.Wed, Oct 1, 11:36 AM

Harbormaster completed remote builds in B67447: Diff 163218.Wed, Oct 1, 11:36 AM

Builds fine on CURRENT and 13.5