snappy-hwe-snaps

Merge ~valentin.david/snappy-hwe-snaps:valentindavid/core22 into ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:snap-22

  1. Git
  2. lp:~valentin.david/snappy-hwe-snaps
  3. valentindavid/core22
  4. Merge into snap-22
Proposed by Valentin David
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 248c79669e11e406556d7d6f7583f30f0bf3c61b
Merged at revision: 5554b6e9c2c2011972731b1554b29ad347d87e79
Proposed branch: ~valentin.david/snappy-hwe-snaps:valentindavid/core22
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:snap-22
Diff against target: 1037 lines (+13/-66)
8 files modified
dev/null (+0/-31)
docs/metadata.yaml (+0/-2)
docs/reference/available-commands.md (+1/-3)
docs/reference/introduction.md (+0/-1)
run-tests.sh (+1/-1)
snapcraft.yaml (+8/-24)
spread.yaml (+3/-3)
tests/main/aliases/task.yaml (+0/-1)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+418499@code.launchpad.net

Description of the change

Removed meshctl because bluetooth-meshd is not distributed

Removed obex, because it has many patches to run obexd as root. We should rework that.

Tested bluetooth LE from an Intel NUC.

```
# sudo bluez.bluetoothctl
[bluetooth]# power on
[bluetooth]# scan le
...
[NEW] Device 4C:EB:D6:4C:79:4A BatteryMonitor
...
[bluetooth]# connect 4C:EB:D6:4C:79:4A
Attempting to connect to 4C:EB:D6:4C:79:4A
[CHG] Device 4C:EB:D6:4C:79:4A Connected: yes
Connection successful
[NEW] Primary Service (Handle 0x0000)
 /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service0006
 00001801-0000-1000-8000-00805f9b34fb
 Generic Attribute Profile
[NEW] Characteristic (Handle 0x0000)
 /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service0006/char0007
 00002a05-0000-1000-8000-00805f9b34fb
 Service Changed
[NEW] Descriptor (Handle 0x0000)
 /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service0006/char0007/desc0009
 00002902-0000-1000-8000-00805f9b34fb
 Client Characteristic Configuration
[NEW] Primary Service (Handle 0x0000)
 /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service000a
 0000180f-0000-1000-8000-00805f9b34fb
 Battery Service
[NEW] Characteristic (Handle 0x0000)
 /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service000a/char000b
 00002a19-0000-1000-8000-00805f9b34fb
 Battery Level
[NEW] Descriptor (Handle 0x0000)
 /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service000a/char000b/desc000d
 00002902-0000-1000-8000-00805f9b34fb
 Client Characteristic Configuration
[CHG] Device 4C:EB:D6:4C:79:4A UUIDs: 00001800-0000-1000-8000-00805f9b34fb
[CHG] Device 4C:EB:D6:4C:79:4A UUIDs: 00001801-0000-1000-8000-00805f9b34fb
[CHG] Device 4C:EB:D6:4C:79:4A UUIDs: 0000180f-0000-1000-8000-00805f9b34fb
[CHG] Device 4C:EB:D6:4C:79:4A ServicesResolved: yes
[CHG] Device 4C:EB:D6:4C:79:4A Name: Arduino
[CHG] Device 4C:EB:D6:4C:79:4A Alias: Arduino
[BatteryMonitor]# menu gatt
[BatteryMonitor]# select-attribute /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service000a/char000b
[Arduino:/service000a/char000b]# notify on
[CHG] Attribute /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service000a/char000b Notifying: yes
Notify started
[CHG] Attribute /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service000a/char000b Value:
  28 (
[CHG] Attribute /org/bluez/hci0/dev_4C_EB_D6_4C_79_4A/service000a/char000b Value:
  2a *
...
```

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: 6f2abf0ac1a529c0de4a6415e480296f589a9ea1

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

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

FAILED: Continuous integration, rev:6f2abf0ac1a529c0de4a6415e480296f589a9ea1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/669/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/696/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/696/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/696/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/696/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1477
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1219
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1282/console

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

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

PASSED: Successfully build documentation, rev: 6f2abf0ac1a529c0de4a6415e480296f589a9ea1

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

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

FAILED: Continuous integration, rev:6f2abf0ac1a529c0de4a6415e480296f589a9ea1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/671/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/698/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/698/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/698/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/698/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1480
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1222
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1285/console

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

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

PASSED: Successfully build documentation, rev: 6f2abf0ac1a529c0de4a6415e480296f589a9ea1

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

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

FAILED: Continuous integration, rev:6f2abf0ac1a529c0de4a6415e480296f589a9ea1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/673/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/700/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/700/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/700/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/700
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1481
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1223
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1286/console

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

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

FAILED: Continuous integration, rev:6f2abf0ac1a529c0de4a6415e480296f589a9ea1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/674/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1287/console

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

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

PASSED: Successfully build documentation, rev: d856c6a2ca8dccbe134c52c7f5531795162a3987

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

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

FAILED: Continuous integration, rev:d856c6a2ca8dccbe134c52c7f5531795162a3987
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/675/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/701/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/701/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/701/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/701
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1482
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1224
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1288/console

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

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

PASSED: Successfully build documentation, rev: d856c6a2ca8dccbe134c52c7f5531795162a3987

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

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

FAILED: Continuous integration, rev:d856c6a2ca8dccbe134c52c7f5531795162a3987
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/676/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/702/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/702/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/702/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/702
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1483
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1225
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1289/console

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

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

PASSED: Successfully build documentation, rev: d856c6a2ca8dccbe134c52c7f5531795162a3987

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

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

FAILED: Continuous integration, rev:d856c6a2ca8dccbe134c52c7f5531795162a3987
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/677/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/703/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/703/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/703/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/703
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1484
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1226
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1290/console

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

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

FAILED: Continuous integration, rev:6f2abf0ac1a529c0de4a6415e480296f589a9ea1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/678/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1291/console

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

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

PASSED: Successfully build documentation, rev: d856c6a2ca8dccbe134c52c7f5531795162a3987

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

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

FAILED: Continuous integration, rev:d856c6a2ca8dccbe134c52c7f5531795162a3987
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/679/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/704/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/704
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/704
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/704
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1485
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1227
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1292/console

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

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

PASSED: Successfully build documentation, rev: 601beda47c6bd65115aaa1a352649ee51bbbaed7

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

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

FAILED: Continuous integration, rev:601beda47c6bd65115aaa1a352649ee51bbbaed7
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/680/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/705/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/705
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/705
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/705
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1486
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1228
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1293/console

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

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

PASSED: Successfully build documentation, rev: 601beda47c6bd65115aaa1a352649ee51bbbaed7

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

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

FAILED: Continuous integration, rev:601beda47c6bd65115aaa1a352649ee51bbbaed7
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/683/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/708/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/708
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/708
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/708
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1489
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1231
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1296/console

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

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

PASSED: Successfully build documentation, rev: cd3527a4ec902e8229794d65f1f9b0d26d2836ec

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

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

PASSED: Successfully build documentation, rev: cd3527a4ec902e8229794d65f1f9b0d26d2836ec

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

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

FAILED: Continuous integration, rev:cd3527a4ec902e8229794d65f1f9b0d26d2836ec
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/685/
Executed test runs:
    ABORTED: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/710/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/710
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/710
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/710
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1492
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1234
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1299/console

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

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

FAILED: Continuous integration, rev:cd3527a4ec902e8229794d65f1f9b0d26d2836ec
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/687/
Executed test runs:
    ABORTED: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/712/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/712
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/712
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/712
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1493
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1235
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1300/console

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

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

PASSED: Successfully build documentation, rev: aceb1023d651db2e4b352b2d965447c8abf9fa72

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

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

FAILED: Continuous integration, rev:aceb1023d651db2e4b352b2d965447c8abf9fa72
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/691/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/715/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/715/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/715/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/715
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1496
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1238
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1303/console

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

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

FAILED: Continuous integration, rev:cd3527a4ec902e8229794d65f1f9b0d26d2836ec
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/689/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1304/console

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

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

PASSED: Successfully build documentation, rev: b11cbc192b615891dc6b12179e7a4650889d9273

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

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

FAILED: Continuous integration, rev:b11cbc192b615891dc6b12179e7a4650889d9273
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/692/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/716/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/716
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/716
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/716
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1497
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1239
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1305/console

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

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

PASSED: Successfully build documentation, rev: a6d153d4b3b143a17d39fed4d9ce4a8e23b7b21c

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

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

FAILED: Continuous integration, rev:a6d153d4b3b143a17d39fed4d9ce4a8e23b7b21c
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/693/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/717/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/717
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/717
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/717
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1498
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1240
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1306/console

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

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

PASSED: Successfully build documentation, rev: f42ea6bff143edbf41ed64387f502ef53835a76a

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

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

PASSED: Continuous integration, rev:f42ea6bff143edbf41ed64387f502ef53835a76a
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/694/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/718
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/718
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/718
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/718
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1499
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1241
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1307/console

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

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

PASSED: Successfully build documentation, rev: a6d153d4b3b143a17d39fed4d9ce4a8e23b7b21c

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

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

FAILED: Continuous integration, rev:a6d153d4b3b143a17d39fed4d9ce4a8e23b7b21c
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/696/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/720/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/720
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/720
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/720
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1501
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1243
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1309/console

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

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

Looks good! I have some minor comments.

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Also, I am a bit worried about people using obexd, but I guess that if somebody is using it we will find out soon enough.

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

PASSED: Successfully build documentation, rev: 89f43c9a1a327b83d0c6300c8f14c3c77fdbc85c

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

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

FAILED: Continuous integration, rev:89f43c9a1a327b83d0c6300c8f14c3c77fdbc85c
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/711/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/734/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/734
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/734
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/734
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1515
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1257
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1324/console

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

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

PASSED: Successfully build documentation, rev: 5d5e5d8f92345a1a83a6c4940d07d9c972d27b08

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

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

FAILED: Continuous integration, rev:5d5e5d8f92345a1a83a6c4940d07d9c972d27b08
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/714/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/737/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/737
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/737
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/737
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1518
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1260
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1327/console

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

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

PASSED: Successfully build documentation, rev: 248c79669e11e406556d7d6f7583f30f0bf3c61b

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

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

PASSED: Continuous integration, rev:248c79669e11e406556d7d6f7583f30f0bf3c61b
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/715/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/738
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/738
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/738
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/738
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1519
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1261
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1328/console

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

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

Thanks for the changes!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/docs/metadata.yaml b/docs/metadata.yaml
2index 73dacac..ff98af5 100644
3--- a/docs/metadata.yaml
4+++ b/docs/metadata.yaml
5@@ -32,8 +32,6 @@ navigation:
6 location: reference/pairing/outbound.md
7 - title: Inbound Pairing
8 location: reference/pairing/inbound.md
9- - title: Sending Files
10- location: reference/sending-files.md
11 - title: Accessing GATT Services
12 location: reference/gatt-services.md
13 - title: Device Enablement
14diff --git a/docs/reference/available-commands.md b/docs/reference/available-commands.md
15index d29dece..01b5f1d 100644
16--- a/docs/reference/available-commands.md
17+++ b/docs/reference/available-commands.md
18@@ -16,9 +16,7 @@ table lists the commands that are provided by the *bluez* snap:
19 | Command | Short description |
20 |--------------|---------------------------------------------------------------|
21 | bluez | The *bluetoothd* Bluetooth daemon |
22-| obex | The *obexd* OBEX daemon |
23 | bluetoothctl | A command-line interface to the BlueZ |
24-| obexctl | A command-line interface to the BlueZ for file transfers |
25 | hciconfig | HCI device configuration utility |
26 | hcidump | Reads raw HCI data and prints it on screen |
27 | hciattach | Attach a serial UART to the BT stack as a transport interface |
28@@ -40,6 +38,6 @@ available commands:
29 ```
30 $ bluez.
31 bluez.bluetoothctl bluez.hciattach bluez.hciconfig bluez.hcidump
32-bluez.hcitool bluez.obexctl bluez.sdptool
33+bluez.hcitool bluez.sdptool
34 $ bluez.
35 ```
36diff --git a/docs/reference/introduction.md b/docs/reference/introduction.md
37index aaa4119..c72924e 100644
38--- a/docs/reference/introduction.md
39+++ b/docs/reference/introduction.md
40@@ -28,6 +28,5 @@ In particular this section will discuss:
41 * [Prerequisites](using-prerequisites.html)
42 * [Available commands](available-commands.md)
43 * [How to pair with remote devices](pairing/introduction.md)
44-* [How to send files using OPP](sending-files.md)
45 * [Accessing the GATT services](gatt-services.md)
46 * [Device Enablement with Bluetooth](enablement/introduction.md)
47diff --git a/docs/reference/sending-files.md b/docs/reference/sending-files.md
48deleted file mode 100644
49index 19d00bd..0000000
50--- a/docs/reference/sending-files.md
51+++ /dev/null
52@@ -1,206 +0,0 @@
53----
54-title: "Sending Files Using OPP"
55-table_of_contents: True
56----
57-
58-# Using Bluetooth to Send Files on Ubuntu Core
59-
60-This section describes the required steps to be able to send files over
61-Bluetooth using an Ubuntu Core device. It will focus on the [OBEX Object
62-Push](https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=309007&vId=346844)
63-profile which is a standard Bluetooth profile for such a use case.
64-
65-## Prerequisites
66-
67-Make sure that:
68-
69-* The bluez snap is installed.
70-* Service is up and running.
71-* Both devices are paired.
72-
73-Refer to the previous sections in order to learn how to do it.
74-
75-The files will be sent to the server which is a Bluetooth-enabled device with
76-the Object Push profile enabled. If this is not fulfilled then Ubuntu Core will
77-fail to connect.
78-
79-The minimal set of the Bluetooth profiles that must be available on the server
80-device is:
81-
82-| Profile | UUID |
83-|------------------|:------:|
84-| GAP Service | 0x1800 |
85-| GATT Server | 0x1801 |
86-| OBEX Object Push | 0x1105 |
87-
88-If you are unsure about which profiles are enabled, then check this using the
89-*sdptool* utility:
90-
91-```
92-% sdptool browse 00:1A:7D:DA:71:0F
93-Browsing 00:1A:7D:DA:71:0F ...
94-Service Name: GAP Service
95-Service RecHandle: 0x10001
96-Service Class ID List:
97-  "Generic Access" (0x1800)
98-Protocol Descriptor List:
99-  "L2CAP" (0x0100)
100-    PSM: 31
101-  "ATT" (0x0007)
102-    uint16: 0x0001
103-    uint16: 0x0007
104-Language Base Attr List:
105-  code_ISO639: 0x656e
106-  encoding:    0x6a
107-  base_offset: 0x100
108-
109-Service Name: GATT Server
110-Service RecHandle: 0x10002
111-Service Class ID List:
112-  "Generic Attribute" (0x1801)
113-Protocol Descriptor List:
114-  "L2CAP" (0x0100)
115-    PSM: 31
116-  "ATT" (0x0007)
117-    uint16: 0x000c
118-    uint16: 0x000f
119-Language Base Attr List:
120-  code_ISO639: 0x656e
121-  encoding:    0x6a
122-  base_offset: 0x100
123-
124-Failed to connect to SDP server on 00:1A:7D:DA:71:0F: Connection refused
125-Service Name: OBEX Object Push
126-Service RecHandle: 0x10004
127-Service Class ID List:
128-  "OBEX Object Push" (0x1105)
129-Protocol Descriptor List:
130-  "L2CAP" (0x0100)
131-  "RFCOMM" (0x0003)
132-    Channel: 1
133-  "OBEX" (0x0008)
134-Language Base Attr List:
135-  code_ISO639: 0x656e
136-  encoding:    0x6a
137-  base_offset: 0x100
138-Profile Descriptor List:
139-  "OBEX Object Push" (0x1105)
140-    Version: 0x0102
141-```
142-
143-## Connect OPP Profile
144-
145-Make sure that the pairing is successfully completed. You can learn how to do it
146-on the [Pairing page](pairing/introduction.html)
147-
148-Once the pairing is successfully completed, it is time to connect the OBEX
149-Object Push profile. To interact with OBEX, the obexctl tool is used. Open
150-another terminal and type
151-
152-```
153-$ sudo bluez.obexctl
154-```
155-
156-You will see output like this:
157-
158-```
159-$ sudo obexctl
160-[NEW] Client /org/bluez/obex
161-[obex]#
162-```
163-
164-This indicates that the OBEX client has been properly initialized and is
165-awaiting interactive commands. The first thing to do is to get it connected to
166-the remote server which is the device that has been paired in the previous
167-step. Type:
168-
169-```
170-[obex]# connect 00:25:56:D1:36:6B
171-```
172-
173-You will see output like:
174-
175-```
176-Attempting to connect to 00:25:56:D1:36:6B
177-[NEW] Session /org/bluez/obex/client/session4 [default]
178-[NEW] ObjectPush /org/bluez/obex/client/session4
179-Connection successful
180-[00:25:56:D1:36:6B]#
181-```
182-
183-The above indicates that the connection has been established. Check the address
184-of the remote device in the prompt. It is now possible to send files.
185-
186-## Sending Files
187-
188-In order to send files use the *send* command while connected to the OBEX Object
189-Push profile. For sending a file type:
190-
191-```
192-[00:25:56:D1:36:6B]# send <path to file>
193-```
194-
195-Note that the file you are about to send should be accessible to the snap,
196-therefore it must be placed in a readable location. For example:
197-/var/snap/bluez/current.
198-
199-Also keep in mind that the regular use of the OPP shall be accomplished through
200-the [D-Bus OBEX
201-API](https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/doc/obex-api.txt)
202-therefore the bluez snap itself does not need access to other snaps data.
203-
204-Below is example output of sending a file:
205-
206-```
207-[00:25:56:D1:36:6B]# send /var/snap/bluez/current/f.txt
208-Attempting to send /var/snap/bluez/current/f.txt to /org/bluez/obex/client/session5
209-[NEW] Transfer /org/bluez/obex/client/session5/transfer10
210-Transfer /org/bluez/obex/client/session5/transfer10
211-        Status: queued
212-        Name: f.txt
213-        Size: 4
214-        Filename: /var/snap/bluez/current/f.txt
215-        Session: /org/bluez/obex/client/session5
216-[CHG] Transfer /org/bluez/obex/client/session5/transfer10 Status: complete
217-[DEL] Transfer /org/bluez/obex/client/session5/transfer10
218-```
219-
220-## Receiving Files
221-
222-By default there is no way to receive a file using Bluetooth on Ubuntu Core
223-unless the application snap implements the receiving side. This is because the
224-incoming transfer has to be allowed and the obexctl tool does not provide
225-such an agent. It is assumed that the application will implement this. For
226-reference, here is the [OBEX D-Bus Agent
227-API](https://git.kernel.org/cgit/bluetooth/bluez.git/tree/doc/obex-agent-api.txt)
228-description.
229-
230-For convenience, there is a bluez-tests snap that packages the
231-[simple-obex-agent](https://git.kernel.org/cgit/bluetooth/bluez.git/tree/test/simple-obex-agent)
232-Python script that implements the mentioned API. It can be used to allow
233-incoming file transfers through OBEX. The script itself has small
234-modifications to make it compatible with Ubuntu Core specifics (Ubuntu Core uses
235-the system, not session bus).
236-
237-This feature has not been yet released, however, it is available in the edge
238-channel for testing.
239-
240-Install the bluez-tests snap
241-
242-```
243-$ sudo snap install --edge bluez-tests
244-```
245-
246-When the above operation successfully finishes, you are able to use the
247-simple-obex-agent and experiment with receiving file transfers. Open another
248-shell on the device and start the simple-obex-agent by typing:
249-
250-```
251-$ sudo bluez-tests.simple-obex-agent
252-```
253-
254-From now on it will listen for incoming OBEX transfers and when such transfers
255-happen, it will prompt for a decision: accept or deny.
256-
257-Please note that the software in the edge channel is for testing purposes only,
258-therefore, do not hesitate to report any bugs or inconveniences found.
259diff --git a/patch/0001-obexd-use-system-bus-for-communication.patch b/patch/0001-obexd-use-system-bus-for-communication.patch
260deleted file mode 100644
261index 488f573..0000000
262--- a/patch/0001-obexd-use-system-bus-for-communication.patch
263+++ /dev/null
264@@ -1,125 +0,0 @@
265-From 02bc79bcd0eea1bd5d76c612f14586b8baa60517 Mon Sep 17 00:00:00 2001
266-From: Simon Fels <simon.fels@canonical.com>
267-Date: Fri, 22 Jul 2016 11:36:44 +0200
268-Subject: [PATCH 1/2] obexd: use system bus for communication
269-
270-On snappy systems we don't nessarily have a session bus available so we
271-will run obexd on the system bus.
272----
273- obexd/client/ftp.c | 2 +-
274- obexd/client/map.c | 2 +-
275- obexd/client/opp.c | 2 +-
276- obexd/client/pbap.c | 2 +-
277- obexd/client/session.c | 2 +-
278- obexd/client/sync.c | 2 +-
279- obexd/src/manager.c | 2 +-
280- tools/obexctl.c | 2 +-
281- 8 files changed, 8 insertions(+), 8 deletions(-)
282-
283-diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c
284-index 5e30654..3b82f3e 100644
285---- a/obexd/client/ftp.c
286-+++ b/obexd/client/ftp.c
287-@@ -476,7 +476,7 @@ int ftp_init(void)
288-
289- DBG("");
290-
291-- conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
292-+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
293- if (!conn)
294- return -EIO;
295-
296-diff --git a/obexd/client/map.c b/obexd/client/map.c
297-index 23be2d6..28e60fe 100644
298---- a/obexd/client/map.c
299-+++ b/obexd/client/map.c
300-@@ -2076,7 +2076,7 @@ int map_init(void)
301-
302- DBG("");
303-
304-- conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
305-+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
306- if (!conn)
307- return -EIO;
308-
309-diff --git a/obexd/client/opp.c b/obexd/client/opp.c
310-index 92785f6..36fd4db 100644
311---- a/obexd/client/opp.c
312-+++ b/obexd/client/opp.c
313-@@ -191,7 +191,7 @@ int opp_init(void)
314-
315- DBG("");
316-
317-- conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
318-+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
319- if (!conn)
320- return -EIO;
321-
322-diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
323-index 3f5665f..e4b7d59 100644
324---- a/obexd/client/pbap.c
325-+++ b/obexd/client/pbap.c
326-@@ -1314,7 +1314,7 @@ int pbap_init(void)
327-
328- DBG("");
329-
330-- conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
331-+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
332- if (!conn)
333- return -EIO;
334-
335-diff --git a/obexd/client/session.c b/obexd/client/session.c
336-index 5bd2d26..cf4cb2c 100644
337---- a/obexd/client/session.c
338-+++ b/obexd/client/session.c
339-@@ -596,7 +596,7 @@ struct obc_session *obc_session_create(const char *source,
340- if (driver == NULL)
341- return NULL;
342-
343-- conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
344-+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
345- if (conn == NULL)
346- return NULL;
347-
348-diff --git a/obexd/client/sync.c b/obexd/client/sync.c
349-index 548c318..8c30908 100644
350---- a/obexd/client/sync.c
351-+++ b/obexd/client/sync.c
352-@@ -237,7 +237,7 @@ int sync_init(void)
353-
354- DBG("");
355-
356-- conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
357-+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
358- if (!conn)
359- return -EIO;
360-
361-diff --git a/obexd/src/manager.c b/obexd/src/manager.c
362-index c172c59..9b5bdde 100644
363---- a/obexd/src/manager.c
364-+++ b/obexd/src/manager.c
365-@@ -499,7 +499,7 @@ gboolean manager_init(void)
366-
367- dbus_error_init(&err);
368-
369-- connection = g_dbus_setup_bus(DBUS_BUS_SESSION, OBEXD_SERVICE, &err);
370-+ connection = g_dbus_setup_bus(DBUS_BUS_SYSTEM, OBEXD_SERVICE, &err);
371- if (connection == NULL) {
372- if (dbus_error_is_set(&err) == TRUE) {
373- fprintf(stderr, "%s\n", err.message);
374-diff --git a/tools/obexctl.c b/tools/obexctl.c
375-index 0709f69..9ed336a 100644
376---- a/tools/obexctl.c
377-+++ b/tools/obexctl.c
378-@@ -2152,7 +2152,7 @@ int main(int argc, char *argv[])
379- bt_shell_set_menu(&main_menu);
380- bt_shell_set_prompt(PROMPT_OFF);
381-
382-- dbus_conn = g_dbus_setup_bus(DBUS_BUS_SESSION, NULL, NULL);
383-+ dbus_conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL);
384-
385- client = g_dbus_client_new(dbus_conn, "org.bluez.obex",
386- "/org/bluez/obex");
387---
388-2.17.1
389-
390diff --git a/patch/0003-Add-snappy-runtime-directory-support.patch b/patch/0003-Add-snappy-runtime-directory-support.patch
391deleted file mode 100644
392index d1f1db0..0000000
393--- a/patch/0003-Add-snappy-runtime-directory-support.patch
394+++ /dev/null
395@@ -1,38 +0,0 @@
396-From 003384851dfff3efe5c16aafb274ef5cd3bc3078 Mon Sep 17 00:00:00 2001
397-From: Simon Fels <simon.fels@canonical.com>
398-Date: Fri, 22 Jul 2016 11:36:12 +0200
399-Subject: [PATCH] Add snappy runtime directory support
400-
401----
402- obexd/src/main.c | 12 ++++++++++--
403- 1 file changed, 10 insertions(+), 2 deletions(-)
404-
405-diff --git a/obexd/src/main.c b/obexd/src/main.c
406-index 139f141..9f6c67a 100644
407---- a/obexd/src/main.c
408-+++ b/obexd/src/main.c
409-@@ -286,11 +286,19 @@ int main(int argc, char *argv[])
410- }
411-
412- if (option_root == NULL) {
413-- option_root = g_build_filename(g_get_user_cache_dir(), "obexd",
414-- NULL);
415-+ option_root = getenv("SNAP_USER_DATA");
416-+
417-+ if (!option_root)
418-+ option_root = g_build_filename(g_get_user_cache_dir(),
419-+ "obexd", NULL);
420- g_mkdir_with_parents(option_root, 0700);
421- }
422-
423-+ /*
424-+ * FIXME: a relative path option_root is specified on the command line,
425-+ * will not be properly re-located to $SNAP_USER_DATA. Since this is
426-+ * not used in the snap's obexd service file, this should be a no-op.
427-+ */
428- if (option_root[0] != '/') {
429- const char *home = getenv("HOME");
430- if (home) {
431---
432-2.17.1
433-
434diff --git a/patch/0004-Remove-some-obex-plugins-so-we-do-not-need-libical.patch b/patch/0004-Remove-some-obex-plugins-so-we-do-not-need-libical.patch
435deleted file mode 100644
436index 2205a78..0000000
437--- a/patch/0004-Remove-some-obex-plugins-so-we-do-not-need-libical.patch
438+++ /dev/null
439@@ -1,391 +0,0 @@
440-From cde0bec4000d561edbeab8317d6d815b84125aa5 Mon Sep 17 00:00:00 2001
441-From: Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com>
442-Date: Mon, 30 Mar 2020 12:28:47 +0200
443-Subject: [PATCH] Remove some obex plugins so we do not need libical
444-
445-Remove some obex plugins so we do not need libical. This library
446-was in turn pulling libicu, which is a 12MB dependency. The use case
447-for obex pbap/irmc in IoT is not strong, so better to remove it from
448-the snap.
449----
450- Makefile.in | 125 ++---------------------------------------
451- Makefile.obexd | 14 +----
452- configure.ac | 6 --
453- obexd/client/manager.c | 2 -
454- 4 files changed, 7 insertions(+), 140 deletions(-)
455-
456-diff --git a/Makefile.in b/Makefile.in
457-index 35fd6fd..64313bf 100644
458---- a/Makefile.in
459-+++ b/Makefile.in
460-@@ -966,9 +966,6 @@ am__obexd_src_obexd_SOURCES_DIST = btio/btio.h btio/btio.c \
461- obexd/plugins/filesystem.c obexd/plugins/filesystem.h \
462- obexd/plugins/bluetooth.c obexd/plugins/pcsuite.c \
463- obexd/plugins/opp.c obexd/plugins/ftp.c obexd/plugins/ftp.h \
464-- obexd/plugins/irmc.c obexd/plugins/pbap.c \
465-- obexd/plugins/vcard.h obexd/plugins/vcard.c \
466-- obexd/plugins/phonebook.h obexd/plugins/phonebook-dummy.c \
467- obexd/plugins/mas.c obexd/src/map_ap.h \
468- obexd/plugins/messages.h obexd/plugins/messages-dummy.c \
469- obexd/client/mns.c obexd/client/map-event.h obexd/src/main.c \
470-@@ -982,7 +979,7 @@ am__obexd_src_obexd_SOURCES_DIST = btio/btio.h btio/btio.c \
471- obexd/client/manager.c obexd/client/session.h \
472- obexd/client/session.c obexd/client/bluetooth.h \
473- obexd/client/bluetooth.c obexd/client/sync.h \
474-- obexd/client/sync.c obexd/client/pbap.h obexd/client/pbap.c \
475-+ obexd/client/sync.c \
476- obexd/client/ftp.h obexd/client/ftp.c obexd/client/opp.h \
477- obexd/client/opp.c obexd/client/map.h obexd/client/map.c \
478- obexd/client/map-event.c obexd/client/transfer.h \
479-@@ -1001,10 +998,6 @@ am__objects_9 = gobex/obexd-gobex.$(OBJEXT) \
480- @OBEX_TRUE@ obexd/plugins/obexd-bluetooth.$(OBJEXT) \
481- @OBEX_TRUE@ $(am__objects_10) obexd/plugins/obexd-opp.$(OBJEXT) \
482- @OBEX_TRUE@ obexd/plugins/obexd-ftp.$(OBJEXT) \
483--@OBEX_TRUE@ obexd/plugins/obexd-irmc.$(OBJEXT) \
484--@OBEX_TRUE@ obexd/plugins/obexd-pbap.$(OBJEXT) \
485--@OBEX_TRUE@ obexd/plugins/obexd-vcard.$(OBJEXT) \
486--@OBEX_TRUE@ obexd/plugins/obexd-phonebook-dummy.$(OBJEXT) \
487- @OBEX_TRUE@ obexd/plugins/obexd-mas.$(OBJEXT) \
488- @OBEX_TRUE@ obexd/plugins/obexd-messages-dummy.$(OBJEXT) \
489- @OBEX_TRUE@ obexd/client/obexd-mns.$(OBJEXT)
490-@@ -1023,7 +1016,6 @@ am__objects_9 = gobex/obexd-gobex.$(OBJEXT) \
491- @OBEX_TRUE@ obexd/client/obexd-session.$(OBJEXT) \
492- @OBEX_TRUE@ obexd/client/obexd-bluetooth.$(OBJEXT) \
493- @OBEX_TRUE@ obexd/client/obexd-sync.$(OBJEXT) \
494--@OBEX_TRUE@ obexd/client/obexd-pbap.$(OBJEXT) \
495- @OBEX_TRUE@ obexd/client/obexd-ftp.$(OBJEXT) \
496- @OBEX_TRUE@ obexd/client/obexd-opp.$(OBJEXT) \
497- @OBEX_TRUE@ obexd/client/obexd-map.$(OBJEXT) \
498-@@ -2044,7 +2036,6 @@ am__depfiles_remade = android/$(DEPDIR)/a2dp-sink.Po \
499- obexd/client/$(DEPDIR)/obexd-map.Po \
500- obexd/client/$(DEPDIR)/obexd-mns.Po \
501- obexd/client/$(DEPDIR)/obexd-opp.Po \
502-- obexd/client/$(DEPDIR)/obexd-pbap.Po \
503- obexd/client/$(DEPDIR)/obexd-session.Po \
504- obexd/client/$(DEPDIR)/obexd-sync.Po \
505- obexd/client/$(DEPDIR)/obexd-transfer.Po \
506-@@ -2052,14 +2043,10 @@ am__depfiles_remade = android/$(DEPDIR)/a2dp-sink.Po \
507- obexd/plugins/$(DEPDIR)/obexd-bluetooth.Po \
508- obexd/plugins/$(DEPDIR)/obexd-filesystem.Po \
509- obexd/plugins/$(DEPDIR)/obexd-ftp.Po \
510-- obexd/plugins/$(DEPDIR)/obexd-irmc.Po \
511- obexd/plugins/$(DEPDIR)/obexd-mas.Po \
512- obexd/plugins/$(DEPDIR)/obexd-messages-dummy.Po \
513- obexd/plugins/$(DEPDIR)/obexd-opp.Po \
514-- obexd/plugins/$(DEPDIR)/obexd-pbap.Po \
515- obexd/plugins/$(DEPDIR)/obexd-pcsuite.Po \
516-- obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po \
517-- obexd/plugins/$(DEPDIR)/obexd-vcard.Po \
518- obexd/src/$(DEPDIR)/obexd-log.Po \
519- obexd/src/$(DEPDIR)/obexd-main.Po \
520- obexd/src/$(DEPDIR)/obexd-manager.Po \
521-@@ -2750,8 +2737,6 @@ GLIB_LIBS = @GLIB_LIBS@
522- GREP = @GREP@
523- GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
524- GTHREAD_LIBS = @GTHREAD_LIBS@
525--ICAL_CFLAGS = @ICAL_CFLAGS@
526--ICAL_LIBS = @ICAL_LIBS@
527- INSTALL = @INSTALL@
528- INSTALL_DATA = @INSTALL_DATA@
529- INSTALL_PROGRAM = @INSTALL_PROGRAM@
530-@@ -3568,15 +3553,12 @@ unit_tests = $(am__append_54) unit/test-eir unit/test-uuid \
531- @SYSTEMD_TRUE@dbussessionbus_DATA = obexd/src/org.bluez.obex.service
532- @OBEX_TRUE@obex_plugindir = $(libdir)/obex/plugins
533- @OBEX_TRUE@obexd_builtin_modules = filesystem bluetooth \
534--@OBEX_TRUE@ $(am__append_48) opp ftp irmc pbap mas mns
535-+@OBEX_TRUE@ $(am__append_48) opp ftp mas mns
536- @OBEX_TRUE@obexd_builtin_sources = obexd/plugins/filesystem.c \
537- @OBEX_TRUE@ obexd/plugins/filesystem.h \
538- @OBEX_TRUE@ obexd/plugins/bluetooth.c $(am__append_49) \
539- @OBEX_TRUE@ obexd/plugins/opp.c obexd/plugins/ftp.c \
540--@OBEX_TRUE@ obexd/plugins/ftp.h obexd/plugins/irmc.c \
541--@OBEX_TRUE@ obexd/plugins/pbap.c obexd/plugins/vcard.h \
542--@OBEX_TRUE@ obexd/plugins/vcard.c obexd/plugins/phonebook.h \
543--@OBEX_TRUE@ obexd/plugins/phonebook-dummy.c obexd/plugins/mas.c \
544-+@OBEX_TRUE@ obexd/plugins/mas.c \
545- @OBEX_TRUE@ obexd/src/map_ap.h obexd/plugins/messages.h \
546- @OBEX_TRUE@ obexd/plugins/messages-dummy.c obexd/client/mns.c \
547- @OBEX_TRUE@ obexd/src/map_ap.h obexd/client/map-event.h
548-@@ -3596,7 +3578,6 @@ unit_tests = $(am__append_54) unit/test-eir unit/test-uuid \
549- @OBEX_TRUE@ obexd/client/session.h obexd/client/session.c \
550- @OBEX_TRUE@ obexd/client/bluetooth.h obexd/client/bluetooth.c \
551- @OBEX_TRUE@ obexd/client/sync.h obexd/client/sync.c \
552--@OBEX_TRUE@ obexd/client/pbap.h obexd/client/pbap.c \
553- @OBEX_TRUE@ obexd/client/ftp.h obexd/client/ftp.c \
554- @OBEX_TRUE@ obexd/client/opp.h obexd/client/opp.c \
555- @OBEX_TRUE@ obexd/client/map.h obexd/client/map.c \
556-@@ -3608,11 +3589,11 @@ unit_tests = $(am__append_54) unit/test-eir unit/test-uuid \
557-
558- @OBEX_TRUE@obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
559- @OBEX_TRUE@ gdbus/libgdbus-internal.la \
560--@OBEX_TRUE@ $(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl
561-+@OBEX_TRUE@ $(DBUS_LIBS) $(GLIB_LIBS) -ldl
562-
563- @OBEX_TRUE@obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic
564- @OBEX_TRUE@obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
565--@OBEX_TRUE@ $(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \
566-+@OBEX_TRUE@ -DOBEX_PLUGIN_BUILTIN \
567- @OBEX_TRUE@ -DPLUGINDIR=\""$(obex_plugindir)"\" \
568- @OBEX_TRUE@ -D_FILE_OFFSET_BITS=64 \
569- @OBEX_TRUE@ -I$(builddir)/lib -I$(builddir)/obexd/src
570-@@ -5105,15 +5086,6 @@ obexd/plugins/obexd-opp.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
571- obexd/plugins/$(DEPDIR)/$(am__dirstamp)
572- obexd/plugins/obexd-ftp.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
573- obexd/plugins/$(DEPDIR)/$(am__dirstamp)
574--obexd/plugins/obexd-irmc.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
575-- obexd/plugins/$(DEPDIR)/$(am__dirstamp)
576--obexd/plugins/obexd-pbap.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
577-- obexd/plugins/$(DEPDIR)/$(am__dirstamp)
578--obexd/plugins/obexd-vcard.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
579-- obexd/plugins/$(DEPDIR)/$(am__dirstamp)
580--obexd/plugins/obexd-phonebook-dummy.$(OBJEXT): \
581-- obexd/plugins/$(am__dirstamp) \
582-- obexd/plugins/$(DEPDIR)/$(am__dirstamp)
583- obexd/plugins/obexd-mas.$(OBJEXT): obexd/plugins/$(am__dirstamp) \
584- obexd/plugins/$(DEPDIR)/$(am__dirstamp)
585- obexd/plugins/obexd-messages-dummy.$(OBJEXT): \
586-@@ -5159,8 +5131,6 @@ obexd/client/obexd-bluetooth.$(OBJEXT): obexd/client/$(am__dirstamp) \
587- obexd/client/$(DEPDIR)/$(am__dirstamp)
588- obexd/client/obexd-sync.$(OBJEXT): obexd/client/$(am__dirstamp) \
589- obexd/client/$(DEPDIR)/$(am__dirstamp)
590--obexd/client/obexd-pbap.$(OBJEXT): obexd/client/$(am__dirstamp) \
591-- obexd/client/$(DEPDIR)/$(am__dirstamp)
592- obexd/client/obexd-ftp.$(OBJEXT): obexd/client/$(am__dirstamp) \
593- obexd/client/$(DEPDIR)/$(am__dirstamp)
594- obexd/client/obexd-opp.$(OBJEXT): obexd/client/$(am__dirstamp) \
595-@@ -6472,7 +6442,6 @@ distclean-compile:
596- @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-map.Po@am__quote@ # am--include-marker
597- @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-mns.Po@am__quote@ # am--include-marker
598- @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-opp.Po@am__quote@ # am--include-marker
599--@AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-pbap.Po@am__quote@ # am--include-marker
600- @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-session.Po@am__quote@ # am--include-marker
601- @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-sync.Po@am__quote@ # am--include-marker
602- @AMDEP_TRUE@@am__include@ @am__quote@obexd/client/$(DEPDIR)/obexd-transfer.Po@am__quote@ # am--include-marker
603-@@ -6480,14 +6449,10 @@ distclean-compile:
604- @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-bluetooth.Po@am__quote@ # am--include-marker
605- @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-filesystem.Po@am__quote@ # am--include-marker
606- @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-ftp.Po@am__quote@ # am--include-marker
607--@AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-irmc.Po@am__quote@ # am--include-marker
608- @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-mas.Po@am__quote@ # am--include-marker
609- @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-messages-dummy.Po@am__quote@ # am--include-marker
610- @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-opp.Po@am__quote@ # am--include-marker
611--@AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-pbap.Po@am__quote@ # am--include-marker
612- @AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-pcsuite.Po@am__quote@ # am--include-marker
613--@AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po@am__quote@ # am--include-marker
614--@AMDEP_TRUE@@am__include@ @am__quote@obexd/plugins/$(DEPDIR)/obexd-vcard.Po@am__quote@ # am--include-marker
615- @AMDEP_TRUE@@am__include@ @am__quote@obexd/src/$(DEPDIR)/obexd-log.Po@am__quote@ # am--include-marker
616- @AMDEP_TRUE@@am__include@ @am__quote@obexd/src/$(DEPDIR)/obexd-main.Po@am__quote@ # am--include-marker
617- @AMDEP_TRUE@@am__include@ @am__quote@obexd/src/$(DEPDIR)/obexd-manager.Po@am__quote@ # am--include-marker
618-@@ -7834,62 +7799,6 @@ obexd/plugins/obexd-ftp.obj: obexd/plugins/ftp.c
619- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
620- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-ftp.obj `if test -f 'obexd/plugins/ftp.c'; then $(CYGPATH_W) 'obexd/plugins/ftp.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/ftp.c'; fi`
621-
622--obexd/plugins/obexd-irmc.o: obexd/plugins/irmc.c
623--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-irmc.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-irmc.Tpo -c -o obexd/plugins/obexd-irmc.o `test -f 'obexd/plugins/irmc.c' || echo '$(srcdir)/'`obexd/plugins/irmc.c
624--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-irmc.Tpo obexd/plugins/$(DEPDIR)/obexd-irmc.Po
625--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/plugins/irmc.c' object='obexd/plugins/obexd-irmc.o' libtool=no @AMDEPBACKSLASH@
626--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
627--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-irmc.o `test -f 'obexd/plugins/irmc.c' || echo '$(srcdir)/'`obexd/plugins/irmc.c
628--
629--obexd/plugins/obexd-irmc.obj: obexd/plugins/irmc.c
630--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-irmc.obj -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-irmc.Tpo -c -o obexd/plugins/obexd-irmc.obj `if test -f 'obexd/plugins/irmc.c'; then $(CYGPATH_W) 'obexd/plugins/irmc.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/irmc.c'; fi`
631--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-irmc.Tpo obexd/plugins/$(DEPDIR)/obexd-irmc.Po
632--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/plugins/irmc.c' object='obexd/plugins/obexd-irmc.obj' libtool=no @AMDEPBACKSLASH@
633--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
634--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-irmc.obj `if test -f 'obexd/plugins/irmc.c'; then $(CYGPATH_W) 'obexd/plugins/irmc.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/irmc.c'; fi`
635--
636--obexd/plugins/obexd-pbap.o: obexd/plugins/pbap.c
637--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-pbap.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-pbap.Tpo -c -o obexd/plugins/obexd-pbap.o `test -f 'obexd/plugins/pbap.c' || echo '$(srcdir)/'`obexd/plugins/pbap.c
638--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-pbap.Tpo obexd/plugins/$(DEPDIR)/obexd-pbap.Po
639--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/plugins/pbap.c' object='obexd/plugins/obexd-pbap.o' libtool=no @AMDEPBACKSLASH@
640--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
641--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-pbap.o `test -f 'obexd/plugins/pbap.c' || echo '$(srcdir)/'`obexd/plugins/pbap.c
642--
643--obexd/plugins/obexd-pbap.obj: obexd/plugins/pbap.c
644--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-pbap.obj -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-pbap.Tpo -c -o obexd/plugins/obexd-pbap.obj `if test -f 'obexd/plugins/pbap.c'; then $(CYGPATH_W) 'obexd/plugins/pbap.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/pbap.c'; fi`
645--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-pbap.Tpo obexd/plugins/$(DEPDIR)/obexd-pbap.Po
646--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/plugins/pbap.c' object='obexd/plugins/obexd-pbap.obj' libtool=no @AMDEPBACKSLASH@
647--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
648--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-pbap.obj `if test -f 'obexd/plugins/pbap.c'; then $(CYGPATH_W) 'obexd/plugins/pbap.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/pbap.c'; fi`
649--
650--obexd/plugins/obexd-vcard.o: obexd/plugins/vcard.c
651--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-vcard.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-vcard.Tpo -c -o obexd/plugins/obexd-vcard.o `test -f 'obexd/plugins/vcard.c' || echo '$(srcdir)/'`obexd/plugins/vcard.c
652--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-vcard.Tpo obexd/plugins/$(DEPDIR)/obexd-vcard.Po
653--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/plugins/vcard.c' object='obexd/plugins/obexd-vcard.o' libtool=no @AMDEPBACKSLASH@
654--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
655--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-vcard.o `test -f 'obexd/plugins/vcard.c' || echo '$(srcdir)/'`obexd/plugins/vcard.c
656--
657--obexd/plugins/obexd-vcard.obj: obexd/plugins/vcard.c
658--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-vcard.obj -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-vcard.Tpo -c -o obexd/plugins/obexd-vcard.obj `if test -f 'obexd/plugins/vcard.c'; then $(CYGPATH_W) 'obexd/plugins/vcard.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/vcard.c'; fi`
659--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-vcard.Tpo obexd/plugins/$(DEPDIR)/obexd-vcard.Po
660--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/plugins/vcard.c' object='obexd/plugins/obexd-vcard.obj' libtool=no @AMDEPBACKSLASH@
661--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
662--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-vcard.obj `if test -f 'obexd/plugins/vcard.c'; then $(CYGPATH_W) 'obexd/plugins/vcard.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/vcard.c'; fi`
663--
664--obexd/plugins/obexd-phonebook-dummy.o: obexd/plugins/phonebook-dummy.c
665--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-phonebook-dummy.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Tpo -c -o obexd/plugins/obexd-phonebook-dummy.o `test -f 'obexd/plugins/phonebook-dummy.c' || echo '$(srcdir)/'`obexd/plugins/phonebook-dummy.c
666--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Tpo obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po
667--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/plugins/phonebook-dummy.c' object='obexd/plugins/obexd-phonebook-dummy.o' libtool=no @AMDEPBACKSLASH@
668--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
669--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-phonebook-dummy.o `test -f 'obexd/plugins/phonebook-dummy.c' || echo '$(srcdir)/'`obexd/plugins/phonebook-dummy.c
670--
671--obexd/plugins/obexd-phonebook-dummy.obj: obexd/plugins/phonebook-dummy.c
672--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-phonebook-dummy.obj -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Tpo -c -o obexd/plugins/obexd-phonebook-dummy.obj `if test -f 'obexd/plugins/phonebook-dummy.c'; then $(CYGPATH_W) 'obexd/plugins/phonebook-dummy.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/phonebook-dummy.c'; fi`
673--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Tpo obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po
674--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/plugins/phonebook-dummy.c' object='obexd/plugins/obexd-phonebook-dummy.obj' libtool=no @AMDEPBACKSLASH@
675--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
676--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/plugins/obexd-phonebook-dummy.obj `if test -f 'obexd/plugins/phonebook-dummy.c'; then $(CYGPATH_W) 'obexd/plugins/phonebook-dummy.c'; else $(CYGPATH_W) '$(srcdir)/obexd/plugins/phonebook-dummy.c'; fi`
677--
678- obexd/plugins/obexd-mas.o: obexd/plugins/mas.c
679- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/plugins/obexd-mas.o -MD -MP -MF obexd/plugins/$(DEPDIR)/obexd-mas.Tpo -c -o obexd/plugins/obexd-mas.o `test -f 'obexd/plugins/mas.c' || echo '$(srcdir)/'`obexd/plugins/mas.c
680- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/plugins/$(DEPDIR)/obexd-mas.Tpo obexd/plugins/$(DEPDIR)/obexd-mas.Po
681-@@ -8114,20 +8023,6 @@ obexd/client/obexd-sync.obj: obexd/client/sync.c
682- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
683- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/client/obexd-sync.obj `if test -f 'obexd/client/sync.c'; then $(CYGPATH_W) 'obexd/client/sync.c'; else $(CYGPATH_W) '$(srcdir)/obexd/client/sync.c'; fi`
684-
685--obexd/client/obexd-pbap.o: obexd/client/pbap.c
686--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/client/obexd-pbap.o -MD -MP -MF obexd/client/$(DEPDIR)/obexd-pbap.Tpo -c -o obexd/client/obexd-pbap.o `test -f 'obexd/client/pbap.c' || echo '$(srcdir)/'`obexd/client/pbap.c
687--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/client/$(DEPDIR)/obexd-pbap.Tpo obexd/client/$(DEPDIR)/obexd-pbap.Po
688--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/client/pbap.c' object='obexd/client/obexd-pbap.o' libtool=no @AMDEPBACKSLASH@
689--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
690--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/client/obexd-pbap.o `test -f 'obexd/client/pbap.c' || echo '$(srcdir)/'`obexd/client/pbap.c
691--
692--obexd/client/obexd-pbap.obj: obexd/client/pbap.c
693--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/client/obexd-pbap.obj -MD -MP -MF obexd/client/$(DEPDIR)/obexd-pbap.Tpo -c -o obexd/client/obexd-pbap.obj `if test -f 'obexd/client/pbap.c'; then $(CYGPATH_W) 'obexd/client/pbap.c'; else $(CYGPATH_W) '$(srcdir)/obexd/client/pbap.c'; fi`
694--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/client/$(DEPDIR)/obexd-pbap.Tpo obexd/client/$(DEPDIR)/obexd-pbap.Po
695--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='obexd/client/pbap.c' object='obexd/client/obexd-pbap.obj' libtool=no @AMDEPBACKSLASH@
696--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
697--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -c -o obexd/client/obexd-pbap.obj `if test -f 'obexd/client/pbap.c'; then $(CYGPATH_W) 'obexd/client/pbap.c'; else $(CYGPATH_W) '$(srcdir)/obexd/client/pbap.c'; fi`
698--
699- obexd/client/obexd-ftp.o: obexd/client/ftp.c
700- @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(obexd_src_obexd_CPPFLAGS) $(CPPFLAGS) $(obexd_src_obexd_CFLAGS) $(CFLAGS) -MT obexd/client/obexd-ftp.o -MD -MP -MF obexd/client/$(DEPDIR)/obexd-ftp.Tpo -c -o obexd/client/obexd-ftp.o `test -f 'obexd/client/ftp.c' || echo '$(srcdir)/'`obexd/client/ftp.c
701- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) obexd/client/$(DEPDIR)/obexd-ftp.Tpo obexd/client/$(DEPDIR)/obexd-ftp.Po
702-@@ -10584,7 +10479,6 @@ distclean: distclean-am
703- -rm -f obexd/client/$(DEPDIR)/obexd-map.Po
704- -rm -f obexd/client/$(DEPDIR)/obexd-mns.Po
705- -rm -f obexd/client/$(DEPDIR)/obexd-opp.Po
706-- -rm -f obexd/client/$(DEPDIR)/obexd-pbap.Po
707- -rm -f obexd/client/$(DEPDIR)/obexd-session.Po
708- -rm -f obexd/client/$(DEPDIR)/obexd-sync.Po
709- -rm -f obexd/client/$(DEPDIR)/obexd-transfer.Po
710-@@ -10592,14 +10486,10 @@ distclean: distclean-am
711- -rm -f obexd/plugins/$(DEPDIR)/obexd-bluetooth.Po
712- -rm -f obexd/plugins/$(DEPDIR)/obexd-filesystem.Po
713- -rm -f obexd/plugins/$(DEPDIR)/obexd-ftp.Po
714-- -rm -f obexd/plugins/$(DEPDIR)/obexd-irmc.Po
715- -rm -f obexd/plugins/$(DEPDIR)/obexd-mas.Po
716- -rm -f obexd/plugins/$(DEPDIR)/obexd-messages-dummy.Po
717- -rm -f obexd/plugins/$(DEPDIR)/obexd-opp.Po
718-- -rm -f obexd/plugins/$(DEPDIR)/obexd-pbap.Po
719- -rm -f obexd/plugins/$(DEPDIR)/obexd-pcsuite.Po
720-- -rm -f obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po
721-- -rm -f obexd/plugins/$(DEPDIR)/obexd-vcard.Po
722- -rm -f obexd/src/$(DEPDIR)/obexd-log.Po
723- -rm -f obexd/src/$(DEPDIR)/obexd-main.Po
724- -rm -f obexd/src/$(DEPDIR)/obexd-manager.Po
725-@@ -11170,7 +11060,6 @@ maintainer-clean: maintainer-clean-am
726- -rm -f obexd/client/$(DEPDIR)/obexd-map.Po
727- -rm -f obexd/client/$(DEPDIR)/obexd-mns.Po
728- -rm -f obexd/client/$(DEPDIR)/obexd-opp.Po
729-- -rm -f obexd/client/$(DEPDIR)/obexd-pbap.Po
730- -rm -f obexd/client/$(DEPDIR)/obexd-session.Po
731- -rm -f obexd/client/$(DEPDIR)/obexd-sync.Po
732- -rm -f obexd/client/$(DEPDIR)/obexd-transfer.Po
733-@@ -11178,14 +11067,10 @@ maintainer-clean: maintainer-clean-am
734- -rm -f obexd/plugins/$(DEPDIR)/obexd-bluetooth.Po
735- -rm -f obexd/plugins/$(DEPDIR)/obexd-filesystem.Po
736- -rm -f obexd/plugins/$(DEPDIR)/obexd-ftp.Po
737-- -rm -f obexd/plugins/$(DEPDIR)/obexd-irmc.Po
738- -rm -f obexd/plugins/$(DEPDIR)/obexd-mas.Po
739- -rm -f obexd/plugins/$(DEPDIR)/obexd-messages-dummy.Po
740- -rm -f obexd/plugins/$(DEPDIR)/obexd-opp.Po
741-- -rm -f obexd/plugins/$(DEPDIR)/obexd-pbap.Po
742- -rm -f obexd/plugins/$(DEPDIR)/obexd-pcsuite.Po
743-- -rm -f obexd/plugins/$(DEPDIR)/obexd-phonebook-dummy.Po
744-- -rm -f obexd/plugins/$(DEPDIR)/obexd-vcard.Po
745- -rm -f obexd/src/$(DEPDIR)/obexd-log.Po
746- -rm -f obexd/src/$(DEPDIR)/obexd-main.Po
747- -rm -f obexd/src/$(DEPDIR)/obexd-manager.Po
748-diff --git a/Makefile.obexd b/Makefile.obexd
749-index 73004a3..7119ac9 100644
750---- a/Makefile.obexd
751-+++ b/Makefile.obexd
752-@@ -33,15 +33,6 @@ obexd_builtin_sources += obexd/plugins/opp.c
753- obexd_builtin_modules += ftp
754- obexd_builtin_sources += obexd/plugins/ftp.c obexd/plugins/ftp.h
755-
756--obexd_builtin_modules += irmc
757--obexd_builtin_sources += obexd/plugins/irmc.c
758--
759--obexd_builtin_modules += pbap
760--obexd_builtin_sources += obexd/plugins/pbap.c \
761-- obexd/plugins/vcard.h obexd/plugins/vcard.c \
762-- obexd/plugins/phonebook.h \
763-- obexd/plugins/phonebook-dummy.c
764--
765- obexd_builtin_modules += mas
766- obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
767- obexd/plugins/messages.h \
768-@@ -68,7 +59,6 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \
769- obexd/client/session.h obexd/client/session.c \
770- obexd/client/bluetooth.h obexd/client/bluetooth.c \
771- obexd/client/sync.h obexd/client/sync.c \
772-- obexd/client/pbap.h obexd/client/pbap.c \
773- obexd/client/ftp.h obexd/client/ftp.c \
774- obexd/client/opp.h obexd/client/opp.c \
775- obexd/client/map.h obexd/client/map.c \
776-@@ -79,12 +69,12 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \
777- obexd/src/map_ap.h
778- obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
779- gdbus/libgdbus-internal.la \
780-- $(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl
781-+ $(DBUS_LIBS) $(GLIB_LIBS) -ldl
782-
783- obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic
784-
785- obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
786-- $(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \
787-+ -DOBEX_PLUGIN_BUILTIN \
788- -DPLUGINDIR=\""$(obex_plugindir)"\" \
789- -D_FILE_OFFSET_BITS=64 \
790- -I$(builddir)/lib -I$(builddir)/obexd/src
791-diff --git a/configure.ac b/configure.ac
792-index b7452fa..70677ea 100644
793---- a/configure.ac
794-+++ b/configure.ac
795-@@ -249,12 +249,6 @@ fi
796-
797- AC_ARG_ENABLE(obex, AC_HELP_STRING([--disable-obex],
798- [disable OBEX profile support]), [enable_obex=${enableval}])
799--if (test "${enable_obex}" != "no"); then
800-- PKG_CHECK_MODULES(ICAL, libical, dummy=yes,
801-- AC_MSG_ERROR(libical is required))
802-- AC_SUBST(ICAL_CFLAGS)
803-- AC_SUBST(ICAL_LIBS)
804--fi
805- AM_CONDITIONAL(OBEX, test "${enable_obex}" != "no")
806-
807- AC_ARG_ENABLE(btpclient, AC_HELP_STRING([--enable-btpclient],
808-diff --git a/obexd/client/manager.c b/obexd/client/manager.c
809-index fbcad6d..ad4a9ff 100644
810---- a/obexd/client/manager.c
811-+++ b/obexd/client/manager.c
812-@@ -42,7 +42,6 @@
813- #include "bluetooth.h"
814- #include "opp.h"
815- #include "ftp.h"
816--#include "pbap.h"
817- #include "sync.h"
818- #include "map.h"
819- #include "manager.h"
820-@@ -262,7 +261,6 @@ static struct obc_module {
821- { "bluetooth", bluetooth_init, bluetooth_exit },
822- { "opp", opp_init, opp_exit },
823- { "ftp", ftp_init, ftp_exit },
824-- { "pbap", pbap_init, pbap_exit },
825- { "sync", sync_init, sync_exit },
826- { "map", map_init, map_exit },
827- { }
828---
829-2.17.1
830-
831diff --git a/patch/0005-obexd-don-t-free-environment-variable.patch b/patch/0005-obexd-don-t-free-environment-variable.patch
832deleted file mode 100644
833index c66c68d..0000000
834--- a/patch/0005-obexd-don-t-free-environment-variable.patch
835+++ /dev/null
836@@ -1,31 +0,0 @@
837-From 8ef25c6ffef5786529b6dd292f6f5597c1dbfd4f Mon Sep 17 00:00:00 2001
838-From: Dan Dedrick <dan_dedrick@jabil.com>
839-Date: Wed, 9 Dec 2020 11:57:36 -0500
840-Subject: [PATCH] obexd: don't free environment variable
841-
842-Use g_strdup for option_root since it is expected to be freeable. When
843-this was assigned to an environement variable it would then be passed to
844-g_free and cause a crash because it wasn't memory that had been
845-malloced.
846----
847- obexd/src/main.c | 4 +++-
848- 1 file changed, 3 insertions(+), 1 deletion(-)
849-
850-diff --git a/obexd/src/main.c b/obexd/src/main.c
851-index 118b5a1a9..ddea9fbd5 100644
852---- a/obexd/src/main.c
853-+++ b/obexd/src/main.c
854-@@ -285,7 +285,9 @@ int main(int argc, char *argv[])
855- }
856-
857- if (option_root == NULL) {
858-- option_root = getenv("SNAP_USER_DATA");
859-+ const char * root_env = getenv("SNAP_USER_DATA");
860-+ if (root_env)
861-+ option_root = g_strdup(root_env);
862-
863- if (!option_root)
864- option_root = g_build_filename(g_get_user_cache_dir(),
865---
866-2.29.2
867-
868diff --git a/run-tests.sh b/run-tests.sh
869index 3fd257c..b5a4d11 100755
870--- a/run-tests.sh
871+++ b/run-tests.sh
872@@ -94,4 +94,4 @@ done < <(yq eval '.backends.qemu.systems[]' spread.yaml | sed -e '/^ /d' -e 's/:
873 echo "INFO: Executing tests runner"
874 # shellcheck disable=SC2086
875 cd $TESTS_EXTRAS_PATH &&
876- ./tests-runner.sh "$@" --snap="$snap" "$backends" $EXTRA_ARGS
877+ ./tests-runner.sh "$@" --channel=edge --snap="$snap" "$backends" $EXTRA_ARGS
878diff --git a/snapcraft.yaml b/snapcraft.yaml
879index 2b6512e..3c39703 100644
880--- a/snapcraft.yaml
881+++ b/snapcraft.yaml
882@@ -1,5 +1,5 @@
883 name: bluez
884-version: 5.53-7-dev
885+version: 5.64-dev
886 type: app
887 summary: Bluetooth tools and daemons
888 description: |
889@@ -9,8 +9,8 @@ description: |
890 License (GPL). See the project homepage for more details:
891 https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/bluez
892 confinement: strict
893-grade: stable
894-base: core20
895+grade: devel
896+base: core22
897
898 layout:
899 /usr/var/lib/bluetooth:
900@@ -22,18 +22,12 @@ apps:
901 bluetoothctl:
902 command: bin/client-wrapper usr/bin/bluetoothctl
903 plugs: [client, uhid]
904- obexctl:
905- command: bin/client-wrapper usr/bin/obexctl
906- plugs: [client]
907 bluez:
908 command: bin/bluetoothd-wrapper
909- daemon: simple
910+ daemon: dbus
911+ bus-name: org.bluez
912 slots: [service]
913 plugs: [uhid, uinput, kernel-crypto-api]
914- obex:
915- command: "usr/lib/bluetooth/obexd"
916- daemon: simple
917- slots: [service]
918 hciconfig:
919 command: usr/bin/hciconfig
920 plugs: [bluetooth-control]
921@@ -58,9 +52,6 @@ apps:
922 btmgmt:
923 command: usr/bin/btmgmt
924 plugs: [bluetooth-control, network-control]
925- meshctl:
926- command: usr/bin/meshctl
927- plugs: [bluetooth-control, network-control]
928
929 plugs:
930 client:
931@@ -96,9 +87,9 @@ parts:
932 build-packages:
933 - dpkg-dev
934 - git
935+ - python3-docutils
936 stage-packages:
937 - bluez
938- - bluez-obexd
939 - bluez-hcidump
940 override-build: |
941 set -ex
942@@ -110,7 +101,6 @@ parts:
943 cp build-tools/* "$SNAPCRAFT_PART_INSTALL"/build-tools
944 prime:
945 - usr/share/doc/bluez
946- - usr/share/doc/bluez-obexd
947 - usr/share/doc/bluez-hcidump
948
949 bluez:
950@@ -118,19 +108,17 @@ parts:
951 plugin: autotools
952 source: https://git.launchpad.net/ubuntu/+source/bluez
953 source-type: git
954- source-branch: applied/ubuntu/focal-updates
955+ source-branch: applied/ubuntu/jammy
956 autotools-configure-parameters:
957 - --prefix=/usr
958 - --libexec=/usr/lib/
959 - --enable-experimental
960 - --enable-threads
961 - --disable-cups
962- - --enable-obex
963 - --disable-systemd
964 - --disable-silent-rules
965 - --enable-test
966 - --enable-deprecated
967- - --enable-mesh
968 build-packages:
969 - flex
970 - bison
971@@ -145,9 +133,7 @@ parts:
972 - check
973 prime:
974 - usr/lib/bluetooth/bluetoothd
975- - usr/lib/bluetooth/obexd
976 - usr/bin/bluetoothctl
977- - usr/bin/obexctl
978 - usr/bin/hciconfig
979 - usr/bin/hcidump
980 - usr/bin/hciattach
981@@ -156,7 +142,6 @@ parts:
982 - usr/bin/sdptool
983 - usr/bin/btmon
984 - usr/bin/btmgmt
985- - usr/bin/meshctl
986 override-build: |
987 set -ex
988 "$SNAPCRAFT_STAGE"/build-tools/check-versions bluez yes
989@@ -165,6 +150,5 @@ parts:
990 git am "$SNAPCRAFT_PROJECT_DIR"/patch/*
991 snapcraftctl build
992 cp tools/btmgmt "$SNAPCRAFT_PART_INSTALL"/usr/bin/
993- cp tools/obexctl "$SNAPCRAFT_PART_INSTALL"/usr/bin/
994 # Run all tests shiped by default
995- #make check
996+ make check
997diff --git a/spread.yaml b/spread.yaml
998index ee293b4..5a5a777 100644
999--- a/spread.yaml
1000+++ b/spread.yaml
1001@@ -22,13 +22,13 @@ environment:
1002 SNAP_ARCH: amd64
1003 # Allow the host to pass the channel to use for the test run
1004 SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)
1005- SNAP_AUTO_ALIASES: bluetoothctl obexctl hciconfig hcidump hciattach hcitool
1006+ SNAP_AUTO_ALIASES: bluetoothctl hciconfig hcidump hciattach hcitool
1007
1008 backends:
1009 qemu:
1010 memory: 4G
1011 systems:
1012- - ubuntu-core-20:
1013+ - ubuntu-core-22:
1014 bios: /usr/share/OVMF/OVMF_CODE.fd
1015 username: test
1016 password: test
1017@@ -46,7 +46,7 @@ suites:
1018 tests/main/:
1019 summary: Full-system tests for BlueZ
1020 systems:
1021- - ubuntu-core-20
1022+ - ubuntu-core-22
1023 prepare: |
1024 . $TESTSLIB/prepare.sh
1025 restore-each: |
1026diff --git a/tests/main/aliases/task.yaml b/tests/main/aliases/task.yaml
1027index 3813735..883624c 100644
1028--- a/tests/main/aliases/task.yaml
1029+++ b/tests/main/aliases/task.yaml
1030@@ -3,7 +3,6 @@ summary: Verify aliases provided by the snap are correctly enabled
1031 execute: |
1032 . $TESTSLIB/utilities.sh
1033 test -e /snap/bin/bluetoothctl
1034- test -e /snap/bin/obexctl
1035 test -e /snap/bin/hciconfig
1036 test -e /snap/bin/hcidump
1037 test -e /snap/bin/hciattach

Subscribers

People subscribed via source and target branches