[Angstrom-devel] Koen Kooi : images: switch to ROOTFS_PKGMANAGE for dragging in package managers

[Angstrom Git Repos]

Module: meta-angstrom
Branch: master
Commit: 440f5d56ee379121f97ad4580a6253aafcc4d29e

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Mon Jan 16 09:58:56 2012 +0100

images: switch to ROOTFS_PKGMANAGE for dragging in package managers

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 recipes-images/angstrom/hardware-bringup-image.bb |    7 ++++---
 recipes-images/angstrom/systemd-image.bb          |    8 ++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/recipes-images/angstrom/hardware-bringup-image.bb b/recipes-images/angstrom/hardware-bringup-image.bb
index 145e367..acbe5c6 100644
--- a/recipes-images/angstrom/hardware-bringup-image.bb
+++ b/recipes-images/angstrom/hardware-bringup-image.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
 
-
 IMAGE_INSTALL += " \
 	angstrom-task-boot \
 	task-basic \
 	${CONMANPKGS} \
-	python-dbus python-pycairo \
+	${ROOTFS_PKGMANAGE_PKGS} \
 	usbutils \
 	i2c-tools \
 	alsa-utils \
@@ -26,7 +25,9 @@ IMAGE_INSTALL += " \
 	bc \
 "
 
-CONMANPKGS = "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd"
+ROOTFS_PKGMANAGE_PKGS ?= ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE}", d)}
+
+CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd"
 CONMANPKGS_libc-uclibc = ""
 
 IMAGE_DEV_MANAGER   = "udev"
diff --git a/recipes-images/angstrom/systemd-image.bb b/recipes-images/angstrom/systemd-image.bb
index cbbae91..0d2afe5 100644
--- a/recipes-images/angstrom/systemd-image.bb
+++ b/recipes-images/angstrom/systemd-image.bb
@@ -5,13 +5,17 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
 
+ROOTFS_PKGMANAGE_PKGS ?= ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE}", d)}
+
+CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd"
+CONMANPKGS_libc-uclibc = ""
+
 IMAGE_INSTALL += " \
 	angstrom-task-boot \
 	task-basic \
 	${CONMANPKGS} \
+	${ROOTFS_PKGMANAGE_PKGS} \
 "
-CONMANPKGS = "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd"
-CONMANPKGS_libc-uclibc = ""
 
 IMAGE_DEV_MANAGER   = "udev"
 IMAGE_INIT_MANAGER  = "systemd"