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

kbuild: stop modifying kconfigfile #2204

Conversation

kyrofa
Copy link
Contributor

@kyrofa kyrofa commented Aug 8, 2018

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • If this is a bugfix. Have you checked that there is a bug report open for the issue you are trying to fix on bug reports?
  • If this is a new feature. Have you discussed the design on the forum?
  • Have you successfully run ./runtests.sh static?
  • Have you successfully run ./runtests.sh unit?

If the kconfigfile option is supplied, the kbuild plugin uses a hard link to put it into place. This becomes problematic if kconfigfile is used alongside kconfigs, because doing so modifies the config file, thereby modifying the original kconfigfile in the source tree.

This PR fixes LP: #1786083 by copying the kconfigfile instead of using hard links.

If the `kconfigfile` option is supplied, the kbuild plugin uses a hard
link to put it into place. This becomes problematic if `kconfigfile` is
used alongside `kconfigs`, because doing so modifies the config file,
thereby modifying the original `kconfigfile` in the source tree.

Fix this by copying the `kconfigfile` instead of using hard links.

LP: #1786083

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
@codecov-io
Copy link

codecov-io commented Aug 8, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@1af1ae5). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2204   +/-   ##
=========================================
  Coverage          ?   91.12%           
=========================================
  Files             ?      201           
  Lines             ?    12924           
  Branches          ?     1915           
=========================================
  Hits              ?    11777           
  Misses            ?      779           
  Partials          ?      368
Impacted Files Coverage Δ
snapcraft/plugins/kbuild.py 88.57% <100%> (ø)

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 1af1ae5...4db15f1. Read the comment docs.

@sergiusens sergiusens merged commit f156050 into canonical:master Aug 9, 2018
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.

None yet

3 participants