snappy-hwe-snaps

Merge ~ogra/snappy-hwe-snaps/+git/pulseaudio:master into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

  1. Git
  2. lp:~ogra/snappy-hwe-snaps/+git/pulseaudio
  3. master
  4. Merge into master
Proposed by Oliver Grawert
Status: Merged
Approved by: Simon Fels
Approved revision: d5022d2f9d646f50242a844bd99d78627b2ebfb3
Merged at revision: 2f055c68e835de107fe653d42e3b0533e48df946
Proposed branch: ~ogra/snappy-hwe-snaps/+git/pulseaudio:master
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
Diff against target: 40 lines (+1/-3)
2 files modified
bin/pulseaudio (+0/-1)
snapcraft.yaml (+1/-2)
Reviewer Review Type Date Requested Status
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Jim Hodapp (community) Approve
Review via email: mp+333211@code.launchpad.net

Commit message

Enable BlueZ 5 support.

Enable compiling modules for Bluetooth support. This change also removes
the disallow-module-loading flag because pulseaudio needs to load
module-bluez5-device after a device connects.

Description of the change

Enable compiling modules for Bluetooth support. This change also removes
the disallow-module-loading flag because pulseaudio needs to load
module-bluez5-device after a device connects.

To post a comment you must log in.
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

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

PASSED: Successfully build documentation, rev: d5022d2f9d646f50242a844bd99d78627b2ebfb3

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/896/

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

FAILED: Continuous integration, rev:d5022d2f9d646f50242a844bd99d78627b2ebfb3
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/52/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/102/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/102/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/102/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/102/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/896
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/643
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/663/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/52/rebuild

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

PASSED: Successfully build documentation, rev: d5022d2f9d646f50242a844bd99d78627b2ebfb3

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/899/

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

PASSED: Continuous integration, rev:d5022d2f9d646f50242a844bd99d78627b2ebfb3
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/53/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/103
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/103
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/103
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/103
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/899
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/646
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/666/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/53/rebuild

review: Approve (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM, did you give this a manual test run on a device as our CI testing is not working atm?

Revision history for this message
Oliver Grawert (ogra) wrote :

loks like it finished fine in CI, but yes, i did do a test build

Revision history for this message
Simon Fels (morphis) wrote :

Yeah the build in CI finished but I've disabled test execution.

On Mon, Nov 6, 2017 at 10:16 AM, Oliver Grawert <email address hidden> wrote:

> loks like it finished fine in CI, but yes, i did do a test build
> --
> https://code.launchpad.net/~ogra/snappy-hwe-snaps/+git/
> pulseaudio/+merge/333211
> Your team Snappy HWE Team is subscribed to branch
> ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master.
>
> Launchpad-Message-Rationale: Subscriber @snappy-hwe-team
> Launchpad-Message-For: snappy-hwe-team
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
> Launchpad-Project: snappy-hwe-snaps
>

Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/bin/pulseaudio b/bin/pulseaudio
index fa1c474..8b9a797 100755
--- a/bin/pulseaudio
+++ b/bin/pulseaudio
@@ -22,7 +22,6 @@ fi
22exec $SNAP/usr/bin/pulseaudio \22exec $SNAP/usr/bin/pulseaudio \
23 --exit-idle-time=-1 \23 --exit-idle-time=-1 \
24 --disallow-exit=yes \24 --disallow-exit=yes \
25 --disallow-module-loading \
26 --system \25 --system \
27 -F $SNAP/etc/pulse/default.pa \26 -F $SNAP/etc/pulse/default.pa \
28 -p $SNAP/usr/lib/pulse-8.0/modules \27 -p $SNAP/usr/lib/pulse-8.0/modules \
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 736791d..b4bf686 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -109,6 +109,7 @@ parts:
109 - libudev-dev109 - libudev-dev
110 - libasyncns-dev110 - libasyncns-dev
111 - libxcb1-dev111 - libxcb1-dev
112 - libsbc-dev
112113
113 configflags:114 configflags:
114 - --prefix=/usr115 - --prefix=/usr
@@ -121,7 +122,6 @@ parts:
121 - --disable-orc122 - --disable-orc
122 - --disable-gconf123 - --disable-gconf
123 - --disable-bluez4124 - --disable-bluez4
124 - --disable-bluez5
125 - --disable-esound125 - --disable-esound
126 - --disable-adrian-aec126 - --disable-adrian-aec
127 - --disable-gtk3127 - --disable-gtk3
@@ -129,7 +129,6 @@ parts:
129 - --disable-systemd-login129 - --disable-systemd-login
130 - --without-caps130 - --without-caps
131 - --disable-webrtc-aec131 - --disable-webrtc-aec
132 - --disable-dbus
133 - --disable-oss-output132 - --disable-oss-output
134 - --disable-oss-wrapper133 - --disable-oss-wrapper
135 - --disable-jack134 - --disable-jack

Subscribers

People subscribed via source and target branches