From e6054e68a830a346def612e38c8c545001de6ddc Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Thu, 1 Aug 2013 18:01:38 +0300 Subject: [PATCH] ofono: Move bluetooth enabling to .inc file Moving the bluetooth enabling to ofono.inc from .bb file as it makes more sense to have bluetooth always checked. (From OE-Core rev: c7d27f4626f6763ec348c390cc907f30c102f96d) Signed-off-by: Jukka Rissanen Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/ofono/ofono.inc | 1 + meta/recipes-connectivity/ofono/ofono_1.12.bb | 1 - meta/recipes-connectivity/ofono/ofono_git.bb | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index b0e8020..7adc667 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -14,6 +14,7 @@ INITSCRIPT_PARAMS = "defaults 22" EXTRA_OECONF += "\ ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ " SYSTEMD_SERVICE_${PN} = "ofono.service" diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb index 44ab0a6..32c8bc2 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.12.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.12.bb @@ -14,6 +14,5 @@ SRC_URI[sha256sum] = "733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b EXTRA_OECONF += "\ --enable-test \ - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ " CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb index f79f34f..db0bf73 100644 --- a/meta/recipes-connectivity/ofono/ofono_git.bb +++ b/meta/recipes-connectivity/ofono/ofono_git.bb @@ -8,10 +8,6 @@ PR = "r5" SRC_URI = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \ file://ofono" -EXTRA_OECONF += "\ - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ -" - do_configure_prepend () { ${S}/bootstrap } -- 2.7.4