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 --------
 .../recipes-support/udisks/udisks2_%.bbappend      | 22 +++++++++++++++
 .../recipes-support/udisks/udisks_1.0.5.bbappend   | 28 -------------------
 5 files changed, 23 insertions(+), 72 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
 create mode 100644 meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend
 delete mode 100644 meta-agl-profile-core/recipes-support/udisks/udisks_1.0.5.bbappend

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

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
diff --git a/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend b/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend
new file mode 100644
index 000000000..27cac6592
--- /dev/null
+++ b/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend
@@ -0,0 +1,22 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://automount.service \
+            file://automount.sh \
+"
+
+SYSTEMD_AUTO_ENABLE = "enable"
+SYSTEMD_SERVICE_${PN} += "automount.service"
+
+do_install_append () {
+    sed -i 's/^WantedBy=.*/WantedBy=multi-user.target/' ${D}${systemd_unitdir}/system/udisks2.service
+
+    install -d ${D}${base_libdir}/systemd/system
+    install -m 0644 ${WORKDIR}/automount.service ${D}${systemd_unitdir}/system
+
+    install -d ${D}${libexecdir}
+    install -m 0755 ${WORKDIR}/automount.sh ${D}${libexecdir}/automount.sh
+}
+
+FILES_${PN} += "${base_libdir}/systemd/system/automount.service \
+                ${libexecdir}/automount.sh \
+"
diff --git a/meta-agl-profile-core/recipes-support/udisks/udisks_1.0.5.bbappend b/meta-agl-profile-core/recipes-support/udisks/udisks_1.0.5.bbappend
deleted file mode 100644
index d55a167a6..000000000
--- a/meta-agl-profile-core/recipes-support/udisks/udisks_1.0.5.bbappend
+++ /dev/null
@@ -1,28 +0,0 @@
-SRC_URI += "file://org.freedesktop.UDisks.conf \
-            file://udisks.service \
-            file://automount.service \
-            file://automount.sh \
-           "
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-FILES_${PN} += "${base_libdir}/systemd/system/automount.service \
-                ${base_libdir}/systemd/system/udisks.service \
-                ${libexecdir}/automount.sh \
-               "
-
-SYSTEMD_AUTO_ENABLE = "enable"
-SYSTEMD_SERVICE_${PN} = "udisks.service automount.service"
-
-do_install_append () {
-    install -d ${D}${sysconfdir}/dbus-1/system.d
-    install -m 644 ${WORKDIR}/org.freedesktop.UDisks.conf ${D}${sysconfdir}/dbus-1/system.d/
-
-    install -d ${D}${base_libdir}/systemd/system
-    install -m 0644 ${WORKDIR}/udisks.service ${D}${base_libdir}/systemd/system
-
-    install -d ${D}${base_libdir}/systemd/system
-    install -m 0644 ${WORKDIR}/automount.service ${D}${base_libdir}/systemd/system
-
-    install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/automount.sh ${D}${libexecdir}/automount.sh
-}
-- 
cgit 1.2.3-korg