From 9daf88713dedfb29fe926e18d76090a6b2582ac8 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 20 Dec 2017 09:53:13 +0800 Subject: systemd: inherit distro_features_check Use distro_features_check so that we can have a uniform controller. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-core/udev/eudev_3.2.2.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core/udev') diff --git a/meta/recipes-core/udev/eudev_3.2.2.bb b/meta/recipes-core/udev/eudev_3.2.2.bb index 70e3568dc2..d01104746d 100644 --- a/meta/recipes-core/udev/eudev_3.2.2.bb +++ b/meta/recipes-core/udev/eudev_3.2.2.bb @@ -23,7 +23,9 @@ SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \ SRC_URI[md5sum] = "41e19b70462692fefd072a3f38818b6e" SRC_URI[sha256sum] = "3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63" -inherit autotools update-rc.d qemu pkgconfig +inherit autotools update-rc.d qemu pkgconfig distro_features_check + +CONFLICT_DISTRO_FEATURES = "systemd" EXTRA_OECONF = " \ --sbindir=${base_sbindir} \ @@ -75,11 +77,6 @@ RDEPENDS_eudev-hwdb += "eudev" RPROVIDES_${PN} = "hotplug udev" RPROVIDES_eudev-hwdb += "udev-hwdb" -python () { - if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): - raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES") -} - PACKAGE_WRITE_DEPS += "qemu-native" pkg_postinst_eudev-hwdb () { if test -n "$D"; then -- cgit 1.2.3-korg