snappy-hwe-snaps

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

  1. Git
  2. lp:~kzapalowicz/snappy-hwe-snaps/+git/bluez
  3. feature/enable-5.49
  4. Merge into master
Proposed by Konrad Zapałowicz
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: e56c4f268f8d0ec88daf5f8200972cefec831458
Merged at revision: 004a85eb2d858c17df10bec17967592005f52e24
Proposed branch: ~kzapalowicz/snappy-hwe-snaps/+git/bluez:feature/enable-5.49
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:master
Diff against target: 102 lines (+6/-20)
2 files modified
snapcraft.yaml (+6/-17)
tests/lib/prepare.sh (+0/-3)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Alfonso Sanchez-Beato Approve
Review via email: mp+359045@code.launchpad.net

Commit message

Bump version to 5.49; Enable btattach tool

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

PASSED: Successfully build documentation, rev: 4060b9b0012d7f14a014c0b2d34f5ce7c3b15ed5

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

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

FAILED: Continuous integration, rev:4060b9b0012d7f14a014c0b2d34f5ce7c3b15ed5
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/294/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/335/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/335/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/335
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/335
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1127
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/870
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/907/console

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

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

PASSED: Successfully build documentation, rev: 4060b9b0012d7f14a014c0b2d34f5ce7c3b15ed5

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

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

FAILED: Continuous integration, rev:4060b9b0012d7f14a014c0b2d34f5ce7c3b15ed5
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/295/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/336/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/336
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/336
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/336
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1128
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/871
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/908/console

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

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

PASSED: Successfully build documentation, rev: 4060b9b0012d7f14a014c0b2d34f5ce7c3b15ed5

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

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

FAILED: Continuous integration, rev:4060b9b0012d7f14a014c0b2d34f5ce7c3b15ed5
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/296/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/337/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/337
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/337
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/337
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1129
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/872
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/909/console

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

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

PASSED: Successfully build documentation, rev: 1412181497dcc6f41597093b5f114df72d105afc

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

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

FAILED: Continuous integration, rev:1412181497dcc6f41597093b5f114df72d105afc
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/319/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/360/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/360
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/360
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/360
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1152
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/894
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/932/console

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

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

PASSED: Successfully build documentation, rev: 1412181497dcc6f41597093b5f114df72d105afc

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

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

FAILED: Continuous integration, rev:1412181497dcc6f41597093b5f114df72d105afc
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/320/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/361/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/361
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/361
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/361
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1153
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/895
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/933/console

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

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

PASSED: Successfully build documentation, rev: 1412181497dcc6f41597093b5f114df72d105afc

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

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

FAILED: Continuous integration, rev:1412181497dcc6f41597093b5f114df72d105afc
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/325/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/366/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/366
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/366
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/366
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1158
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/900
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/938/console

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

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

PASSED: Successfully build documentation, rev: 0ba5d8e0d4b5c39bc8ecf8f266710e3592e92be9

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

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

PASSED: Continuous integration, rev:0ba5d8e0d4b5c39bc8ecf8f266710e3592e92be9
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/331/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/371
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/371
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/371
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/371
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1163
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/905
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/944/console

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

review: Approve (continuous-integration)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

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

PASSED: Successfully build documentation, rev: e56c4f268f8d0ec88daf5f8200972cefec831458

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

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

PASSED: Continuous integration, rev:e56c4f268f8d0ec88daf5f8200972cefec831458
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/333/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/373
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/373
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/373
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/373
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1165
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/907
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/946/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/333/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 0d1ffc9..258bb16 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -1,5 +1,5 @@
6 name: bluez
7-version: 5.47-4-dev
8+version: 5.49-1-dev
9 type: app
10 summary: Bluetooth tools and daemons
11 description: |
12@@ -11,18 +11,13 @@ description: |
13 confinement: strict
14 grade: stable
15
16-# NOTE: the alias syntax is depreciated with snapd 2.25 however it needs to
17-# stay to guarantee that all clients are updated correctly.
18-
19 apps:
20 bluetoothctl:
21 command: bin/client-wrapper usr/bin/bluetoothctl
22 plugs: [client, uhid]
23- aliases: [bluetoothctl]
24 obexctl:
25 command: bin/client-wrapper usr/bin/obexctl
26 plugs: [client]
27- aliases: [obexctl]
28 bluez:
29 command: "usr/lib/bluetooth/bluetoothd -E"
30 daemon: simple
31@@ -35,37 +30,30 @@ apps:
32 hciconfig:
33 command: usr/bin/hciconfig
34 plugs: [bluetooth-control]
35- aliases: [hciconfig]
36 hcidump:
37 command: usr/bin/hcidump
38 plugs: [bluetooth-control, network-control, home]
39- aliases:
40- - hcidump
41 hciattach:
42 command: usr/bin/hciattach
43 plugs: [bluetooth-control]
44- aliases: [hciattach]
45+ btattach:
46+ command: usr/bin/btattach
47+ plugs: [bluetooth-control]
48 hcitool:
49 command: usr/bin/hcitool
50 plugs: [bluetooth-control]
51- aliases: [hcitool]
52 sdptool:
53 command: usr/bin/sdptool
54 plugs: [client]
55- aliases: [sdptool]
56 btmon:
57 command: usr/bin/btmon
58 plugs: [bluetooth-control, network-control, home]
59- aliases: [btmon]
60-
61 btmgmt:
62 command: usr/bin/btmgmt
63 plugs: [bluetooth-control, network-control]
64- aliases: [btmgmt]
65 meshctl:
66 command: usr/bin/meshctl
67 plugs: [bluetooth-control, network-control]
68- aliases: [meshctl]
69
70 plugs:
71 client:
72@@ -84,7 +72,7 @@ parts:
73 plugin: autotools
74 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/bluez
75 source-type: git
76- source-branch: bluez/5.47
77+ source-branch: bluez/5.49
78 configflags:
79 - --prefix=/usr
80 - --libexec=/usr/lib/
81@@ -119,6 +107,7 @@ parts:
82 - usr/bin/hciconfig
83 - usr/bin/hcidump
84 - usr/bin/hciattach
85+ - usr/bin/btattach
86 - usr/bin/hcitool
87 - usr/bin/sdptool
88 - usr/bin/btmon
89diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
90index 4cc3c13..185bacb 100644
91--- a/tests/lib/prepare.sh
92+++ b/tests/lib/prepare.sh
93@@ -20,9 +20,6 @@ for name in $gadget_name $kernel_name $core_name; do
94 fi
95 done
96
97-echo "Kernel has a store revision"
98-snap list | grep ^${kernel_name} | grep -E " [0-9]+\s+canonical"
99-
100 install_snap_under_test
101
102 # Snapshot of the current snapd state for a later restore

Subscribers

People subscribed via source and target branches