Patchwork [meta-networking] autofs: Fix build breakage with systemd in DISTRO_FEATURE

login
register
mail settings
Submitter Khem Raj
Date March 18, 2013, 9:18 p.m.
Message ID <1363641523-19107-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/46419/
State Accepted, archived
Commit e075421a12a62f12294bf44e13deeca0594d5549
Headers show

Comments

Khem Raj - March 18, 2013, 9:18 p.m.
When systemd is in distro features we need to translate it
into the appropriate PACKAGECONFIG flag

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-daemons/autofs/autofs_5.0.7.bb         |    2 ++
 1 file changed, 2 insertions(+)
Joe MacDonald - March 19, 2013, 12:55 a.m.
[[oe] [meta-networking][PATCH] autofs: Fix build breakage with systemd in DISTRO_FEATURE] On 13.03.18 (Mon 14:18) Khem Raj wrote:

> When systemd is in distro features we need to translate it
> into the appropriate PACKAGECONFIG flag

Aw poo.  Thanks, Khem.  Merged.

-J.

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../recipes-daemons/autofs/autofs_5.0.7.bb         |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> index 6cc3b25..7d8cf17 100644
> --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> @@ -51,6 +51,8 @@ CFLAGS += "${LDFLAGS}"
>  
>  PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
>  
> +PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
> +
>  EXTRA_OEMAKE = "DONTSTRIP=1"
>  EXTRA_OECONF += "--disable-mount-locking \
>                  --enable-ignore-busy --with-openldap=no \

Patch

diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
index 6cc3b25..7d8cf17 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
@@ -51,6 +51,8 @@  CFLAGS += "${LDFLAGS}"
 
 PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
 
+PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
 EXTRA_OEMAKE = "DONTSTRIP=1"
 EXTRA_OECONF += "--disable-mount-locking \
                 --enable-ignore-busy --with-openldap=no \