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

kernel plugin: install .config as config-$kernelversion #2207

Merged
merged 1 commit into from
Aug 10, 2018
Merged

kernel plugin: install .config as config-$kernelversion #2207

merged 1 commit into from
Aug 10, 2018

Conversation

piso77
Copy link
Contributor

@piso77 piso77 commented Aug 9, 2018

In Ubuntu classic we ship the kernel config as config-$kernelversion in /boot, and the same we do for kernel snaps available in the store: they contain the kernel config file as config-$kernelversion in the root of the kernel snap.

Unfortunately the kernel plugin never shipped the .config used to build the kernel, so fix it by installing it as config-$kernelversion in the root of the freshly generated kernel snap.

This fixes LP1786190

Signed-off-by: Paolo Pisati p.pisati@gmail.com


Signed-off-by: Paolo Pisati <p.pisati@gmail.com>
@codecov-io
Copy link

codecov-io commented Aug 9, 2018

Codecov Report

Merging #2207 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2207      +/-   ##
==========================================
+ Coverage   91.17%   91.18%   +0.01%     
==========================================
  Files         202      202              
  Lines       12987    12991       +4     
  Branches     1921     1921              
==========================================
+ Hits        11841    11846       +5     
  Misses        777      777              
+ Partials      369      368       -1
Impacted Files Coverage Δ
snapcraft/plugins/kernel.py 94.22% <100%> (+0.1%) ⬆️
snapcraft/internal/elf.py 83.17% <0%> (+0.32%) ⬆️

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 67d94bd...aefb817. Read the comment docs.

Copy link

@ogra1 ogra1 left a comment

Choose a reason for hiding this comment

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

big +1 this is missing since forever

@@ -531,3 +531,8 @@ def do_install(self):
os.path.join(self.installdir, "lib", "firmware"), self.installdir
)
os.rmdir(os.path.join(self.installdir, "lib"))
# install .config as config-$version
config = "config-{}".format(self.kernel_release)
config_path = os.path.join(self.installdir, config)
Copy link
Collaborator

Choose a reason for hiding this comment

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

how about installing it under (self.installdir, "snap", config)? This way it sits together with every other manifesty thing.

Copy link

Choose a reason for hiding this comment

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

it sits next to the Symbols file with the above code and also matches where the config lives in the deb based kernel snaps, if we change it to go to the other dir, we should change the deb based snap builds alongside for consistency.

Copy link
Collaborator

Choose a reason for hiding this comment

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

ok, maybe the change should be globally planned then, I will leave it up to you to consolidate in a planned manner :-)

@sergiusens sergiusens merged commit 3b12e9c into canonical:master Aug 10, 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

4 participants