netbsd: Adapt to BSD-common infra changes for FreeBSD #194698
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ericson2314
commented
Oct 6, 2022
alyssais
reviewed
Oct 6, 2022
| mkdir -p $(dirname $last) | ||
| xinstall "$@" | ||
| @out@/bin/xinstall "$@" |
There was a problem hiding this comment.
Is this just because it's more correct, or did something break?
There was a problem hiding this comment.
@alyssais just more correct for NetBSD, but when I went to build FreeBSD Make with NetBSD Make or something like that it did break.
|
|
Yeah, I saw that you didn't introduce it. I think it would be worth changing though, as I assumed it would refer to the root directory, which made seeing how the change worked quite confusing. |
Ericson2314
force-pushed
the
freebsd-prep
branch
from
e132380
to
6cf81f9
Compare
See NixOS#82131 for the rest of the changes for FreeBSD. This is PRed separately because it is a macOS moderate rebuild so we target staging. The main change is that we CD to the path we're building *after* applying patches, so we can patch other parts of the tree (from `extraPaths`) as needed. Another change is that `netbsd.install` no longer depends on `fts`, which it evidently no longer needs.
@alyssais and I agreed this is clearer.
Ericson2314
force-pushed
the
freebsd-prep
branch
from
6cf81f9
to
044163d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
See #82131 for the rest of the changes for FreeBSD. This is PRed separately because it is a macOS moderate rebuild so we target staging.
The main change is that we CD to the path we're building after applying patches, so we can patch other parts of the tree (from
extraPaths) as needed.Another change is that
netbsd.installno longer depends onfts, which it evidently no longer needs.Also, rename
BSD_PATHtoCOMPONENT_PATH.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes