From d32ed5dd1dcadf206162b823bcb2f539e0ff5ad3 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 2 Mar 2016 14:45:49 -0800 Subject: eudev: recipe formatting improvements Formatting improvements only, no functional changes. Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/recipes-core/udev/eudev_3.1.5.bb | 124 ++++++++++++++++------------------ 1 file changed, 60 insertions(+), 64 deletions(-) diff --git a/meta/recipes-core/udev/eudev_3.1.5.bb b/meta/recipes-core/udev/eudev_3.1.5.bb index 8a23e6cb23..c15dd89c67 100644 --- a/meta/recipes-core/udev/eudev_3.1.5.bb +++ b/meta/recipes-core/udev/eudev_3.1.5.bb @@ -1,33 +1,66 @@ SUMMARY = "eudev is a fork of systemd's udev" HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" -SRC_URI = "https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz \ - file://init \ - file://local.rules \ - file://udev-cache \ - file://udev-cache.default \ - file://run.rules \ - file://udev.rules \ - file://devfs-udev.rules \ - file://links.conf \ - file://permissions.rules \ - " - LICENSE = "GPLv2.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -inherit autotools update-rc.d +DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" + +PROVIDES = "udev" + +SRC_URI = "https://github.com/gentoo/${BPN}/archive/v${PV}.tar.gz \ + file://devfs-udev.rules \ + file://init \ + file://links.conf \ + file://local.rules \ + file://permissions.rules \ + file://run.rules \ + file://udev-cache \ + file://udev-cache.default \ + file://udev.rules \ +" SRC_URI[md5sum] = "e130f892d8744e292cb855db79935f68" SRC_URI[sha256sum] = "ce9d5fa91e3a42c7eb95512ca0fa2a631e89833053066bb6cdf42046b2a88553" -LIC_FILES_CHKSUM="file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +inherit autotools update-rc.d -DEPENDS = "glib-2.0-native glib-2.0 util-linux libxslt-native gperf-native kmod" +EXTRA_OECONF = " \ + --sbindir=${base_sbindir} \ + --libexecdir=${nonarch_base_libdir} \ + --with-rootlibdir=${base_libdir} \ + --with-rootprefix= \ +" -PROVIDES = "udev" -RPROVIDES_${PN} = "hotplug udev" +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache + sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev + sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev-cache -PACKAGES =+ "udev-cache" -PACKAGES =+ "libudev" + install -d ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache + + touch ${D}${sysconfdir}/udev/cache.data + + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + + # Use classic network interface naming scheme + touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules + + # Fix for multilib systems where libs along with confs are installed incorrectly + if ! [ -d ${D}${nonarch_base_libdir}/udev ] + then + install -d ${D}${nonarch_base_libdir}/udev + mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir} + fi + + # hid2hci has moved to bluez4. removed in udev as of version 169 + rm -f ${D}${base_libdir}/udev/hid2hci + + echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf +} INITSCRIPT_PACKAGES = "eudev udev-cache" INITSCRIPT_NAME_eudev = "udev" @@ -35,59 +68,22 @@ INITSCRIPT_PARAMS_eudev = "start 04 S ." INITSCRIPT_NAME_udev-cache = "udev-cache" INITSCRIPT_PARAMS_udev-cache = "start 36 S ." -RRECOMMENDS_${PN} += "udev-cache" - - -FILES_libudev = "${base_libdir}/libudev.so.*" +PACKAGES =+ "libudev" +PACKAGES =+ "udev-cache" FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" - - FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ ${includedir}/libudev.h ${libdir}/libudev.so \ ${includedir}/udev.h ${libdir}/libudev.la \ - ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc \ - " + ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" +FILES_libudev = "${base_libdir}/libudev.so.*" FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache" -EXTRA_OECONF = "--with-rootlibdir=${base_libdir} \ - --sbindir=${base_sbindir} \ - --libexecdir=${nonarch_base_libdir} \ - --with-rootprefix= \ -" -do_install_append(){ - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev - install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache - sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev - sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev-cache - - install -d ${D}${sysconfdir}/default - install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache - - touch ${D}${sysconfdir}/udev/cache.data - - install -d ${D}${sysconfdir}/udev/rules.d/ - - install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules - - # Fix for multilib systems where libs along with confs are installed incorrectly - if ! [ -d ${D}${nonarch_base_libdir}/udev ] - then - install -d ${D}${nonarch_base_libdir}/udev - mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir} - fi - - # hid2hci has moved to bluez4. removed in udev as of version 169 - rm -f ${D}${base_libdir}/udev/hid2hci - - echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf - - # Use classic network interface naming scheme - touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules -} - python () { if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES") } + +RRECOMMENDS_${PN} += "udev-cache" + +RPROVIDES_${PN} = "hotplug udev" -- cgit v1.2.3