From d6e75abdebcca14a85af07c610f036c1a42e6a93 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 31 May 2013 11:14:37 +0200 Subject: [PATCH] images: add connman-angstrom-settings to connman based images Signed-off-by: Koen Kooi Conflicts: recipes-images/angstrom/systemd-image.bb --- recipes-images/angstrom/console-base-image.bb | 2 +- recipes-images/angstrom/development-gnome-image.bb | 2 +- recipes-images/angstrom/systemd-image.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-images/angstrom/console-base-image.bb b/recipes-images/angstrom/console-base-image.bb index 4025b39..7f8c6f5 100644 --- a/recipes-images/angstrom/console-base-image.bb +++ b/recipes-images/angstrom/console-base-image.bb @@ -8,7 +8,7 @@ IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" DISTRO_UPDATE_ALTERNATIVES ??= "" ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' -CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd" +CONMANPKGS ?= "connman connman-angstrom-settings connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd" CONMANPKGS_libc-uclibc = "" IMAGE_INSTALL += " \ diff --git a/recipes-images/angstrom/development-gnome-image.bb b/recipes-images/angstrom/development-gnome-image.bb index 5f657cd..e975c5d 100644 --- a/recipes-images/angstrom/development-gnome-image.bb +++ b/recipes-images/angstrom/development-gnome-image.bb @@ -1,6 +1,6 @@ # Image with a GNOME2 desktop and various tools installed -CONMANPKGS = "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome" +CONMANPKGS = "connman connman-angstrom-settings connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-gnome" require systemd-image.bb diff --git a/recipes-images/angstrom/systemd-image.bb b/recipes-images/angstrom/systemd-image.bb index 84badcb..fe9f497 100644 --- a/recipes-images/angstrom/systemd-image.bb +++ b/recipes-images/angstrom/systemd-image.bb @@ -8,7 +8,7 @@ IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" DISTRO_UPDATE_ALTERNATIVES ??= "" ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' -CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi" +CONMANPKGS ?= "connman connman-angstrom-settings connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi" CONMANPKGS_libc-uclibc = "" IMAGE_INSTALL += " \