Merge lp:~morphis/bluez/fix-snapcraft-source into lp:~bluetooth/bluez/snap-core-rolling

[Simon Fels]

Fixes to get build working on launchpad

* Use same autotools plugin we use for network-manager
* Fetch source tarball over http as launchpad proxy can't deal with git://
* Adjust stage-packages/build-packages to be correct

See https://launchpad.net/~phablet-team/+snap/bluez for successful builds with this.

[Scott Sweeny (ssweeny)]

snapcraft.yaml looks OK to me except for a deprecation warning about the icon definition. Instead of specifying it in the yaml file you put the icon file itself in setup/gui/[1]

[1] https://github.com/ubuntu-core/snapcraft/blob/master/docs/metadata.md#snap-icon

review: Needs Fixing

[Scott Sweeny (ssweeny)]

> snapcraft.yaml looks OK to me except for a deprecation warning about the icon
> definition. Instead of specifying it in the yaml file you put the icon file
> itself in setup/gui/[1]
>
> [1] https://github.com/ubuntu-core/snapcraft/blob/master/docs/metadata.md
> #snap-icon

... that should say "Instead of specifying it in the yaml file you *need to* put the icon file itself in setup/gui"

[lp:~morphis/bluez/fix-snapcraft-source]

43. By Simon Fels on 2016-04-14

Move icon at the place it belongs to

[Simon Fels (morphis)]

@Scott: Fixed

[Scott Sweeny (ssweeny)]

This looks good now, and I've proposed my own branch on top of it.

https://code.launchpad.net/~ssweeny/bluez/snappy-interface/+merge/292304

review: Approve

=== modified file 'parts/plugins/x-autotools.py'
--- parts/plugins/x-autotools.py	2016-01-29 19:01:42 +0000
+++ parts/plugins/x-autotools.py	2016-04-13 13:55:26 +0000
@@ -55,6 +55,21 @@
             'default': [],
         }
 
+        schema['properties']['install-via'] = {
+            'enum': ['destdir', 'prefix'],
+            'default': 'destdir',
+        }
+
+        schema['properties']['patches-dir'] = {
+            'type': 'string',
+            'default': 'patches',
+        }
+
+        schema['properties']['force-autogen'] = {
+            'type': 'boolean',
+            'default': 'true',
+        }
+
         return schema
 
     def __init__(self, name, options):
@@ -65,16 +80,27 @@
             'autopoint',
             'libtool',
             'make',
+            'quilt',
         ])
 
+        if options.install_via == 'destdir':
+            self.install_via_destdir = True
+        elif options.install_via == 'prefix':
+            self.install_via_destdir = False
+        else:
+            raise RuntimeError('Unsupported installation method: "{}"'.format(
+                options.install_via))
+
     def build(self):
         super().build()
 
-        self.run(['pwd'])
-        os.environ['QUILT_PATCHES'] = '../../../patches'
-        self.run(['quilt', 'push', '-a'])
-        
-        if not os.path.exists(os.path.join(self.builddir, "configure")):
+        patchdir = os.path.join(self.builddir, "../../..", self.options.patches_dir)
+
+        if os.path.exists(patchdir):
+            os.environ['QUILT_PATCHES'] = patchdir
+            self.run(['quilt', 'push', '-a'])
+
+        if not os.path.exists(os.path.join(self.builddir, "configure")) or self.options.force_autogen:
             autogen_path = os.path.join(self.builddir, "autogen.sh")
             if os.path.exists(autogen_path):
                 # Make sure it's executable
@@ -88,6 +114,17 @@
             else:
                 self.run(['autoreconf', '-i'])
 
-        self.run(['./configure', '--prefix='] + self.options.configflags)
-        self.run(['make'])
-        self.run(['make', 'install', 'DESTDIR=' + self.installdir])
+        configure_command = ['./configure']
+        make_install_command = ['make', 'install']
+
+        if self.install_via_destdir:
+            # Use an empty prefix since we'll install via DESTDIR
+            configure_command.append('--prefix=')
+            make_install_command.append('DESTDIR=' + self.installdir)
+        else:
+            configure_command.append('--prefix=' + self.installdir)
+
+        self.run(configure_command + self.options.configflags)
+        self.run(['make', '-j{}'.format(
+            snapcraft.common.get_parallel_build_count())])
+        self.run(make_install_command)

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2016-02-04 20:19:04 +0000
+++ snapcraft.yaml	2016-04-13 13:55:26 +0000
@@ -32,16 +32,15 @@
       apparmor: bluez.apparmor
       seccomp: bluez.seccomp
   obex-service:
-    type: migration-skill  
-    security-policy:  
+    type: migration-skill
+    security-policy:
       apparmor: obex.apparmor
       seccomp: obex.seccomp
 
 parts:
   bluez:
     plugin: autotools
-    source: git://git.kernel.org/pub/scm/bluetooth/bluez.git
-    source-tag: "5.37"
+    source: https://www.kernel.org/pub/linux/bluetooth/bluez-5.37.tar.xz
     configflags:
       - --prefix=/usr
       - --libexec=/usr/lib/
@@ -54,15 +53,15 @@
       - --disable-systemd
       - --disable-silent-rules
     build-packages:
+      - libglib2.0-dev
+      - libdbus-1-dev
       - libical-dev
-      - libreadline6-dev    
+      - libreadline6-dev
       - libudev-dev
       - pkg-config
       - quilt
     stage-packages:
-      - libglib2.0-dev
-      - libdbus-1-dev
-      - libical1a 
+      - libical1a
     filesets:
       libical1a:
         - usr/lib/*/libical*