From a5110d6031ecd5343114d74d2b463234342c12a0 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 22 Jan 2020 19:46:20 -0500
Subject: meta-agl-profile-core: switch to udisks2

The udisks recipe was dropped from meta-oe in zeus, rework our
bbappend to work with udisks2 which replaces it.

Bug-AGL: SPEC-2932

Change-Id: I9ac1a25ee5a816d06874a5c859034f2c2758d117
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 .../recipes-support/udisks/files/automount.service |  2 +-
 .../udisks/files/org.freedesktop.UDisks.conf       | 32 ----------------------
 .../recipes-support/udisks/files/udisks.service    | 11 --------
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf
 delete mode 100644 meta-agl-profile-core/recipes-support/udisks/files/udisks.service

(limited to 'meta-agl-profile-core/recipes-support/udisks/files')

diff --git a/meta-agl-profile-core/recipes-support/udisks/files/automount.service b/meta-agl-profile-core/recipes-support/udisks/files/automount.service
index 64c36e76b..b16515196 100644
--- a/meta-agl-profile-core/recipes-support/udisks/files/automount.service
+++ b/meta-agl-profile-core/recipes-support/udisks/files/automount.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Automount Disk Manager
-After=udisks.service
+After=udisks2.service
 
 [Service]
 ExecStart=/usr/libexec/automount.sh
diff --git a/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf b/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf
deleted file mode 100644
index 0098b94e1..000000000
--- a/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
-
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Only root can own the service -->
-  <policy user="root">
-    <allow own="org.freedesktop.UDisks"/>
-  </policy>
-
-  <policy context="default">
-    <allow send_destination="org.freedesktop.UDisks"/>
-
-    <allow send_destination="org.freedesktop.UDisks"
-	    send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.DBus.Introspectable"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks.Device"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks.Adapter"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks.Expander"/>
-    <allow send_destination="org.freedesktop.UDisks"
-	    send_interface="org.freedesktop.UDisks.Port"/>
-    <allow receive_sender="org.freedesktop.UDisks" receive_type="signal"
-           receive_interface="org.freedesktop.UDisks"/>
-  </policy>
-</busconfig>
diff --git a/meta-agl-profile-core/recipes-support/udisks/files/udisks.service b/meta-agl-profile-core/recipes-support/udisks/files/udisks.service
deleted file mode 100644
index 4bd558449..000000000
--- a/meta-agl-profile-core/recipes-support/udisks/files/udisks.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Disk Manager (legacy version)
-Documentation=man:udisks(7)
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.UDisks
-ExecStart=/usr/libexec/udisks-daemon --no-debug
-
-[Install]
-WantedBy=multi-user.target
-- 
cgit 1.2.3-korg