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

Proposed by Scott Sweeny
Status: Merged
Approved by: Yuan-Chen Cheng
Approved revision: 273
Merged at revision: 274
Proposed branch: lp:~ssweeny/location-service/gps-arm64
Merge into: lp:location-service/trunk
Diff against target: 54 lines (+6/-5)
4 files modified
debian/bileto_pre_release_hook (+1/-0)
debian/control (+2/-2)
debian/control.in (+2/-2)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~ssweeny/location-service/gps-arm64
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Needs Fixing
Yuan-Chen Cheng Approve
Review via email: mp+305525@code.launchpad.net

Commit message

Enable gps provider on arm64.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Yuan-Chen Cheng (ycheng-twn) wrote :

LGTM !

review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

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)
Revision history for this message
Yuan-Chen Cheng (ycheng-twn) wrote :

@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

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

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)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/bileto_pre_release_hook'
2--- debian/bileto_pre_release_hook 2016-04-12 06:33:54 +0000
3+++ debian/bileto_pre_release_hook 2016-09-12 19:20:14 +0000
4@@ -69,6 +69,7 @@
5 process "$dir/libubuntu-location-service-dev.install.in" >"$dir/libubuntu-location-service-dev.install"
6
7 ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.amd64"
8+ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.arm64"
9 ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.armhf"
10 ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.i386"
11
12
13=== modified file 'debian/control'
14--- debian/control 2016-04-05 17:16:02 +0000
15+++ debian/control 2016-09-12 19:20:14 +0000
16@@ -29,8 +29,8 @@
17 libnet-cpp-dev,
18 libprocess-cpp-dev,
19 libtrust-store-dev,
20- libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
21- libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
22+ libubuntu-platform-hardware-api-headers [!ppc64el !powerpc],
23+ libubuntu-platform-hardware-api-dev [!ppc64el !powerpc],
24 libproperties-cpp-dev,
25 lsb-release,
26 trust-store-bin,
27
28=== modified file 'debian/control.in'
29--- debian/control.in 2016-03-11 11:01:55 +0000
30+++ debian/control.in 2016-09-12 19:20:14 +0000
31@@ -24,8 +24,8 @@
32 libnet-cpp-dev,
33 libprocess-cpp-dev,
34 libtrust-store-dev,
35- libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
36- libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
37+ libubuntu-platform-hardware-api-headers [!ppc64el !powerpc],
38+ libubuntu-platform-hardware-api-dev [!ppc64el !powerpc],
39 libproperties-cpp-dev,
40 lsb-release,
41 trust-store-bin,
42
43=== modified file 'debian/rules'
44--- debian/rules 2016-04-05 17:26:56 +0000
45+++ debian/rules 2016-09-12 19:20:14 +0000
46@@ -27,7 +27,7 @@
47 minor=$(shell echo $(full_version) | cut -d'.' -f2)
48 patch=$(shell echo $(full_version) | cut -d'.' -f3)
49
50-ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc arm64))
51+ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc))
52 LOCATION_SERVICE_ENABLE_GPS_PROVIDER = OFF
53 else
54 LOCATION_SERVICE_ENABLE_GPS_PROVIDER = ON

Subscribers

People subscribed via source and target branches