Merge lp://qastaging/~mterry/snapcraft/arch-fixes into lp://qastaging/~snappy-dev/snapcraft/core

Proposed by Michael Terry
Status: Merged
Approved by: Michael Terry
Approved revision: 119
Merged at revision: 117
Proposed branch: lp://qastaging/~mterry/snapcraft/arch-fixes
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 155 lines (+38/-6)
8 files modified
debian/control (+3/-0)
integration-tests/data/assemble/binary1.after (+4/-0)
integration-tests/data/assemble/package.yaml.after (+2/-1)
integration-tests/data/assemble/snappy/package.yaml (+1/-1)
integration-tests/units/jobs.pxu (+4/-0)
snapcraft/cmds.py (+4/-0)
snapcraft/common.py (+16/-0)
snapcraft/yaml.py (+4/-4)
To merge this branch: bzr merge lp://qastaging/~mterry/snapcraft/arch-fixes
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
Review via email: mp+266149@code.qastaging.launchpad.net

Commit message

Include the multiarch triplet to LD_LIBRARY_PATH and set the 'architecture' key in package.yaml if not present for the user.

Description of the change

Include the multiarch triplet to LD_LIBRARY_PATH and set the 'architecture' key in package.yaml if not present for the user.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

(I dropped the 'ar gs' bit because quotes are not legal characters in a service stop field and we weren't actually generating a snap file in that test. I don't know how you are supposed to pass arguments with spaces. But that's not snapcraft's problem.)

Revision history for this message
Ted Gould (ted) :
Revision history for this message
Michael Terry (mterry) wrote :

Address your comments, Ted. Thanks!

Revision history for this message
Ricardo Salveti (rsalveti) wrote :

We might need to extend the DEB_BUILD later on if we add support for cross build (since the target arch is different), but this is great for now.

review: Approve
Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :
Download full text (124.1 KiB)

The attempt to merge lp:~mterry/snapcraft/arch-fixes into lp:snapcraft failed. Below is the output from the failed tests.

parts:
cp --preserve=all zzz /tmp/tmprb6m7qg2/parts/copy/install/zzz
cp --preserve=all src /tmp/tmpb9baxo95/parts/copy/install/dst
cp --preserve=all src /tmp/tmpbs3pg_c8/parts/copy/install/dir/dst
===============================[ Analyzing Jobs ]===============================
=============================[ Session Statistics ]=============================
This session is about 0.00% complete
Estimated duration is 5.70 for automated jobs.
Estimated duration cannot be determined for manual jobs.
Size of the desired job list: 19
Size of the effective execution plan: 19
===========================[ Running Selected Jobs ]============================
--------------[ Running job 1 / 19. Estimated time left: 0:00:06 ]--------------
--------------------------[ snapcraft/normal/no-yaml ]--------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/no-yaml
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Could not find snapcraft.yaml. Are you sure you're in the right directory? To start a new project, use 'snapcraft init'
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 2 / 19. Estimated time left: 0:00:06 ]--------------
---------------------[ snapcraft/normal/assemble-no-meta ]----------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/assemble-no-meta
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Pulling make-project Building make-project make: Nothing to be done for `all'. cp -a bin /tmp/cwd-gc_t2um1.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install/bin cp -a subdir /tmp/cwd-gc_t2um1.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install/subdir if [ -e copy-meta ]; then \ cp -arT snappy /tmp/cwd-gc_t2um1.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install/meta; \ fi cp -a service-start service-stop binary1 /tmp/cwd-gc_t2um1.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install/ make make install DESTDIR=/tmp/cwd-gc_t2um1.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install Staging make-project Snapping make-project Missing snappy metadata file 'meta/package.yaml'. Try specifying 'snappy-metadata' in snapcraft.yaml, pointing to a meta directory in your source tree.
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 3 / 19. Estimated time left: 0:00:05 ]--------------
-----------------[ snapcraft/normal/assemble-meta-externally ]------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/assemble-meta-externally
Category: 2013.com.canonical.plainbox::uncategorised
... 8< ------------------------------------------------------...

Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :
Download full text (127.0 KiB)

The attempt to merge lp:~mterry/snapcraft/arch-fixes into lp:snapcraft failed. Below is the output from the failed tests.

parts:
cp --preserve=all zzz /tmp/tmpneqmzl0n/parts/copy/install/zzz
cp --preserve=all src /tmp/tmp5a40or_g/parts/copy/install/dst
cp --preserve=all src /tmp/tmptuomgmgk/parts/copy/install/dir/dst
===============================[ Analyzing Jobs ]===============================
=============================[ Session Statistics ]=============================
This session is about 0.00% complete
Estimated duration is 5.70 for automated jobs.
Estimated duration cannot be determined for manual jobs.
Size of the desired job list: 19
Size of the effective execution plan: 19
===========================[ Running Selected Jobs ]============================
--------------[ Running job 1 / 19. Estimated time left: 0:00:06 ]--------------
--------------------------[ snapcraft/normal/no-yaml ]--------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/no-yaml
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Could not find snapcraft.yaml. Are you sure you're in the right directory? To start a new project, use 'snapcraft init'
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 2 / 19. Estimated time left: 0:00:06 ]--------------
---------------------[ snapcraft/normal/assemble-no-meta ]----------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/assemble-no-meta
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Pulling make-project Building make-project make: Nothing to be done for `all'. cp -a bin /tmp/cwd-mo5sfdqq.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install/bin cp -a subdir /tmp/cwd-mo5sfdqq.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install/subdir if [ -e copy-meta ]; then \ cp -arT snappy /tmp/cwd-mo5sfdqq.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install/meta; \ fi cp -a service-start service-stop binary1 /tmp/cwd-mo5sfdqq.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install/ make make install DESTDIR=/tmp/cwd-mo5sfdqq.9812b6d1dd2c7b455a6d7f3d08d2a5598605734397c3502e75d2d7dec126c0a6/parts/make-project/install Staging make-project Snapping make-project Missing snappy metadata file 'meta/package.yaml'. Try specifying 'snappy-metadata' in snapcraft.yaml, pointing to a meta directory in your source tree.
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 3 / 19. Estimated time left: 0:00:05 ]--------------
-----------------[ snapcraft/normal/assemble-meta-externally ]------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/assemble-meta-externally
Category: 2013.com.canonical.plainbox::uncategorised
... 8< ------------------------------------------------------...

119. By Michael Terry

Also add ubuntu-snappy-cli as build-dep

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches