default-providers: fix PREFERRED_PROVIDER_udev

Submitted by Andreas Oberritter on March 16, 2013, 11:49 a.m.

Details

Message ID 1363434559-12940-1-git-send-email-obi@opendreambox.org
State New, archived
Headers show

Commit Message

Andreas Oberritter March 16, 2013, 11:49 a.m.
This must be either systemd or udev, but not both. Prefer
systemd whenever systemd is set in DISTRO_FEATURES.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/conf/distro/include/default-providers.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index ebf2a09..f7ee789 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"
 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)}"

Comments

Andreas Oberritter March 16, 2013, 9:52 p.m.
On 16.03.2013 12:49, Andreas Oberritter wrote:
> --- 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"
>  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
Ross Burton March 17, 2013, 12:07 a.m.
On 16 March 2013 14:52, Andreas Oberritter <obi@opendreambox.org> wrote:
> 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