From b1ee9d6cb0f28ba3dc5b35be97cd9507c39ede48 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Tue, 24 Apr 2018 15:15:42 +0200
Subject: 2nd part of the layer/profile rework [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Main goal of this is to move the agl-service-* bindings into the core and to
unify common recipes like wayland/weston into meta-agl-profile-graphical.
As a placeholder for recipes is meta-agl-profile-demo which are being reshuffled.

TLDR: remove recipes from meta-agl-demo that were moved to other layers

Bug-AGL: SPEC-145 , SPEC-876 , SPEC-877

v2: moving updated udisks changes to meta-agl

Change-Id: I873107f00adadeb6f3f266cce37b513fe6d44cf2
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 recipes-support/udisks/files/automount.service     |  9 ------
 recipes-support/udisks/files/automount.sh          | 19 -------------
 .../udisks/files/org.freedesktop.UDisks.conf       | 32 ----------------------
 recipes-support/udisks/files/udisks.service        | 11 --------
 4 files changed, 71 deletions(-)
 delete mode 100644 recipes-support/udisks/files/automount.service
 delete mode 100755 recipes-support/udisks/files/automount.sh
 delete mode 100644 recipes-support/udisks/files/org.freedesktop.UDisks.conf
 delete mode 100644 recipes-support/udisks/files/udisks.service

(limited to 'recipes-support/udisks/files')

diff --git a/recipes-support/udisks/files/automount.service b/recipes-support/udisks/files/automount.service
deleted file mode 100644
index 64c36e76..00000000
--- a/recipes-support/udisks/files/automount.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Automount Disk Manager
-After=udisks.service
-
-[Service]
-ExecStart=/usr/libexec/automount.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-support/udisks/files/automount.sh b/recipes-support/udisks/files/automount.sh
deleted file mode 100755
index bb0b1ae9..00000000
--- a/recipes-support/udisks/files/automount.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-pathtoname() {
-	udevadm info -p /sys/"$1" | awk -v FS== '/DEVNAME/ {print $2}'
-}
-
-MOUNT_OPTIONS="ro,flush"
-
-rmdir /media/* &> /dev/null || true
-for DEVNAME in $(udisks --enumerate-device-files|grep -e sd[a-z]); do
-	udisks --mount-options $MOUNT_OPTIONS --mount $DEVNAME
-done
-
-stdbuf -oL -- udevadm monitor --udev -s block | while read -r -- _ _ event devpath _; do
-	if [ "$event" = add ]; then
-		DEVNAME=$(pathtoname "$devpath")
-		udisks --mount-options $MOUNT_OPTIONS --mount $DEVNAME
-	fi
-done
diff --git a/recipes-support/udisks/files/org.freedesktop.UDisks.conf b/recipes-support/udisks/files/org.freedesktop.UDisks.conf
deleted file mode 100644
index 0098b94e..00000000
--- a/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/recipes-support/udisks/files/udisks.service b/recipes-support/udisks/files/udisks.service
deleted file mode 100644
index 4bd55844..00000000
--- a/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