diff options
author | Joshua Lock <joshua.lock@collabora.co.uk> | 2015-09-04 15:59:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-06 15:26:20 +0100 |
commit | d1c2b4dfcf0e26fbccbe576302f8e077baffab8b (patch) | |
tree | be7ae2505bb57fdf66e371d9f057eb9fa947c3c1 | |
parent | d13bbbe4faec30cb0911dce693bae6ba1757d0c4 (diff) | |
download | poky-d1c2b4dfcf0e26fbccbe576302f8e077baffab8b.tar.gz |
pulseaudio: handle udev dir being 2 levels below /
When building with a merged /usr dir the udev directory
lives at /usr/lib/udev - update the FILES pattern to also
pick up udev files installed two levels below the / to
ensure a merged /usr works.
(From OE-Core rev: 7fe7f94da1af7a350ad2240da405dad829d49d71)
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 27e05d39b0..5b806d7611 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -115,7 +115,7 @@ FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ | |||
115 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" | 115 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" |
116 | FILES_${PN}-conf = "${sysconfdir}" | 116 | FILES_${PN}-conf = "${sysconfdir}" |
117 | FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" | 117 | FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" |
118 | FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules ${systemd_user_unitdir}/*" | 118 | FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" |
119 | 119 | ||
120 | #SYSTEMD_PACKAGES = "${PN}-server" | 120 | #SYSTEMD_PACKAGES = "${PN}-server" |
121 | SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service" | 121 | SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service" |