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

Fedora 28: Fix "Macro %_dracutdir has empty body" #7328

Merged
merged 1 commit into from
Mar 25, 2018

Conversation

tonyhutter
Copy link
Contributor

@tonyhutter tonyhutter commented Mar 21, 2018

Description

If you run ./configure --with-config=srpm, it will not trigger the user m4 scripts to populate the dracut and udev directories. This causes a build error on Fedora 28. Make the dracut and udev lines conditional to get around this.

Motivation and Context

Fix one part of Fedora 28 builds. Closes: #7326

How Has This Been Tested?

Tested on Fedora 28 rawhide VM.

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)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commit messages are properly formatted and contain Signed-off-by.
  • Change has been approved by a ZFS on Linux member.

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.

The Fedora Rawhide build failure here is because the full-debug kernel is installed by default the latest kernel-devel package doesn't include objtool. Why don't we resolve this by switching to the nodebug kernel which is what will be used when in the final Fedora release. This seems to be a regression in the Fedora kernel packaging which they'll hopefully sort out quickly.

dnl #
dnl # ./configure --with-config=srpm
dnl #
AS_IF([test "$dracutdir" != "" ], [
Copy link
Contributor

Choose a reason for hiding this comment

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

How about using test -n here instead.

@codecov
Copy link

codecov bot commented Mar 22, 2018

Codecov Report

Merging #7328 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7328      +/-   ##
==========================================
- Coverage   76.33%   76.31%   -0.02%     
==========================================
  Files         329      329              
  Lines      104190   104193       +3     
==========================================
- Hits        79530    79512      -18     
- Misses      24660    24681      +21
Flag Coverage Δ
#kernel 76.06% <ø> (-0.05%) ⬇️
#user 65.56% <ø> (-0.04%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 387b685...3f3a758. Read the comment docs.

If you run ./configure --with-config=srpm, it will not trigger
the user m4 scripts to populate the dracut and udev directories.
This causes a build error on Fedora 28.  Make the dracut and
udev lines conditional to get around this.

Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes: openzfs#7326
@tonyhutter
Copy link
Contributor Author

tonyhutter commented Mar 23, 2018

@behlendorf I made the -n change in my latest push. It's building ok in my Fedora 28 VM. I did notice that buildbot was using fc29 kernel 4.16.0-0.rc6.git1.1.fc29.x86_64 and my VM are using 4.16.0-0.rc6.git0.2.fc28.x86_64, but I dunno if that's relevant.

@behlendorf behlendorf merged commit 9ea6c3d into openzfs:master Mar 25, 2018
tonyhutter added a commit to tonyhutter/zfs that referenced this pull request Apr 16, 2018
If you run ./configure --with-config=srpm, it will not trigger
the user m4 scripts to populate the dracut and udev directories.
This causes a build error on Fedora 28.  Make the dracut and
udev lines conditional to get around this.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes openzfs#7326
Closes openzfs#7328
tonyhutter added a commit to tonyhutter/zfs that referenced this pull request May 4, 2018
If you run ./configure --with-config=srpm, it will not trigger
the user m4 scripts to populate the dracut and udev directories.
This causes a build error on Fedora 28.  Make the dracut and
udev lines conditional to get around this.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes openzfs#7326
Closes openzfs#7328
tonyhutter added a commit that referenced this pull request May 10, 2018
If you run ./configure --with-config=srpm, it will not trigger
the user m4 scripts to populate the dracut and udev directories.
This causes a build error on Fedora 28.  Make the dracut and
udev lines conditional to get around this.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #7326
Closes #7328
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fedora 28: Macro %_dracutdir has empty body
2 participants