kernel plugin: if dtb target == NULL and arch == (arm||arm64), build and install all dtbs #1148

Merged
merged 2 commits into from Mar 5, 2017

Conversation

Projects
None yet
4 participants
Contributor

piso77 commented Feb 17, 2017

If dtb target == NULL and arch == (arm||arm64), build and install all dtbs by default.

Signed-off-by: Paolo Pisati paolo.pisati@canonical.com

LP: #1665656

Collaborator

sergiusens commented Feb 21, 2017

mind updating the unit tests here?

Paolo Pisati and others added some commits Feb 2, 2017

kernel plugin: if dtb target == NULL and arch == (arm||arm64), build …
…and install

all dtbs

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
@@ -863,15 +863,15 @@ def test_kernel_image_target_as_map(self):
plugin = kernel.KernelPlugin('test-part', self.options,
project_options)
- self.assertEqual(plugin.make_targets, ['Image', 'modules'])
+ self.assertEqual(plugin.make_targets, ['Image', 'modules', 'dtbs'])
@kyrofa

kyrofa Feb 27, 2017

Member

Do we have any tests that cover when not building on these architectures, and thus makes sure dtbs aren't built for them?

@sergiusens

sergiusens Mar 5, 2017

Collaborator

Yes we do although not directly visible on https://github.com/snapcore/snapcraft/pull/1148/files#diff-6f5410d7a6a3500fab904417fc36123dR779

We should probably refactor the kernel tests into many smaller classes but Paolo shouldn't be the one to do that.

@sergiusens sergiusens merged commit 2426177 into snapcore:master Mar 5, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
xenial-amd64 autopkgtest finished (success)
Details
+ self.make_targets.append('dtbs')
+ self.make_install_targets.extend([
+ 'dtbs_install',
+ 'INSTALL_DTBS_PATH={}/dtbs'.format(self.installdir)])
@elopio

elopio Mar 7, 2017

Member

We also run this tests in armhf and arm64. The tests were not updated to take into account that they could be running on these architectures, so now we have new failures:

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-xenial-snappy-dev-snapcraft-daily/xenial/armhf/s/snapcraft/20170307_030329_f94e4@/log.gz

This is pretty important, because we can't land in the archives if the tests start failing. @piso77, can you please take a look?

elopio added a commit that referenced this pull request Mar 27, 2017

kernel plugin: if no dtb target is set when the arch is arm.* build t…
…hem all. (#1148)

Build all dtbs if no specific dtb is requested on architectures that support dtbs.

LP: #1665656

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

kalikiana pushed a commit to kalikiana/snapcraft that referenced this pull request Apr 6, 2017

kernel plugin: if no dtb target is set when the arch is arm.* build t…
…hem all. (#1148)

Build all dtbs if no specific dtb is requested on architectures that support dtbs.

LP: #1665656

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment