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

config/Substfiles.am: restrict to the dedicated list. #15980

Merged
merged 1 commit into from
Apr 9, 2024

Conversation

heroxbd
Copy link
Contributor

@heroxbd heroxbd commented Mar 9, 2024

Motivation and Context

We recover the scope of $(SUBSTFILES) to explicitly control what files are being generated from the corresponding .in.

Description

Put zfs_prepare_disk.8 into substitution list. b53077a forgot to include the zfs_prepare_disk.8 in the substitution list, although it built in the past because 38e2e9c accidentally dropped the $(SUBSTFILES) from the "%: %.in" pattern.

How Has This Been Tested?

Tested in Debian unstable.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@heroxbd
Copy link
Contributor Author

heroxbd commented Mar 9, 2024

This could be considered together with #15979.

Copy link
Contributor

@behlendorf behlendorf 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 sorting this out.

man/Makefile.am Outdated Show resolved Hide resolved
@Harry-Chen
Copy link
Contributor

@heroxbd You need to rebase your PR onto current master (with my fix #15979 landed), otherwise zfs won't build because zfs_prepare_disk.8 is not processed anymore.

@behlendorf
Copy link
Contributor

@heroxbd if you can rebase this change on master and force update the PR we can get it included.

We recover the scope of $(SUBSTFILES) to explicitly control what files
are being generated from the corresponding .in.

Signed-off-by: Benda Xu <orv@debian.org>
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Apr 9, 2024
@behlendorf behlendorf merged commit d98973d into openzfs:master Apr 9, 2024
25 checks passed
@heroxbd
Copy link
Contributor Author

heroxbd commented Apr 10, 2024

Thanks Brian!

@Harry-Chen Harry-Chen mentioned this pull request Apr 22, 2024
13 tasks
tonyhutter pushed a commit that referenced this pull request May 2, 2024
We recover the scope of $(SUBSTFILES) to explicitly control what files
are being generated from the corresponding .in.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Benda Xu <orv@debian.org>
Closes #15980
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Sep 4, 2024
We recover the scope of $(SUBSTFILES) to explicitly control what files
are being generated from the corresponding .in.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Benda Xu <orv@debian.org>
Closes openzfs#15980
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants