Merge lp:~ssweeny/location-service/gps-arm64 into lp:location-service/trunk

[Scott Sweeny]

Enable gps provider on arm64.

This MP supercedes vicamo's gps-on-arm64 branch[1] with fixes to some merge conflicts due to a trunk update

[1] https://code.launchpad.net/~vicamo/location-service/gps-arm64/+merge/304362

[Yuan-Chen Cheng (ycheng-twn)]

LGTM !

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:273
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build/1/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/build-0-fetch/1
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=yakkety/1/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=vivid+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=xenial+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=yakkety/1/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=vivid+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=xenial+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=yakkety/1/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[Yuan-Chen Cheng (ycheng-twn)]

@Scott,

Verified GPS location retrieved with packages in silo installed.

ii ubuntu-location-service-bin 3.0.0+16.04.20160912-0ubuntu1
ii libubuntu-location-service3:arm64 3.0.0+16.04.20160912-0ubuntu1

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:273
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-0-fetch/2/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:273
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build/3/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/build-0-fetch/3
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=yakkety/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=vivid+overlay/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=xenial+overlay/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=yakkety/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=vivid+overlay/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=xenial+overlay/2/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=yakkety/2/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:273
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build/4/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-0-fetch/4/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:273
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build/5/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/build-0-fetch/5
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3
        deb: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=amd64,release=yakkety/3/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=vivid+overlay/3/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=xenial+overlay/3/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=cross-armhf,release=yakkety/3/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=vivid+overlay/3/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=xenial+overlay/3
        deb: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=xenial+overlay/3/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=yakkety/3
        deb: https://jenkins.canonical.com/system-enablement/job/build-2-binpkg/arch=i386,release=yakkety/3/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/lp-location-service-ci/5/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/bileto_pre_release_hook'
--- debian/bileto_pre_release_hook	2016-04-12 06:33:54 +0000
+++ debian/bileto_pre_release_hook	2016-09-12 19:20:14 +0000
@@ -69,6 +69,7 @@
 process "$dir/libubuntu-location-service-dev.install.in" >"$dir/libubuntu-location-service-dev.install"
 
 ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.amd64"
+ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.arm64"
 ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.armhf"
 ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.i386"
 

=== modified file 'debian/control'
--- debian/control	2016-04-05 17:16:02 +0000
+++ debian/control	2016-09-12 19:20:14 +0000
@@ -29,8 +29,8 @@
                libnet-cpp-dev,
                libprocess-cpp-dev,
                libtrust-store-dev,
-               libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
-               libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
+               libubuntu-platform-hardware-api-headers [!ppc64el !powerpc],
+               libubuntu-platform-hardware-api-dev [!ppc64el !powerpc],
                libproperties-cpp-dev,
                lsb-release,
                trust-store-bin,

=== modified file 'debian/control.in'
--- debian/control.in	2016-03-11 11:01:55 +0000
+++ debian/control.in	2016-09-12 19:20:14 +0000
@@ -24,8 +24,8 @@
                libnet-cpp-dev,
                libprocess-cpp-dev,
                libtrust-store-dev,
-               libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
-               libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
+               libubuntu-platform-hardware-api-headers [!ppc64el !powerpc],
+               libubuntu-platform-hardware-api-dev [!ppc64el !powerpc],
                libproperties-cpp-dev,
                lsb-release,
                trust-store-bin,

=== modified file 'debian/rules'
--- debian/rules	2016-04-05 17:26:56 +0000
+++ debian/rules	2016-09-12 19:20:14 +0000
@@ -27,7 +27,7 @@
 minor=$(shell echo $(full_version) | cut -d'.' -f2)
 patch=$(shell echo $(full_version) | cut -d'.' -f3)
 
-ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc arm64))
+ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc))
         LOCATION_SERVICE_ENABLE_GPS_PROVIDER = OFF
 else
         LOCATION_SERVICE_ENABLE_GPS_PROVIDER = ON