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

Fmake CI test run #980

Closed
wants to merge 5 commits into from
Closed

Fmake CI test run #980

wants to merge 5 commits into from

Conversation

bsdimp
Copy link
Member

@bsdimp bsdimp commented Jan 2, 2024

Bootstrapping from fmake hasn't been relevant since FreeBSD 9 when we switched to bmake. We can safely delete the workarounds we put into the tree for that transition now. We haven't supported building -current from FreeBSD 8.x (or 9.x with fmake as the default make) since FreeBSD 11ish. It's well past time to remove it.

I opened up this commit to run github's CI stuff, though it works on MacOS already...

fmake has been out of the tree for 10 years / 5 major releases now. The
need to bootstrap from it has been gone for at least 6 if not 8
years. While we may still need to bootstrap bmake, we don't need to do
it from fmake, so only retail the infrastructure to update from bmake to
bmake. Retain, for now, the WANT_MAKE_VERSION stuff, though we're always
up to date when building from supported and quasi-supported platforms.

Also remove all the checks to see if .PARSEDIR is defined. It is always
defined and was an early, fail-safe way to tell fmake from bmake during
the transition.

Adjust comments that refer to old fmake and remove those no longer
relevant.

Sponsored by:		Netflix
Commit 83cb5ba added a check for MAKE_VERSION being new enough to
handle CTFCONVERT_CMD being an empty string since fmake of the time
didn't support it until just a few commits before 83cb5ba. Later,
it was augmented with a check for .PARSEDIR to see if bmake was
running. fmake and boostrapping from fmake haven't worked in maybe 6 or
8 years, so we can remove the check here. If you want to update from
your FreeBSD 7 or FreeBSD 8 systems, you're even more out of luck than
you were before and must jump to an older version before jumping to
current for the source upgrade path.

Sponsored by:		Netflix
There's no need to support fmake anymore. Always assume we can use
bmake's :tA modifier. The ports tree hasn't supported fmake in about a
decade anyway. Simplify here.

Sponsored by:		Netflix
We used to exclude a lot of extra hooks to allow for local
customizations of the build which couldn't be done outside of sys.mk,
but excluded that support for fmake. Remove those hacks.

Sponsored by:		Netflix
We don't need make_check to work in a fmake world anymore (nor have we
in the past decade). Just remove it here.

Note in passing it's been 10 years since we've added a new test here and
maybe we're past the need for this part of the build (or need to revamp
it to include all the features added to bmake since 2016 that the build
system silently depends on).

Sponsored by:		Netflix
@bsdimp bsdimp requested a review from bapt as a code owner January 2, 2024 17:11
Copy link
Contributor

@brooksdavis brooksdavis left a comment

Choose a reason for hiding this comment

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

Thanks for cleaning up these bits.

@bsdimp
Copy link
Member Author

bsdimp commented Jan 3, 2024

thanks brooks. Landed.

@bsdimp bsdimp closed this Jan 3, 2024
freebsd-git pushed a commit that referenced this pull request Jan 3, 2024
fmake has been out of the tree for 10 years / 5 major releases now. The
need to bootstrap from it has been gone for at least 6 if not 8
years. While we may still need to bootstrap bmake, we don't need to do
it from fmake, so only retail the infrastructure to update from bmake to
bmake. Retain, for now, the WANT_MAKE_VERSION stuff, though we're always
up to date when building from supported and quasi-supported platforms.

Also remove all the checks to see if .PARSEDIR is defined. It is always
defined and was an early, fail-safe way to tell fmake from bmake during
the transition.

Adjust comments that refer to old fmake and remove those no longer
relevant.

Sponsored by:		Netflix
Reviewed by: brooks
Pull Request: #980
freebsd-git pushed a commit that referenced this pull request Jan 3, 2024
Commit 83cb5ba added a check for MAKE_VERSION being new enough to
handle CTFCONVERT_CMD being an empty string since fmake of the time
didn't support it until just a few commits before 83cb5ba. Later,
it was augmented with a check for .PARSEDIR to see if bmake was
running. fmake and boostrapping from fmake haven't worked in maybe 6 or
8 years, so we can remove the check here. If you want to update from
your FreeBSD 7 or FreeBSD 8 systems, you're even more out of luck than
you were before and must jump to an older version before jumping to
current for the source upgrade path.

Sponsored by:		Netflix
Reviewed by: brooks, emaste
Pull Request: #980
freebsd-git pushed a commit that referenced this pull request Jan 3, 2024
There's no need to support fmake anymore. Always assume we can use
bmake's :tA modifier. The ports tree hasn't supported fmake in about a
decade anyway. Simplify here.

Sponsored by:		Netflix
Reviewed by: brooks, emaste
Pull Request: #980
freebsd-git pushed a commit that referenced this pull request Jan 3, 2024
We used to exclude a lot of extra hooks to allow for local
customizations of the build which couldn't be done outside of sys.mk,
but excluded that support for fmake. Remove those hacks.

Sponsored by:		Netflix
Reviewed by: brooks
Pull Request: #980
freebsd-git pushed a commit that referenced this pull request Jan 3, 2024
We don't need make_check to work in a fmake world anymore (nor have we
in the past decade). Just remove it here.

Note in passing it's been 10 years since we've added a new test here and
maybe we're past the need for this part of the build (or need to revamp
it to include all the features added to bmake since 2016 that the build
system silently depends on).

Sponsored by:		Netflix
Reviewed by: brooks
Pull Request: #980
@emaste emaste added the merged label Jan 3, 2024
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
fmake has been out of the tree for 10 years / 5 major releases now. The
need to bootstrap from it has been gone for at least 6 if not 8
years. While we may still need to bootstrap bmake, we don't need to do
it from fmake, so only retail the infrastructure to update from bmake to
bmake. Retain, for now, the WANT_MAKE_VERSION stuff, though we're always
up to date when building from supported and quasi-supported platforms.

Also remove all the checks to see if .PARSEDIR is defined. It is always
defined and was an early, fail-safe way to tell fmake from bmake during
the transition.

Adjust comments that refer to old fmake and remove those no longer
relevant.

Sponsored by:		Netflix
Reviewed by: brooks
Pull Request: freebsd/freebsd-src#980
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
Commit 83cb5ba added a check for MAKE_VERSION being new enough to
handle CTFCONVERT_CMD being an empty string since fmake of the time
didn't support it until just a few commits before 83cb5ba. Later,
it was augmented with a check for .PARSEDIR to see if bmake was
running. fmake and boostrapping from fmake haven't worked in maybe 6 or
8 years, so we can remove the check here. If you want to update from
your FreeBSD 7 or FreeBSD 8 systems, you're even more out of luck than
you were before and must jump to an older version before jumping to
current for the source upgrade path.

Sponsored by:		Netflix
Reviewed by: brooks, emaste
Pull Request: freebsd/freebsd-src#980
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
There's no need to support fmake anymore. Always assume we can use
bmake's :tA modifier. The ports tree hasn't supported fmake in about a
decade anyway. Simplify here.

Sponsored by:		Netflix
Reviewed by: brooks, emaste
Pull Request: freebsd/freebsd-src#980
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
We used to exclude a lot of extra hooks to allow for local
customizations of the build which couldn't be done outside of sys.mk,
but excluded that support for fmake. Remove those hacks.

Sponsored by:		Netflix
Reviewed by: brooks
Pull Request: freebsd/freebsd-src#980
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
We don't need make_check to work in a fmake world anymore (nor have we
in the past decade). Just remove it here.

Note in passing it's been 10 years since we've added a new test here and
maybe we're past the need for this part of the build (or need to revamp
it to include all the features added to bmake since 2016 that the build
system silently depends on).

Sponsored by:		Netflix
Reviewed by: brooks
Pull Request: freebsd/freebsd-src#980
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
3 participants