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

[Michael Terry]

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

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

[Michael Terry (mterry)]

(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.)

[Michael Terry (mterry)]

Address your comments, Ted. Thanks!

[Ricardo Salveti (rsalveti)]

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

[Snappy Tarmac (snappydevtarmac)]

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< ------------------------------------------------------...

[Snappy Tarmac (snappydevtarmac)]

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< ------------------------------------------------------...

[lp:~mterry/snapcraft/arch-fixes]

119. By Michael Terry on 2015-08-04

Also add ubuntu-snappy-cli as build-dep

=== modified file 'debian/control'
--- debian/control	2015-07-31 10:47:12 +0000
+++ debian/control	2015-08-04 20:46:15 +0000
@@ -6,6 +6,7 @@
                cmake,
                debhelper (>= 9),
                dh-python,
+               dpkg-dev,
                git,
                pep8,
                plainbox,
@@ -15,6 +16,7 @@
                python3-fixtures,
                python3-setuptools,
                python3-yaml,
+               ubuntu-snappy-cli,
                xz-utils,
 Homepage: https://launchpad.net/snapcraft
 Standards-Version: 3.9.6
@@ -24,6 +26,7 @@
 Depends: ${misc:Depends},
          ${python3:Depends},
          bzr,
+         dpkg-dev,
          git,
          python3-apt,
          python3-yaml,

=== added file 'integration-tests/data/assemble/binary1.after'
--- integration-tests/data/assemble/binary1.after	1970-01-01 00:00:00 +0000
+++ integration-tests/data/assemble/binary1.after	2015-08-04 20:46:15 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+export PATH="$SNAP_APP_PATH/bin:$SNAP_APP_PATH/usr/bin:$PATH"
+export LD_LIBRARY_PATH="$SNAP_APP_PATH/lib:$SNAP_APP_PATH/usr/lib:$SNAP_APP_PATH/lib/@MULTIARCH@:$SNAP_APP_PATH/usr/lib/@MULTIARCH@:$LD_LIBRARY_PATH"
+exec "$SNAP_APP_PATH/binary1" $*
\ No newline at end of file

=== modified file 'integration-tests/data/assemble/package.yaml.after'
--- integration-tests/data/assemble/package.yaml.after	2015-07-21 19:09:27 +0000
+++ integration-tests/data/assemble/package.yaml.after	2015-08-04 20:46:15 +0000
@@ -1,3 +1,4 @@
+architecture: @ARCH@
 binaries:
 - exec: binary1.wrapper
   name: assemble-bin
@@ -7,6 +8,6 @@
 services:
 - name: assemble-service
   start: service-start.wrapper
-  stop: service-stop.wrapper with 'ar gs'
+  stop: service-stop.wrapper with args
 vendor: [e-mail]
 version: 1.0

=== modified file 'integration-tests/data/assemble/snappy/package.yaml'
--- integration-tests/data/assemble/snappy/package.yaml	2015-07-21 19:09:27 +0000
+++ integration-tests/data/assemble/snappy/package.yaml	2015-08-04 20:46:15 +0000
@@ -4,7 +4,7 @@
 services:
   - name: assemble-service
     start: service-start
-    stop: "./service-stop with ar\\ gs"
+    stop: "./service-stop with args"
 binaries:
   - name: assemble-bin
     exec: binary1

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-07-28 19:55:07 +0000
+++ integration-tests/units/jobs.pxu	2015-08-04 20:46:15 +0000
@@ -36,7 +36,11 @@
     cp -rT $PLAINBOX_PROVIDER_DATA/assemble .
     echo "snappy-metadata: snappy" >> snapcraft.yaml
     ${SNAPCRAFT} assemble
+    test -e "assemble_1.0_$(dpkg-architecture -qDEB_BUILD_ARCH).snap"
+    sed -i "s/@ARCH@/$(dpkg-architecture -qDEB_BUILD_ARCH)/g" package.yaml.after
     diff -u package.yaml.after snap/meta/package.yaml
+    sed -i "s/@MULTIARCH@/$(dpkg-architecture -qDEB_BUILD_MULTIARCH)/g" binary1.after
+    diff -u binary1.after snap/binary1.wrapper
     export SNAP_APP_PATH=`pwd`/snap
     test "$(./snap/service-start.wrapper)" = "service-start"
     test "$(./snap/service-stop.wrapper)" = "service-stop"

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-07-30 18:42:09 +0000
+++ snapcraft/cmds.py	2015-08-04 20:46:15 +0000
@@ -144,6 +144,10 @@
             stopwrap = wrap_exe(stopparts[0])
             binary['stop'] = replace_cmd(stopparts, stopwrap)
 
+    # Set architecture if none provided
+    if 'architecture' not in package and 'architectures' not in package:
+        package['architecture'] = snapcraft.common.get_arch()
+
     with open("snap/meta/package.yaml", 'w') as f:
         yaml.dump(package, f, default_flow_style=False)
 

=== modified file 'snapcraft/common.py'
--- snapcraft/common.py	2015-07-23 17:19:25 +0000
+++ snapcraft/common.py	2015-08-04 20:46:15 +0000
@@ -25,6 +25,8 @@
 COMMAND_ORDER = ["pull", "build", "stage", "snap"]
 _DEFAULT_PLUGINDIR = '/usr/share/snapcraft/plugins'
 _plugindir = _DEFAULT_PLUGINDIR
+_arch = None
+_arch_triplet = None
 
 env = []
 
@@ -48,6 +50,20 @@
     sys.exit(1)
 
 
+def get_arch():
+    global _arch
+    if _arch is None:
+        _arch = subprocess.check_output(['dpkg-architecture', '-qDEB_BUILD_ARCH']).decode('utf8').strip()
+    return _arch
+
+
+def get_arch_triplet():
+    global _arch_triplet
+    if _arch_triplet is None:
+        _arch_triplet = subprocess.check_output(['dpkg-architecture', '-qDEB_BUILD_MULTIARCH']).decode('utf8').strip()
+    return _arch_triplet
+
+
 def get_stagedir():
     return os.path.join(os.getcwd(), 'stage')
 

=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-07-23 17:19:25 +0000
+++ snapcraft/yaml.py	2015-08-04 20:46:15 +0000
@@ -113,14 +113,14 @@
 
     def runtime_env(self, root):
         env = []
-        env.append("PATH=\"%s/bin:%s/usr/bin:$PATH\"" % (root, root))
-        env.append("LD_LIBRARY_PATH=\"%s/lib:%s/usr/lib:$LD_LIBRARY_PATH\"" % (root, root))
+        env.append('PATH="{0}/bin:{0}/usr/bin:$PATH"'.format(root))
+        env.append('LD_LIBRARY_PATH="{0}/lib:{0}/usr/lib:{0}/lib/{1}:{0}/usr/lib/{1}:$LD_LIBRARY_PATH"'.format(root, snapcraft.common.get_arch_triplet()))
         return env
 
     def build_env(self, root):
         env = []
-        env.append("CFLAGS=\"-I%s/include $CFLAGS\"" % root)
-        env.append("LDFLAGS=\"-L%s/lib -L%s/usr/lib $LDFLAGS\"" % (root, root))
+        env.append('CFLAGS="-I{0}/include -I{0}/usr/include -I{0}/include/{1} -I{0}/usr/include/{1} $CFLAGS"'.format(root, snapcraft.common.get_arch_triplet()))
+        env.append('LDFLAGS="-L{0}/lib -L{0}/usr/lib -L{0}/lib/{1} -L{0}/usr/lib/{1} $LDFLAGS"'.format(root, snapcraft.common.get_arch_triplet()))
         return env
 
     def build_env_for_part(self, part):