Skip to contentSkip to conversation

default-providers: fix PREFERRED_PROVIDER_udev

PATCH In review Andreas Oberritter 2 participants 3 messages Mar 16, 2013 – Mar 17, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 default-providers: fix PREFERRED_PROVIDER_udev

This must be either systemd or udev, but not both. Prefer systemd whenever systemd is set in DISTRO_FEATURES.

---
 meta/conf/distro/include/default-providers.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/default-providers.inc +1 -1
index ebf2a09..f7ee789 100644
@@ -38,4 +38,4 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
 PREFERRED_PROVIDER_console-tools ?= "kbd"
 PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
 PREFERRED_PROVIDER_make ?= "make"
-PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','sysvinit','udev','',d)}${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}"
+PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)}"
Signature · 1 line
1.7.10.4
#1 lore raw

meta/conf/distro/include/default-providers.inc PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" · line 41

Quoted 8 lines · Andreas Oberritter
meta/conf/distro/include/default-providers.inc +1 -1
@@ -38,4 +38,4 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
 PREFERRED_PROVIDER_console-tools ?= "kbd"
 PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
 PREFERRED_PROVIDER_make ?= "make"
-PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','sysvinit','udev','',d)}${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}"
+PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)}"

Please ignore this patch. Ross already did this is his hybrid sysvinit/systemd branch.

Regards,
Andreas

#2 lore raw
Quoted 2 lines · Andreas Oberritter

Please ignore this patch. Ross already did this is his hybrid sysvinit/systemd branch.

For what it's worth that behaviour was intentional, although we appeared to have neglected it from the commit message. The intention at the time was that specifying both would cause the udev provider to be nonsense, producing an error.

Ross