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.

Sign up for GitHub

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

Jump to bottom

Replace EXTRA_DIST with dist_noinst_DATA #13505

Merged
merged 1 commit into from
May 26, 2022
Merged

Replace EXTRA_DIST with dist_noinst_DATA #13505

merged 1 commit into from
May 26, 2022

Conversation

behlendorf
Copy link
Contributor

Motivation and Context

Alternative for #13481
Closes: #13459

Description

The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am. This results in the make dist target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

How Has This Been Tested?

Locally compiled on Ubuntu 20.04 with:

sh autogen.sh && ./configure --with-config=dist && V=1 make -j16 pkg-utils

Updated the CI to use --with-config=dist when building.

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:

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label May 25, 2022
@behlendorf behlendorf mentioned this pull request May 25, 2022
Closed
13 tasks
nabijaczleweli
nabijaczleweli approved these changes May 25, 2022
View reviewed changes
Copy link
Contributor

@nabijaczleweli nabijaczleweli left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This is pretty ass (vs. the existing EXTRA_DIST) IMO, but it's a better workaround than spending half a second best-case preprocessing. One whitespace note, otherwise +2.

cmd/Makefile.am Show resolved Hide resolved
@behlendorf
Replace EXTRA_DIST with dist_noinst_DATA
df708f4 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels May 25, 2022
@adamdmoss
Copy link
Contributor

adamdmoss commented May 26, 2022 •
edited
Loading

I confirm that this alternative fix does fix #13459 for me. Thanks. :)

@behlendorf behlendorf merged commit d98a67a into openzfs:master May 26, 2022
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@behlendorf @nicman23
Replace EXTRA_DIST with dist_noinst_DATA
84368ee 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@behlendorf @nicman23
Replace EXTRA_DIST with dist_noinst_DATA
8d98f6d 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Sep 12, 2022
@behlendorf @lundman
Replace EXTRA_DIST with dist_noinst_DATA
f03b32d 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
beren12 pushed a commit to beren12/zfs that referenced this pull request Sep 19, 2022
@behlendorf @beren12
Replace EXTRA_DIST with dist_noinst_DATA
1049805 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
23c5357 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
eb87ab8 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
03c8bda 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
0d17ae5 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
015e713 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
f63756e 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
8c93ac6 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
7ed0996 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
d33a789 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
2c40b8e 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
11082de 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
44cf0eb 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
22dba4f 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
6ccc33d 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
0e8b914 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
4ce1daa 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
436a730 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
24a675e 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
c392e34 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
184e51b 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
8fb50fe 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
475b726 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
040540d 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
492c78d 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
62a5905 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
f0d8182 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Replace EXTRA_DIST with dist_noinst_DATA
2c94c95 
The EXTRA_DIST variable is ignored when used in the FALSE conditional
of a Makefile.am.  This results in the `make dist` target omitting
these files from the generated tarball unless CONFIG_USER is defined.
This issue can be avoided by switching to use the dist_noinst_DATA
variable which is handled as expected by autoconf.

This change also adds support for --with-config=dist as an alias
for --with-config=srpm and updates the GitHub workflows to use it.

Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13459
Closes openzfs#13505
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nabijaczleweli nabijaczleweli nabijaczleweli approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build issues since 5cdca5b1da7884c54260db473f892354bc79951b
3 participants
@behlendorf @adamdmoss @nabijaczleweli