diff options
| author |   Matt Ranostay <matt.ranostay@konsulko.com> | 2017-05-27 04:17:56 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-05-30 12:32:04 +0000 |
| commit | cb0de9c0c19d87a9031172275898ce460934ff53 (patch) | |
| tree | c74211e26eba380db38a047ed53b1075b643df38 | |
| parent | 79fe06d7b112890cd6adaeac312556369135e5ae (diff) | |
lightmediascanner: remove udev workaround
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 <matt.ranostay@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9533
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
3 files changed, 0 insertions, 17 deletions
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 } |