From b78baf3bb3e6563823246d6583a04cb290bc8576 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Sat, 21 May 2022 09:25:20 +0100 Subject: eudev: Use PACKAGE_BEFORE_PN/${PN}, clean up spaces Use PACKAGE_BEFORE_PN for packages which need to capture files early, switch to idiomatic ${PN} for additional packages. Swap spaces for tabs in shell functions. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-core/udev/eudev_3.2.11.bb | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/meta/recipes-core/udev/eudev_3.2.11.bb b/meta/recipes-core/udev/eudev_3.2.11.bb index 7f190e7323..bc2c77de89 100644 --- a/meta/recipes-core/udev/eudev_3.2.11.bb +++ b/meta/recipes-core/udev/eudev_3.2.11.bb @@ -63,28 +63,27 @@ do_install:prepend:class-target () { INITSCRIPT_NAME = "udev" INITSCRIPT_PARAMS = "start 04 S ." -PACKAGES =+ "libudev" -PACKAGES =+ "eudev-hwdb" +PACKAGE_BEFORE_PN = "libudev ${PN}-hwdb" FILES:${PN} += "${nonarch_base_libdir}/udev" FILES:libudev = "${base_libdir}/libudev.so.*" -FILES:eudev-hwdb = "${sysconfdir}/udev/hwdb.d" +FILES:${PN}-hwdb = "${sysconfdir}/udev/hwdb.d" -RDEPENDS:eudev-hwdb += "eudev" -RDEPENDS:eudev += "kmod" +RDEPENDS:${PN}-hwdb += "eudev" +RDEPENDS:${PN} += "kmod" RPROVIDES:${PN} = "hotplug udev" -RPROVIDES:eudev-hwdb += "udev-hwdb" +RPROVIDES:${PN}-hwdb += "udev-hwdb" PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst:eudev-hwdb () { - if test -n "$D"; then - $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} - else - udevadm hwdb --update - fi +pkg_postinst:${PN}-hwdb () { + if test -n "$D"; then + $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} + else + udevadm hwdb --update + fi } -pkg_prerm:eudev-hwdb () { - rm -f $D${sysconfdir}/udev/hwdb.bin +pkg_prerm:${PN}-hwdb () { + rm -f $D${sysconfdir}/udev/hwdb.bin } -- cgit 1.2.3-korg