snappy-hwe-snaps

Merge ~kzapalowicz/snappy-hwe-snaps/+git/bluez:feature/btmon into ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:master

  1. Git
  2. lp:~kzapalowicz/snappy-hwe-snaps/+git/bluez
  3. feature/btmon
  4. Merge into master
Proposed by Konrad Zapałowicz
Status: Merged
Approved by: Simon Fels
Approved revision: fa891cbfb34939ead52daf9755cbee0d6287ffae
Merged at revision: e54682f1622593699c6efa9f425302d537309f20
Proposed branch: ~kzapalowicz/snappy-hwe-snaps/+git/bluez:feature/btmon
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:master
Diff against target: 41 lines (+7/-2)
1 file modified
snapcraft.yaml (+7/-2)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Simon Fels Approve
Review via email: mp+319572@code.launchpad.net

Description of the change

add btmon HCI sniffer and fix denials when using
btmon and hcidump.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:fa891cbfb34939ead52daf9755cbee0d6287ffae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1285/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/374/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1193/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1028/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/40/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1285/rebuild

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

LGTM but something with the tests seems to be wrong.

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

FAILED: Continuous integration, rev:34c00131b90797ea362875bbe7dbf56ff5d84066
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1301/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/470/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1209/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1115/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/132/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1301/rebuild

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

PASSED: Continuous integration, rev:fa891cbfb34939ead52daf9755cbee0d6287ffae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1304/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/473
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1212/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1118
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/135/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1304/rebuild

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

PASSED: Continuous integration, rev:a123b6ce40d439
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1305/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/474
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1213/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1119
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/136

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1305/rebuild

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

PASSED: Continuous integration, rev:fa891cbfb34939ead52daf9755cbee0d6287ffae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1306/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/475
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1214/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1120
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/137/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1306/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index fc24530..70ed732 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -37,7 +37,7 @@ apps:
6 - hciconfig
7 hcidump:
8 command: usr/bin/hcidump
9- plugs: [bluetooth-control]
10+ plugs: [bluetooth-control, network-control]
11 aliases:
12 - hcidump
13 hciattach:
14@@ -55,6 +55,11 @@ apps:
15 plugs: [client]
16 aliases:
17 - sdptool
18+ btmon:
19+ command: usr/bin/btmon
20+ plugs: [bluetooth-control, network-control]
21+ aliases:
22+ - btmon
23
24 plugs:
25 client:
26@@ -75,7 +80,6 @@ parts:
27 - --enable-experimental
28 - --enable-threads
29 - --disable-cups
30- - --disable-monitor
31 - --enable-obex
32 - --disable-systemd
33 - --disable-silent-rules
34@@ -103,6 +107,7 @@ parts:
35 - usr/bin/hciattach
36 - usr/bin/hcitool
37 - usr/bin/sdptool
38+ - usr/bin/btmon
39 - usr/share/doc/libical1a/copyright
40 - $libical1a
41 install: |

Subscribers

People subscribed via source and target branches