[oe-commits] [openembedded-core] 18/58: systemd: provides ${base_sbindir}/udevadm

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit c8bf23349af4972a76cb4b13179dac844812d75f
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Mon Sep 9 23:26:34 2019 -0400

    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.
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-core/systemd/systemd_242.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb
index 2c101cb..0684ee7 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -287,6 +287,9 @@ do_install() {
 		fi
 	fi
 
+	# create link for existing udev rules
+	ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm
+
 	# duplicate udevadm for postinst script
 	install -d ${D}${libexecdir}
 	ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm
@@ -604,6 +607,7 @@ FILES_udev += "${base_sbindir}/udevd \
                ${systemd_unitdir}/system/*udev* \
                ${systemd_unitdir}/system/*.wants/*udev* \
                ${base_bindir}/udevadm \
+               ${base_sbindir}/udevadm \
                ${libexecdir}/${MLPREFIX}udevadm \
                ${datadir}/bash-completion/completions/udevadm \
               "

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.