Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Node-RED optional, kas cleanups #487

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Make Node-RED optional, kas cleanups #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0998da
Make Node-RED packages optional
jan-kiszka Sep 26, 2023
249e9e4
Update all kas headers to version 14
jan-kiszka Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,19 @@ config KAS_INCLUDE_RT
default "kas/opt/preempt-rt.yml"
depends on PREEMPT_RT

config NODE_RED
bool "Node-RED support"
default y
help
Building image with Node-RED support.

config KAS_INCLUDE_NO_NODE_RED
string
default "kas/opt/no-node-red.yml"
depends on !NODE_RED

config DOCKER
bool "Docker support"
default n
help
Building image with docker support.

Expand Down
2 changes: 1 addition & 1 deletion kas-iot2050-boot-pg1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

header:
version: 10
version: 14
includes:
- kas/iot2050.yml

Expand Down
2 changes: 1 addition & 1 deletion kas-iot2050-boot-pg2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

header:
version: 10
version: 14
includes:
- kas/iot2050.yml

Expand Down
2 changes: 1 addition & 1 deletion kas-iot2050-example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14
includes:
- kas/iot2050.yml

Expand Down
2 changes: 1 addition & 1 deletion kas-iot2050-qemu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

header:
version: 10
version: 14

machine: iot2050-qemu

Expand Down
2 changes: 1 addition & 1 deletion kas-iot2050-swupdate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

header:
version: 10
version: 14
includes:
- kas-iot2050-example.yml

Expand Down
2 changes: 1 addition & 1 deletion kas/opt/debian-mirror.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

header:
version: 10
version: 14

local_conf_header:
debian-mirror: |
Expand Down
2 changes: 1 addition & 1 deletion kas/opt/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14

local_conf_header:
docker-support: |
Expand Down
2 changes: 1 addition & 1 deletion kas/opt/lxde.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14

local_conf_header:
add-lxde: |
Expand Down
16 changes: 16 additions & 0 deletions kas/opt/no-node-red.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#
# Copyright (c) Siemens AG, 2023
#
# Authors:
# Jan Kiszka <[email protected]>
#
# This file is subject to the terms and conditions of the MIT License. See
# COPYING.MIT file in the top-level directory.
#

header:
version: 14

local_conf_header:
no-node-red: |
IOT2050_NODE_RED_SUPPORT = "0"
2 changes: 1 addition & 1 deletion kas/opt/otpcmd/key-provision-3keys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14
includes:
- otp.yml

Expand Down
2 changes: 1 addition & 1 deletion kas/opt/otpcmd/key-provision-enabling-only.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14
includes:
- otp.yml

Expand Down
2 changes: 1 addition & 1 deletion kas/opt/otpcmd/key-provision-keys-only.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14
includes:
- otp.yml

Expand Down
2 changes: 1 addition & 1 deletion kas/opt/otpcmd/key-provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
#

header:
version: 10
version: 14
includes:
- otp.yml
2 changes: 1 addition & 1 deletion kas/opt/otpcmd/key-switch-2to3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14
includes:
- key-switch.yml

Expand Down
2 changes: 1 addition & 1 deletion kas/opt/otpcmd/key-switch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14
includes:
- otp.yml

Expand Down
2 changes: 1 addition & 1 deletion kas/opt/otpcmd/otp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14

local_conf_header:
otpcmd_override: |
Expand Down
2 changes: 1 addition & 1 deletion kas/opt/package-lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14

local_conf_header:
package-lock: |
Expand Down
2 changes: 1 addition & 1 deletion kas/opt/preempt-rt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

header:
version: 10
version: 14

local_conf_header:
preempt-rt: |
Expand Down
2 changes: 1 addition & 1 deletion kas/opt/rpmb-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#

header:
version: 10
version: 14

local_conf_header:
optee-os-iot2050_override: |
Expand Down
2 changes: 1 addition & 1 deletion kas/opt/sdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
#

header:
version: 10
version: 14

task: populate_sdk
2 changes: 1 addition & 1 deletion kas/opt/secure-boot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

header:
version: 10
version: 14

local_conf_header:
secureboot_override: |
Expand Down
2 changes: 1 addition & 1 deletion kas/opt/upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

header:
version: 10
version: 14

local_conf_header:
upstream-versions: |
Expand Down
11 changes: 8 additions & 3 deletions recipes-core/images/iot2050-image-example.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ IMAGE_INSTALL += " \
iot2050-firmware-update \
tcf-agent \
mraa \
node-red \
node-red-gpio \
node-red-preinstalled-nodes \
${@ 'board-conf-tools' if d.getVar('QEMU_IMAGE') != '1' else '' } \
libteec1 \
optee-client-dev \
tee-supplicant \
"

IOT2050_NOD_RED_SUPPORT ?= "1"

IMAGE_INSTALL += "${@ ' \
node-red \
node-red-gpio \
node-red-preinstalled-nodes \
' if d.getVar('IOT2050_NOD_RED_SUPPORT') == '1' else ''}"