diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-12-20 09:53:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-04 12:57:43 +0000 |
commit | a91b286291c7401c5788c45a68f13f690f1a6d15 (patch) | |
tree | 9463891e17e36a0dd7e5e09eb4b036782ea041d6 /meta/recipes-core/udev | |
parent | a8f78241be9b30a3ff851713f0b8fae97acee464 (diff) | |
download | poky-a91b286291c7401c5788c45a68f13f690f1a6d15.tar.gz |
systemd: inherit distro_features_check
Use distro_features_check so that we can have a uniform controller.
(From OE-Core rev: 9daf88713dedfb29fe926e18d76090a6b2582ac8)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev')
-rw-r--r-- | meta/recipes-core/udev/eudev_3.2.2.bb | 9 |
1 files changed, 3 insertions, 6 deletions
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 \ | |||
23 | SRC_URI[md5sum] = "41e19b70462692fefd072a3f38818b6e" | 23 | SRC_URI[md5sum] = "41e19b70462692fefd072a3f38818b6e" |
24 | SRC_URI[sha256sum] = "3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63" | 24 | SRC_URI[sha256sum] = "3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63" |
25 | 25 | ||
26 | inherit autotools update-rc.d qemu pkgconfig | 26 | inherit autotools update-rc.d qemu pkgconfig distro_features_check |
27 | |||
28 | CONFLICT_DISTRO_FEATURES = "systemd" | ||
27 | 29 | ||
28 | EXTRA_OECONF = " \ | 30 | EXTRA_OECONF = " \ |
29 | --sbindir=${base_sbindir} \ | 31 | --sbindir=${base_sbindir} \ |
@@ -75,11 +77,6 @@ RDEPENDS_eudev-hwdb += "eudev" | |||
75 | RPROVIDES_${PN} = "hotplug udev" | 77 | RPROVIDES_${PN} = "hotplug udev" |
76 | RPROVIDES_eudev-hwdb += "udev-hwdb" | 78 | RPROVIDES_eudev-hwdb += "udev-hwdb" |
77 | 79 | ||
78 | python () { | ||
79 | if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): | ||
80 | raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES") | ||
81 | } | ||
82 | |||
83 | PACKAGE_WRITE_DEPS += "qemu-native" | 80 | PACKAGE_WRITE_DEPS += "qemu-native" |
84 | pkg_postinst_eudev-hwdb () { | 81 | pkg_postinst_eudev-hwdb () { |
85 | if test -n "$D"; then | 82 | if test -n "$D"; then |