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

Jump to bottom

Fix icp include directories for in-tree build #10021

Merged
merged 1 commit into from Feb 20, 2020
Merged

Fix icp include directories for in-tree build #10021

merged 1 commit into from Feb 20, 2020

Conversation

nivedita76
Copy link
Contributor

@nivedita76 nivedita76 commented Feb 18, 2020 •
edited

When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Signed-off-by: Arvind Sankar nivedita@alum.mit.edu
Closes #9988

Motivation and Context

Description

How Has This Been Tested?

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.
  • I have run the ZFS Test Suite with this change applied.
  • All commit messages are properly formatted and contain Signed-off-by.

@nivedita76
Fix icp include directories for in-tree build
4304c9b 
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
@nivedita76 nivedita76 marked this pull request as ready for review February 18, 2020 23:03
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Feb 18, 2020
@codecov
Copy link

codecov bot commented Feb 19, 2020 •
edited

Codecov Report

Merging #10021 into master will increase coverage by <1%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           master   #10021    +/-   ##
========================================
+ Coverage      79%      79%   +<1%     
========================================
  Files         386      386            
  Lines      122448   122448            
========================================
+ Hits        97096    97179    +83     
+ Misses      25352    25269    -83
Flag Coverage Δ
#kernel 79% <ø> (ø) ⬇️
#user 67% <ø> (+1%) ⬆️

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 89adffb...4304c9b. Read the comment docs.

behlendorf
behlendorf approved these changes Feb 19, 2020
View reviewed changes
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 the fix.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Feb 19, 2020
@behlendorf behlendorf merged commit 65635c3 into openzfs:master Feb 20, 2020
@nivedita76 nivedita76 deleted the icp-build-fix branch February 20, 2020 20:42
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Apr 15, 2020
@nivedita76 @tonyhutter
Fix icp include directories for in-tree build
c9796f0 
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes openzfs#10021
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Apr 22, 2020
@nivedita76 @tonyhutter
Fix icp include directories for in-tree build
0465460 
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes openzfs#10021
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Apr 22, 2020
@nivedita76 @tonyhutter
Fix icp include directories for in-tree build
68c7930 
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes openzfs#10021
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Apr 23, 2020
@nivedita76 @tonyhutter
Fix icp include directories for in-tree build
f3aa8ff 
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes openzfs#10021
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Apr 28, 2020
@nivedita76 @tonyhutter
Fix icp include directories for in-tree build
35793aa 
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes openzfs#10021
tonyhutter pushed a commit that referenced this pull request May 12, 2020
@nivedita76 @tonyhutter
Fix icp include directories for in-tree build
5c47461 
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10021
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
@nivedita76 @jsai20
Fix icp include directories for in-tree build
935a5f6 
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes openzfs#10021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf 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.

ICP build error with --enable-linux-builtin and separate kernel source and build directories
2 participants
@nivedita76 @behlendorf