From cb0de9c0c19d87a9031172275898ce460934ff53 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Sat, 27 May 2017 04:17:56 +0300 Subject: lightmediascanner: remove udev workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that DBUS events on monitored mounted directories works the workaround can be removed. Change-Id: Ia4ac369a47aefc33f0aa9276a31841d0a64cd2da Bug-AGL: SPEC-628 Signed-off-by: Matt Ranostay Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9533 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Scott Murray Reviewed-by: Stéphane Desneux Reviewed-by: Jan-Simon Moeller --- .../lightmediascanner/files/90-lightmediascanner.rules | 1 - .../lightmediascanner/files/lightmediascanner.sh | 9 --------- .../lightmediascanner/lightmediascanner_%.bbappend | 7 ------- 3 files changed, 17 deletions(-) delete mode 100644 meta-agl/recipes-multimedia/lightmediascanner/files/90-lightmediascanner.rules delete mode 100644 meta-agl/recipes-multimedia/lightmediascanner/files/lightmediascanner.sh (limited to 'meta-agl') diff --git a/meta-agl/recipes-multimedia/lightmediascanner/files/90-lightmediascanner.rules b/meta-agl/recipes-multimedia/lightmediascanner/files/90-lightmediascanner.rules deleted file mode 100644 index 55bcb3ac6..000000000 --- a/meta-agl/recipes-multimedia/lightmediascanner/files/90-lightmediascanner.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/lightmediascanner.sh" diff --git a/meta-agl/recipes-multimedia/lightmediascanner/files/lightmediascanner.sh b/meta-agl/recipes-multimedia/lightmediascanner/files/lightmediascanner.sh deleted file mode 100644 index 8aa397eee..000000000 --- a/meta-agl/recipes-multimedia/lightmediascanner/files/lightmediascanner.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Call from udev -# -# Attempt to scan any new inserted media - -name="`basename "$DEVNAME"`" - -/usr/bin/lightmediascannerctl scan audio:/run/media/$(basename "$DEVNAME") diff --git a/meta-agl/recipes-multimedia/lightmediascanner/lightmediascanner_%.bbappend b/meta-agl/recipes-multimedia/lightmediascanner/lightmediascanner_%.bbappend index 52be41580..cf248d3fd 100644 --- a/meta-agl/recipes-multimedia/lightmediascanner/lightmediascanner_%.bbappend +++ b/meta-agl/recipes-multimedia/lightmediascanner/lightmediascanner_%.bbappend @@ -6,8 +6,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://lightmediascanner.service \ file://plugin-ogg-fix-chucksize-issue.patch \ file://dbus-lightmediascanner.conf \ - file://90-lightmediascanner.rules \ - file://lightmediascanner.sh \ " CFLAGS_append = " -D_FILE_OFFSET_BITS=64" @@ -26,11 +24,6 @@ do_install_append() { ln -sf ${systemd_user_unitdir}/lightmediascanner.service ${D}/etc/systemd/user/default.target.wants/lightmediascanner.service fi - if ${@bb.utils.contains('DISTRO_FEATURES', 'automount', 'true', 'false', d)}; then - install -m 644 -p -D ${WORKDIR}/90-lightmediascanner.rules ${D}/etc/udev/rules.d/90-lightmediascanner.rules - install -m 755 -p -D ${WORKDIR}/lightmediascanner.sh ${D}/etc/udev/scripts/lightmediascanner.sh - fi - install -d ${D}/etc/dbus-1/session.d install -m 0644 ${WORKDIR}/dbus-lightmediascanner.conf ${D}/etc/dbus-1/session.d/lightmediascanner.conf } -- cgit 1.2.3-korg