From c2a8cf4725a8e8fa467d2135f52503f73865e644 Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Tue, 1 Aug 2017 16:37:28 +0200
Subject: [PATCH] image: Avoid installing bsc and nitb in core image

Before this change, the packages were installed but not enabled to start
at boot time.
---
 recipes-apps/images/sysmocom-bsc-image.bb          | 2 +-
 recipes-apps/images/sysmocom-core-image-minimal.bb | 2 +-
 recipes-apps/images/sysmocom-image.inc             | 2 +-
 recipes-apps/images/sysmocom-nitb-image.bb         | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes-apps/images/sysmocom-bsc-image.bb b/recipes-apps/images/sysmocom-bsc-image.bb
index 0f2bc92..7cfc8a3 100644
--- a/recipes-apps/images/sysmocom-bsc-image.bb
+++ b/recipes-apps/images/sysmocom-bsc-image.bb
@@ -1,7 +1,7 @@
 require sysmocom-image.inc
 
 IMAGE_LINGUAS = " "
-IMAGE_INSTALL_append = " dnsmasq "
+IMAGE_INSTALL_append = " task-sysmocom dnsmasq "
 
 # This variant of the image will run osmo-bts and osmo-bsc
 activate_bsc() {
diff --git a/recipes-apps/images/sysmocom-core-image-minimal.bb b/recipes-apps/images/sysmocom-core-image-minimal.bb
index fa50665..1cc00ff 100644
--- a/recipes-apps/images/sysmocom-core-image-minimal.bb
+++ b/recipes-apps/images/sysmocom-core-image-minimal.bb
@@ -1,4 +1,4 @@
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} packagegroup-osmocom task-sysmocom"
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} packagegroup-osmocom task-sysmocom-tools"
 IMAGE_LINGUAS = " "
 LICENSE = "MIT"
 
diff --git a/recipes-apps/images/sysmocom-image.inc b/recipes-apps/images/sysmocom-image.inc
index e3a5a19..16b03c5 100644
--- a/recipes-apps/images/sysmocom-image.inc
+++ b/recipes-apps/images/sysmocom-image.inc
@@ -1,5 +1,5 @@
 DEPENDS = "${MACHINE_EXTRA_RDEPENDS} util-linux-native"
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
 IMAGE_LINGUAS = " "
 IMAGE_FEATURES += " package-management "
 LICENSE = "MIT"
diff --git a/recipes-apps/images/sysmocom-nitb-image.bb b/recipes-apps/images/sysmocom-nitb-image.bb
index 3697ff1..14f7330 100644
--- a/recipes-apps/images/sysmocom-nitb-image.bb
+++ b/recipes-apps/images/sysmocom-nitb-image.bb
@@ -1,5 +1,7 @@
 require sysmocom-image.inc
 
+IMAGE_INSTALL_append = " task-sysmocom "
+
 # This variant of the image will run osmo-bts and osmo-nitb
 activate_nitb() {
 	echo "NO_START=0" > ${IMAGE_ROOTFS}/etc/default/osmo-nitb