summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-09-09 23:26:34 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-16 23:02:44 +0100
commitf58498f668f50b12484a871150d51f98e813dd2c (patch)
tree62aa021951023fbb0117f6f945722de074281f76
parent1dc518776a0670eb541afa13203cab0de0e5adb3 (diff)
downloadpoky-f58498f668f50b12484a871150d51f98e813dd2c.tar.gz
systemd: provides ${base_sbindir}/udevadm
In some udev rules files such as 97-hid2hci.rules from bluez5, it calls /sbin/udevadm in a rule. eudev provides /usr/bin/udevadm and /sbin/udevadm which is a link to /usr/bin/udevadm. But systemd only provides /bin/udevadm. It is not convenient to update the rule file that udevadm reside in different directories for eudev and system. So create link file ${base_sbindir}/udevadm in systemd just the same as eudev to fix such kind of issues. (From OE-Core rev: c8bf23349af4972a76cb4b13179dac844812d75f) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_242.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb
index 2c101cbbb4..0684ee76ca 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -287,6 +287,9 @@ do_install() {
287 fi 287 fi
288 fi 288 fi
289 289
290 # create link for existing udev rules
291 ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm
292
290 # duplicate udevadm for postinst script 293 # duplicate udevadm for postinst script
291 install -d ${D}${libexecdir} 294 install -d ${D}${libexecdir}
292 ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm 295 ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm
@@ -604,6 +607,7 @@ FILES_udev += "${base_sbindir}/udevd \
604 ${systemd_unitdir}/system/*udev* \ 607 ${systemd_unitdir}/system/*udev* \
605 ${systemd_unitdir}/system/*.wants/*udev* \ 608 ${systemd_unitdir}/system/*.wants/*udev* \
606 ${base_bindir}/udevadm \ 609 ${base_bindir}/udevadm \
610 ${base_sbindir}/udevadm \
607 ${libexecdir}/${MLPREFIX}udevadm \ 611 ${libexecdir}/${MLPREFIX}udevadm \
608 ${datadir}/bash-completion/completions/udevadm \ 612 ${datadir}/bash-completion/completions/udevadm \
609 " 613 "