diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-02-28 15:58:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-26 22:43:03 +0000 |
| commit | e92dfa11577c0be9dcd88e0d9892cb9808a74505 (patch) | |
| tree | afe2e2ccf5e0df5cb46dcbbd3890a6ec9d0d2a59 | |
| parent | 88cea759d51913f2f764740cc110389b218e6d32 (diff) | |
| download | poky-e92dfa11577c0be9dcd88e0d9892cb9808a74505.tar.gz | |
default-providers: change udev selection logic
Change the logic so that the udev provider is the standalone udev, unless the
systemd DISTRO_FEATURE is set. The previous logic was designed to fail if both
sysvinit and systemd were enabled, which we're supporting now.
(From OE-Core rev: f5d018a769fa297efa629cbbf6e42a49173faa8b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 39ce7cc3f1..e3a44e69fb 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc | |||
| @@ -38,4 +38,4 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" | |||
| 38 | PREFERRED_PROVIDER_console-tools ?= "kbd" | 38 | PREFERRED_PROVIDER_console-tools ?= "kbd" |
| 39 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" | 39 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" |
| 40 | PREFERRED_PROVIDER_make ?= "make" | 40 | PREFERRED_PROVIDER_make ?= "make" |
| 41 | PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','sysvinit','udev','',d)}${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" | 41 | PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" |