Merge lp://qastaging/~ted/snapcraft/pkg-config-sysroot into lp://qastaging/~snappy-dev/snapcraft/core

Proposed by Ted Gould
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 190
Merged at revision: 205
Proposed branch: lp://qastaging/~ted/snapcraft/pkg-config-sysroot
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 129 lines (+76/-4)
6 files modified
integration-tests/data/build-tools/Makefile (+6/-0)
integration-tests/data/build-tools/icon.svg (+1/-0)
integration-tests/data/build-tools/snapcraft.yaml (+14/-0)
integration-tests/units/jobs.pxu (+12/-0)
snapcraft/__init__.py (+7/-0)
snapcraft/yaml.py (+36/-4)
To merge this branch: bzr merge lp://qastaging/~ted/snapcraft/pkg-config-sysroot
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
Daniel Holbach (community) Needs Fixing
Review via email: mp+271751@code.qastaging.launchpad.net

Commit message

Ensure C library configuration tools don't use system paths

Description of the change

Creating a new dev box with Wily and realized that previously some deps were getting pulled from my system. Fixing them.

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

Looks good, I'd just move the method to repo.Ubuntu.

Also a small integration or unit test would be great.

review: Needs Fixing
Revision history for this message
Ted Gould (ted) wrote :

Kinda a crazy test, but it does test the feature.

Revision history for this message
Sergio Schvezov (sergiusens) :
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

ty vm

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

The attempt to merge lp:~ted/snapcraft/pkg-config-sysroot into lp:snapcraft failed. Below is the output from the failed tests.

The project has gotten complex.
Here's the list of units exceeding 10:
- ./snapcraft/cmds.py:
  284:1: 'cmd' 13

name: # the name of the snap
version: # the version of the snap
# The vendor for the snap (replace 'Vendor <email address hidden>')
vendor: Vendor <email address hidden>
summary: # 79 char long summary
description: # A longer description for the snap
icon: # A path to an icon for the package
cp --preserve=all -R zzz /tmp/tmphawmcd93/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmpiw9glgqg/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmpaqsrsx5k/parts/copy/install/dir/dst

deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ trusty universe
deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe
deb http://ports.ubuntu.com/ubuntu-ports/ trusty multiverse
deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates multiverse
deb http://ports.ubuntu.com/ubuntu-ports trusty-security main restricted
deb http://ports.ubuntu.com/ubuntu-ports trusty-security universe
deb http://ports.ubuntu.com/ubuntu-ports trusty-security multiverse

===============================[ Analyzing Jobs ]===============================
=============================[ Session Statistics ]=============================
This session is about 0.00% complete
Estimated duration is 97.30 for automated jobs.
Estimated duration cannot be determined for manual jobs.
Size of the desired job list: 27
Size of the effective execution plan: 27
===========================[ Running Selected Jobs ]============================
--------------[ Running job 1 / 27. Estimated time left: 0:01:37 ]--------------
--------------------------[ 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 are in the right directory? To start a new project, use 'snapcraft init'
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 2 / 27. Estimated time left: 0:01:37 ]--------------
------------------------[ snapcraft/normal/no-yaml-run ]------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/no-yaml-run
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Could not find snapcraft.yaml. Are you sure you are in the right directory? To start a new project, use 'snapcraft init'
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 3 / 27. Estimated time left: 0:01:37 ]--------------
-----------------[ snapcraft/normal/assemble-meta-externally ]------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/assemble-meta-ex...

Revision history for this message
Daniel Holbach (dholbach) wrote :

2015.com.canonical.snapcraft::snapcraft/normal/build-tool-paths: fail

+ cp -rT /tmp/tarmac/branch.l0nry5/integration-tests/data/build-tools .
+ snapcraft stage
No keyring installed in /tmp/cwd-_o0ohin1.5a9a153f54a0cb00280a728f7f26acc5a87ce06f9284b77abfa4b99251a0153d/parts/make-project/ubuntu/etc/apt/trusted.gpg.d/.No keyring installed in /tmp/cwd-_o0ohin1.5a9a153f54a0cb00280a728f7f26acc5a87ce06f9284b77abfa4b99251a0153d/parts/make-project/ubuntu/etc/apt/trusted.gpg.d/.No keyring installed in /tmp/cwd-_o0ohin1.5a9a153f54a0cb00280a728f7f26acc5a87ce06f9284b77abfa4b99251a0153d/parts/make-project/ubuntu/etc/apt/trusted.gpg.d/.+ snapcraft shell pkg-config --cflags glib-2.0
++ pwd
+ grep -q /tmp/cwd-_o0ohin1.5a9a153f54a0cb00280a728f7f26acc5a87ce06f9284b77abfa4b99251a0153d
Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
No package 'glib-2.0' found

review: Needs Fixing
188. By Ted Gould

Add 'PKG_CONFIG_PATH' and break up long lines

189. By Ted Gould

Merge trunk

190. By Ted Gould

Make consistent with single quotes

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

\o/

review: Approve

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

to all changes: