From c11e894a02c7d8714037d17639218e89dfcd6c31 Mon Sep 17 00:00:00 2001 From: Stefan Eichenberger Date: Thu, 10 Nov 2016 19:25:29 +0100 Subject: [PATCH] images: split images in several images Remove cockpit from normal image, add lora image, add node-red image --- recipes-core/images/nmrouter-image-cockpit.bb | 8 ++++++++ recipes-core/images/nmrouter-image-dev.bb | 2 ++ recipes-core/images/nmrouter-image-lora.bb | 6 ++++++ recipes-core/images/nmrouter-image-node-red.bb | 15 +++++++++++++++ recipes-core/images/nmrouter-image.bb | 7 ++++--- 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 recipes-core/images/nmrouter-image-cockpit.bb create mode 100644 recipes-core/images/nmrouter-image-lora.bb create mode 100644 recipes-core/images/nmrouter-image-node-red.bb diff --git a/recipes-core/images/nmrouter-image-cockpit.bb b/recipes-core/images/nmrouter-image-cockpit.bb new file mode 100644 index 0000000..03a7d8c --- /dev/null +++ b/recipes-core/images/nmrouter-image-cockpit.bb @@ -0,0 +1,8 @@ +require nmrouter-image.bb + +SUMMARY = "nmrouter image that includes cockpit" + +IMAGE_INSTALL_append = " \ + cockpit \ + " + diff --git a/recipes-core/images/nmrouter-image-dev.bb b/recipes-core/images/nmrouter-image-dev.bb index 385ed2c..b6d99f5 100644 --- a/recipes-core/images/nmrouter-image-dev.bb +++ b/recipes-core/images/nmrouter-image-dev.bb @@ -31,5 +31,7 @@ IMAGE_INSTALL_append = " \ lrzsz \ ${BENCH_TOOLS} \ ${EASY_EDITOR} \ + python3 \ + python3-misc \ " diff --git a/recipes-core/images/nmrouter-image-lora.bb b/recipes-core/images/nmrouter-image-lora.bb new file mode 100644 index 0000000..6cc3c5f --- /dev/null +++ b/recipes-core/images/nmrouter-image-lora.bb @@ -0,0 +1,6 @@ +require nmrouter-image.bb + +IMAGE_INSTALL_append = " \ + lora-gateway-utils \ + lora-packet-forwarder \ + " diff --git a/recipes-core/images/nmrouter-image-node-red.bb b/recipes-core/images/nmrouter-image-node-red.bb new file mode 100644 index 0000000..6a5bf33 --- /dev/null +++ b/recipes-core/images/nmrouter-image-node-red.bb @@ -0,0 +1,15 @@ +require nmrouter-image.bb + +SUMMARY = "nmrouter image that includes node-red" + +IMAGE_INSTALL_append = " \ + nodejs \ + node-red \ + python3 \ + python3-pip \ + python3-misc \ + " + +IMAGE_INSTALL_remove = " \ + python-pip \ + " diff --git a/recipes-core/images/nmrouter-image.bb b/recipes-core/images/nmrouter-image.bb index 6e436e1..37916ca 100644 --- a/recipes-core/images/nmrouter-image.bb +++ b/recipes-core/images/nmrouter-image.bb @@ -11,8 +11,6 @@ IMAGE_FEATURES_append = " \ ssh-server-openssh \ " -PREFERED_VERSION-pn_nodejs = "4.4.5" - FIRMWARE ?= "linux-firmware" FIRMWARE_am335x-nbhw16 = " \ linux-firmware-ath6k \ @@ -39,11 +37,14 @@ IMAGE_INSTALL_append = " \ python-subprocess \ networkmanager \ modemmanager \ - cockpit \ board-descriptor \ sw-update \ python-pip \ rng-tools \ + glibc-utils \ + glibc-gconv \ + glibc-gconv-utf-16 \ + glibc-gconv-utf-32 \ ${FIRMWARE} \ "