From b1ee9d6cb0f28ba3dc5b35be97cd9507c39ede48 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller 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 --- recipes-support/opencv/opencv_3.3.bbappend | 1 - 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 -------- recipes-support/udisks/udisks_1.0.5.bbappend | 28 ------------------- 6 files changed, 100 deletions(-) delete mode 100644 recipes-support/opencv/opencv_3.3.bbappend 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 delete mode 100644 recipes-support/udisks/udisks_1.0.5.bbappend (limited to 'recipes-support') diff --git a/recipes-support/opencv/opencv_3.3.bbappend b/recipes-support/opencv/opencv_3.3.bbappend deleted file mode 100644 index 8656abf09..000000000 --- a/recipes-support/opencv/opencv_3.3.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG ?= "jpeg png v4l libv4l gstreamer" diff --git a/recipes-support/udisks/files/automount.service b/recipes-support/udisks/files/automount.service deleted file mode 100644 index 64c36e76b..000000000 --- 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 bb0b1ae91..000000000 --- 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 0098b94e1..000000000 --- a/recipes-support/udisks/files/org.freedesktop.UDisks.conf +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/recipes-support/udisks/files/udisks.service b/recipes-support/udisks/files/udisks.service deleted file mode 100644 index 4bd558449..000000000 --- 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 diff --git a/recipes-support/udisks/udisks_1.0.5.bbappend b/recipes-support/udisks/udisks_1.0.5.bbappend deleted file mode 100644 index d55a167a6..000000000 --- a/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