From 9ff08ca516195c498a0e7f8f6ca84d93195c770d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 3 Jan 2012 01:01:34 +0000 Subject: task-opie-connman: minor fixes * Rename to task-opie-connman * Make connman plugins RRECOMMENDS instead of RDEPENDS * Add the task recipe to opie-image-connman DEPENDS Signed-off-by: Paul Eggleton --- recipes-opie/images/opie-image-connman.bb | 2 +- recipes-opie/tasks/task-connman.bb | 15 --------------- recipes-opie/tasks/task-opie-connman.bb | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 recipes-opie/tasks/task-connman.bb create mode 100644 recipes-opie/tasks/task-opie-connman.bb diff --git a/recipes-opie/images/opie-image-connman.bb b/recipes-opie/images/opie-image-connman.bb index d13a6a7..6c2709b 100644 --- a/recipes-opie/images/opie-image-connman.bb +++ b/recipes-opie/images/opie-image-connman.bb @@ -2,7 +2,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 IMAGE_LINGUAS = "" -DEPENDS = "task-base task-opie" +DEPENDS = "task-base task-opie task-opie-connman" IMAGE_FEATURES = "ssh-server-dropbear" diff --git a/recipes-opie/tasks/task-connman.bb b/recipes-opie/tasks/task-connman.bb deleted file mode 100644 index 6c70ba1..0000000 --- a/recipes-opie/tasks/task-connman.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Tasks for Opie ConnMan settings" -LICENSE = "MIT" - -PR = "r0" - -inherit task - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -RDEPENDS_${PN} = "opie-connmansettings opie-connmanapplet \ - connman-plugin-ethernet \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'connman-plugin-wifi', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'connman-plugin-bluetooth', '',d)} \ - " - diff --git a/recipes-opie/tasks/task-opie-connman.bb b/recipes-opie/tasks/task-opie-connman.bb new file mode 100644 index 0000000..e46dc74 --- /dev/null +++ b/recipes-opie/tasks/task-opie-connman.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Tasks for Opie ConnMan settings" +LICENSE = "MIT" + +PR = "r0" + +inherit task + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +RDEPENDS_${PN} = "opie-connmansettings opie-connmanapplet" + +RRECOMMENDS_${PN} = "connman-plugin-ethernet \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'connman-plugin-wifi', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'connman-plugin-bluetooth', '',d)} \ + " + -- cgit 1.2.3-korg