From 29f7c8e15a0b9cdf89e31594d6c5c13673bd1159 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Fri, 19 Nov 2021 12:58:45 +0000 Subject: [PATCH] meta-oniro-blueprints: Remove layer The layer will be migrated to: https://booting.oniroproject.org/distro/meta-oniro-blueprints Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- meta-oniro-blueprints/README.md | 50 ----------- meta-oniro-blueprints/SECURITY.md | 1 - .../oniro-linux-blueprint-dashboard.conf | 48 ---------- .../distro/oniro-linux-blueprint-gateway.conf | 41 --------- ...oniro-linux-blueprint-vending-machine.conf | 48 ---------- .../oniro-zephyr-blueprint-dashboard.conf | 21 ----- .../oniro-zephyr-blueprint-doorlock.conf | 17 ---- .../oniro-zephyr-blueprint-gateway.conf | 17 ---- .../distro/oniro-zephyr-blueprint-keypad.conf | 11 --- meta-oniro-blueprints/conf/layer.conf | 23 ----- ...ending-machine-control-application.service | 15 ---- ...vending-machine-control-application_git.bb | 38 -------- .../vending-machine-ui-application.service | 18 ---- .../vending-machine-ui-application_git.bb | 31 ------- .../bluez5/bluez5_%.bbappend | 13 --- .../SoftAP.nmconnection | 33 ------- .../networkmanager-softap-config_git.bb | 14 --- .../ot-br-posix/60-otbr-ip-forward.conf | 2 - .../openthread/ot-br-posix/otbr-configuration | 28 ------ .../ot-br-posix/otbr-configuration.service | 13 --- .../openthread/ot-br-posix_%.bbappend | 17 ---- .../blueprint-dashboard-gateway-image.bb | 29 ------- .../images/blueprint-gateway-image.bb | 9 -- .../images/blueprint-vending-machine-image.bb | 19 ---- .../packagegroup-connectivity.bbappend | 18 ---- .../recipes-gnome/epiphany/epiphany-app.bb | 62 ------------- .../epiphany-HomeAssistant.desktop | 10 --- .../HomeAssistant/service-override.conf | 7 -- .../epiphany-app/epiphany-app@.service | 17 ---- ...omeassistant-config-blueprint-dashboard.bb | 87 ------------------- .../homeassistant/homeassistant-config.inc | 6 -- .../homeassistant/homeassistant-useradd.inc | 16 ---- .../0001-components-met-Use-API-v2.patch | 41 --------- .../python3-homeassistant_%.bbappend | 9 -- .../ohsmarthome-py/ohsmarthome-py_git.bb | 26 ------ .../smart-home-homeassistant-plugin_git.bb | 43 --------- .../linux/linux-raspberrypi_%.bbappend | 10 --- .../linux/linux/blueprints-misc.cfg | 5 -- .../zephyr-blueprint-doorlock-factoryreset.bb | 26 ------ .../zephyr-blueprint-doorlock.bb | 26 ------ .../zephyr-blueprint-gateway-node_git.bb | 29 ------- .../zephyr-kernel/zephyr-blueprint-keypad.bb | 30 ------- .../zephyr-blueprint-smarthome-base.bb | 29 ------- .../zephyr-blueprint-smarthome-sensors.bb | 16 ---- .../zephyr-blueprint-smarthome-switch.bb | 21 ----- 45 files changed, 1090 deletions(-) delete mode 100644 meta-oniro-blueprints/README.md delete mode 120000 meta-oniro-blueprints/SECURITY.md delete mode 100644 meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf delete mode 100644 meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf delete mode 100644 meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf delete mode 100644 meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf delete mode 100644 meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-doorlock.conf delete mode 100644 meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-gateway.conf delete mode 100644 meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-keypad.conf delete mode 100644 meta-oniro-blueprints/conf/layer.conf delete mode 100644 meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application/vending-machine-control-application.service delete mode 100644 meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application_git.bb delete mode 100644 meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-ui-application/vending-machine-ui-application.service delete mode 100644 meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-ui-application_git.bb delete mode 100644 meta-oniro-blueprints/recipes-connectivity/bluez5/bluez5_%.bbappend delete mode 100644 meta-oniro-blueprints/recipes-connectivity/networkmanager/networkmanager-softap-config/SoftAP.nmconnection delete mode 100644 meta-oniro-blueprints/recipes-connectivity/networkmanager/networkmanager-softap-config_git.bb delete mode 100644 meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/60-otbr-ip-forward.conf delete mode 100755 meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration delete mode 100644 meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration.service delete mode 100644 meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix_%.bbappend delete mode 100644 meta-oniro-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb delete mode 100644 meta-oniro-blueprints/recipes-core/images/blueprint-gateway-image.bb delete mode 100644 meta-oniro-blueprints/recipes-core/images/blueprint-vending-machine-image.bb delete mode 100644 meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend delete mode 100644 meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app.bb delete mode 100644 meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/epiphany-HomeAssistant.desktop delete mode 100644 meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/service-override.conf delete mode 100644 meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/epiphany-app@.service delete mode 100644 meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb delete mode 100644 meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config.inc delete mode 100644 meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-useradd.inc delete mode 100644 meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant/0001-components-met-Use-API-v2.patch delete mode 100644 meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant_%.bbappend delete mode 100644 meta-oniro-blueprints/recipes-homeassistant/ohsmarthome-py/ohsmarthome-py_git.bb delete mode 100644 meta-oniro-blueprints/recipes-homeassistant/smart-home-homeassistant-plugin/smart-home-homeassistant-plugin_git.bb delete mode 100644 meta-oniro-blueprints/recipes-kernel/linux/linux-raspberrypi_%.bbappend delete mode 100644 meta-oniro-blueprints/recipes-kernel/linux/linux/blueprints-misc.cfg delete mode 100644 meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-doorlock-factoryreset.bb delete mode 100644 meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-doorlock.bb delete mode 100644 meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-gateway-node_git.bb delete mode 100644 meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-keypad.bb delete mode 100644 meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb delete mode 100644 meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb delete mode 100644 meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-switch.bb diff --git a/meta-oniro-blueprints/README.md b/meta-oniro-blueprints/README.md deleted file mode 100644 index 7ed905aa..00000000 --- a/meta-oniro-blueprints/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# Introduction - -## Description - -The `meta-oniro-blueprints` layer contains build metadata for Oniro Project -blueprints. - -## Layer dependencies - -The `meta-oniro-blueprints` layer depends on the following layers: - -* openembedded-core - * URI: https://git.openembedded.org/openembedded-core -* bitbake - * URI: https://git.openembedded.org/bitbake/ -* meta-homeassistant - * URI: https://github.com/meta-homeassistant/meta-homeassistant.git -* meta-openembedded - * URI: https://git.openembedded.org/meta-openembedded/ - * layers: meta-oe -* meta-raspberrypi - * URI: https://git.yoctoproject.org/git/meta-raspberrypi -* oniro - * URI: https://booting.oniroproject.org/distro/oniro.git - * layers: meta-oniro-core - -Note that the dependencies of the above layers should also be taken into -consideration. - -# Contributing - -## Merge requests - -All contributions are to be handled as merge requests in the -[oniro Gitlab repository](https://booting.oniroproject.org/distro/oniro). For -more information on the contributing process, check the `CONRIBUTING.md` file. - -## Maintainers - -* Andrei Gherzan <andrei.gherzan@huawei.com> -* EilÃs Nà Fhlannagáin <elizabeth.flanagan@huawei.com> -* Stefan Schmidt <stefan.schmidt@huawei.com> - -# License - -This layer is release under the licenses listed in the `LICENSES` root directory. diff --git a/meta-oniro-blueprints/SECURITY.md b/meta-oniro-blueprints/SECURITY.md deleted file mode 120000 index 9d571381..00000000 --- a/meta-oniro-blueprints/SECURITY.md +++ /dev/null @@ -1 +0,0 @@ -../SECURITY.md \ No newline at end of file diff --git a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf deleted file mode 100644 index 5d7cf891..00000000 --- a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf +++ /dev/null @@ -1,48 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# Distro configuration for the dashboard blueprint - -require conf/distro/oniro-linux.conf -include conf/distro/include/ha-versions.inc - -PREFERRED_VERSION_python3-pymetno = "0.7.0" - -DISTRO = "oniro-linux-blueprint-dashboard" -DISTRO_NAME = "Oniro Project Dashboard Blueprint Linux Distro" - -# Custom hostnames for easy DNS resolution for this blueprint. -# The gateway would run on a stm32mp1-av96 machine. -hostname_base-files_stm32mp1-av96 = "blueprint-dashboard-gateway" - -# With our layer setup we would add any bbappend found from our -# layers.conf. This means blueprint-specific appends would leak -# into the package in our main distribution. To avoid this we -# mask out the blueprint layers in the main distro and unmask -# them only the blueprint distributions. -BBMASK = "" - -# Avoid build warning(s) for ununsed extra partitions. -ST_VENDORFS = "0" -ST_USERFS = "0" - -# Dynamic weston.ini configuration -WESTON_DYNAMIC_INI = "1" -WESTON_INI_NO_TOOLBAR = "1" - -# Mask getty on tty1 to cleanup boot process -SYSTEMD_MASK_GETTY = "tty1" - -EPIPHANY_APP = "HomeAssistant" -EPIPHANY_URL = "http://localhost:8123" -EPIPHANY_RDEPENDS = "python3-homeassistant" -EPIPHANY_SERVICE_ENABLED = "1" - -WESTON_INI_BACKGROUND_IMAGE = "/usr/share/backgrounds/oniro-logo-small.png" -WESTON_INI_BACKGROUND_COLOR = "0xff0f0026" -WESTON_INI_BACKGROUND_TYPE = "centered" - -# SmartHome IoT devices BLE interfaces MAC addresses -SMART_HOME_SENSORS_MAC ??= "C0:BA:DD:06:F0:0D" -SMART_HOME_SWITCH_MAC ??= "C0:BA:DD:06:F0:0E" diff --git a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf deleted file mode 100644 index 7d07fcde..00000000 --- a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# Distro configuration for the dashboard blueprint - -require conf/distro/oniro-linux.conf - -DISTRO = "oniro-linux-blueprint-gateway" -DISTRO_NAME = "Oniro Project Gateway Blueprint Linux Distro" - -# Custom hostnames for easy DNS resolution for this blueprint. -hostname_base-files = "blueprint-gateway" - -DISTRO_FEATURES_append = " thread-border-router" - -IMAGE_INSTALL_append = "\ - packagegroup-thread-br \ - packagegroup-thread-client \ - mosquitto \ - coap \ - networkmanager-softap-config \ - " -# Avoid build warning(s) for ununsed extra partitions. -ST_VENDORFS = "0" -ST_USERFS = "0" - -# With our layer setup we would add any bbappend found from our -# layers.conf. This means blueprint-specific appends would leak -# into the package in our main distribution. To avoid this we -# mask out the blueprint layers in the main distro and unmask -# them only the blueprint distributions. -BBMASK = "" - -# If dnsmaq runs as system service started by systemd it clashes with NM, which -# directly calls it. -SYSTEMD_AUTO_ENABLE_pn-dnsmasq = "disable" - -# We have the dnsmasq feature disabled for networkmanager in core, -# but we need this for the gateway. Enable it for the blueprint only. -PACKAGECONFIG_append_pn-networkmanager = " dnsmasq" diff --git a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf deleted file mode 100644 index 48ab0f42..00000000 --- a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf +++ /dev/null @@ -1,48 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# Distro configuration for the vending-machine blueprint - -require conf/distro/oniro-linux.conf - -DISTRO = "oniro-linux-blueprint-vending-machine" -DISTRO_NAME = "Oniro Project Vending-Machine Blueprint Linux Distro" - -# With our layer setup we would add any bbappend found from our -# layers.conf. This means blueprint-specific appends would leak -# into the package in our main distribution. To avoid this we -# mask out the blueprint layers in the main distro and unmask -# them only the blueprint distributions. -BBMASK = "" - -# Graphics system -DISTRO_FEATURES_remove = "x11" - -# Lib configuration needed for some applications in layer -LVGL_CONFIG_LV_MEM_CUSTOM = "1" -LVGL_CONFIG_WAYLAND_HOR_RES ?= "1024" -LVGL_CONFIG_WAYLAND_VER_RES ?= "600" - -# Dynamic weston.ini configuration -WESTON_DYNAMIC_INI = "1" -WESTON_INI_NO_TOOLBAR = "1" -WESTON_INI_SHELL_LOCKING = "false" -WESTON_IDLE_TIME = "0" - -# I2C support -# See Hardware setup for more details. -ENABLE_I2C_rpi = "1" -KERNEL_MODULE_AUTOLOAD_append_rpi = " i2c-dev i2c-bcm2708" -KERNEL_MODULE_AUTOLOAD_append_seco-intel-b68 = " i2c-dev" - -WAVESHARE_1024X600_C_2_1 = "1" - -# Mask getty on tty1 to cleanup boot process -SYSTEMD_MASK_GETTY = "tty1" - -# Cleanup screen -APPEND_remove = "console=tty0" -APPEND_append = " vt.global_cursor_default=0 quiet" -DISABLE_SPLASH_rpi = "1" -WIC_BOOOTLOADER_TIMEOUT = "0" diff --git a/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf b/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf deleted file mode 100644 index ab4b367f..00000000 --- a/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# Distro configuration for the dashboard blueprint - -require conf/distro/oniro-zephyr.conf - -DISTRO = "oniro-zephyr-blueprint-dashboard" -DISTRO_NAME = "Oniro Project Dashboard Blueprint Zephyr Distro" - -# With our layer setup we would add any bbappend found from our -# layers.conf. This means blueprint-specific appends would leak -# into the package in our main distribution. To avoid this we -# mask out the blueprint layers in the main distro and unmask -# them only the blueprint distributions. -BBMASK = "" - -# SmartHome IoT devices BLE interfaces MAC addresses -SMART_HOME_SENSORS_MAC ??= "C0:BA:DD:06:F0:0D" -SMART_HOME_SWITCH_MAC ??= "C0:BA:DD:06:F0:0E" diff --git a/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-doorlock.conf b/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-doorlock.conf deleted file mode 100644 index 70f0330a..00000000 --- a/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-doorlock.conf +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# Distro configuration for the dashboard blueprint - -require conf/distro/oniro-zephyr.conf - -DISTRO = "oniro-zephyr-blueprint-doorlock" -DISTRO_NAME = "Oniro Project Doorlock Blueprint Zephyr Distro" - -# With our layer setup we would add any bbappend found from our -# layers.conf. This means blueprint-specific appends would leak -# into the package in our main distribution. To avoid this we -# mask out the blueprint layers in the main distro and unmask -# them only the blueprint distributions. -BBMASK = "" diff --git a/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-gateway.conf b/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-gateway.conf deleted file mode 100644 index d4ad0662..00000000 --- a/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-gateway.conf +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# Distro configuration for the gateway blueprint - -require conf/distro/oniro-zephyr.conf - -DISTRO = "oniro-zephyr-blueprint-gateway" -DISTRO_NAME = "Oniro Project Gateway Blueprint Zephyr Distro" - -# With our layer setup we would add any bbappend found from our -# layers.conf. This means blueprint-specific appends would leak -# into the package in our main distribution. To avoid this we -# mask out the blueprint layers in the main distro and unmask -# them only the blueprint distributions. -BBMASK = "" diff --git a/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-keypad.conf b/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-keypad.conf deleted file mode 100644 index a5e8bbf1..00000000 --- a/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-keypad.conf +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# Distro configuration for the keypad blueprint - -require conf/distro/oniro-zephyr.conf - -DISTRO = "oniro-zephyr-blueprint-keypad" -DISTRO_NAME = "Oniro Project Keypad Blueprint Zephyr Distro" -BBMASK = "" diff --git a/meta-oniro-blueprints/conf/layer.conf b/meta-oniro-blueprints/conf/layer.conf deleted file mode 100644 index 9e733117..00000000 --- a/meta-oniro-blueprints/conf/layer.conf +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "oniro-blueprints" -BBFILE_PATTERN_oniro-blueprints = "^${LAYERDIR}/" -BBFILE_PRIORITY_oniro-blueprints = "6" - -LAYERDEPENDS_oniro-blueprints = " \ - core \ - homeassistant \ - openembedded-layer \ - oniro-core \ - oniro-staging \ - raspberrypi" -LAYERSERIES_COMPAT_oniro-blueprints = "dunfell" diff --git a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application/vending-machine-control-application.service b/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application/vending-machine-control-application.service deleted file mode 100644 index c3ac416a..00000000 --- a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application/vending-machine-control-application.service +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -[Unit] -Description=Vending Machine Control Application - -[Service] -Type=notify -EnvironmentFile=-/etc/vending-machine.env -ExecStart=/usr/bin/vending-machine-control-application -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application_git.bb b/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application_git.bb deleted file mode 100644 index 982f25f5..00000000 --- a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-control-application_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -HOMEPAGE = "https://booting.oniroproject.org/distro/components/vending-machine-control-application" -SUMMARY = "Vending Machine control Application" -DESCRIPTION = "Vending machine server for UI app to control IO" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ba963850f6731c74878fe839d227e675" - -SRC_URI = "git://booting.oniroproject.org/distro/components/${BPN};protocol=https;branch=main" -SRCREV = "e755ddda4fdd51a90e0448477183fb0bdede62fd" -SRC_URI += "file://${BPN}.service" -S = "${WORKDIR}/git" - -DEPENDS="systemd pim435 i2c-tools json-c libwebsockets" - -inherit pkgconfig features_check systemd - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -REQUIRED_DISTRO_FEATURES = "systemd" - -EXTRA_OEMAKE += "DESTDIR=${D}" -EXTRA_OEMAKE += "sysroot=${RECIPE_SYSROOT}" - -VENDING_MACHINE_CONTROL_I2C_BUS ??= "0" -VENDING_MACHINE_CONTROL_I2C_BUS_rpi ?= "1" -VENDING_MACHINE_CONTROL_I2C_BUS_seco-intel-b68 ?= "2" - -do_install() { - oe_runmake install - install -d "${D}${systemd_system_unitdir}/" - install -m 0644 "${WORKDIR}/${BPN}.service" "${D}${systemd_system_unitdir}/" - install -d "${D}${sysconfdir}" - echo "VENDING_MACHINE_CONTROL_I2C_BUS=${VENDING_MACHINE_CONTROL_I2C_BUS}" > \ - "${D}${sysconfdir}/vending-machine.env" -} diff --git a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-ui-application/vending-machine-ui-application.service b/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-ui-application/vending-machine-ui-application.service deleted file mode 100644 index 2f18a95c..00000000 --- a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-ui-application/vending-machine-ui-application.service +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -[Unit] -Description=Vending Machine UI Application -Requires=weston@root.service -After=weston@root.service -After=vending-machine-control-application.service - -[Service] -Environment="WAYLAND_DISPLAY=wayland-0" -Environment="XDG_RUNTIME_DIR=/run/user/0" -ExecStart=/usr/bin/vending-machine-ui-application -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-ui-application_git.bb b/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-ui-application_git.bb deleted file mode 100644 index 5adb97e0..00000000 --- a/meta-oniro-blueprints/recipes-apps/vending-machine/vending-machine-ui-application_git.bb +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -HOMEPAGE = "https://booting.oniroproject.org/distro/components/vending-machine-ui-application" -SUMMARY = "Vending Machine UI Application" -DESCRIPTION = "Vending machine front end client, it's a native GUI made with LVGL" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ba963850f6731c74878fe839d227e675" - -SRC_URI = "git://booting.oniroproject.org/distro/components/${BPN};protocol=https;branch=main" -SRCREV = "3c87c70f679686d69dc5d08ec842daa61ba1f6a7" -SRC_URI += "file://${BPN}.service" -S = "${WORKDIR}/git" - -DEPENDS= "json-c libwebsockets lv-drivers lv-lib-png lvgl" - -inherit pkgconfig features_check systemd - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -REQUIRED_DISTRO_FEATURES = "systemd wayland" - -EXTRA_OEMAKE += "DESTDIR=${D}" -EXTRA_OEMAKE += "sysroot=${RECIPE_SYSROOT}" - -do_install() { - oe_runmake install - install -d "${D}${systemd_system_unitdir}/" - install -m 0644 "${WORKDIR}/${BPN}.service" "${D}${systemd_system_unitdir}/" -} diff --git a/meta-oniro-blueprints/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-oniro-blueprints/recipes-connectivity/bluez5/bluez5_%.bbappend deleted file mode 100644 index 06e917c2..00000000 --- a/meta-oniro-blueprints/recipes-connectivity/bluez5/bluez5_%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -do_install_append() { - # Install main.conf file and turn on AutoEnable flag - # to bring up BLE controller on boot. - if [ -f ${S}/src/main.conf ]; then - install -m 0644 ${S}/src/main.conf ${D}/${sysconfdir}/bluetooth/ - sed -i 's/#AutoEnable=false/AutoEnable=true/g' \ - ${D}/${sysconfdir}/bluetooth/main.conf - fi -} diff --git a/meta-oniro-blueprints/recipes-connectivity/networkmanager/networkmanager-softap-config/SoftAP.nmconnection b/meta-oniro-blueprints/recipes-connectivity/networkmanager/networkmanager-softap-config/SoftAP.nmconnection deleted file mode 100644 index 62a6a35e..00000000 --- a/meta-oniro-blueprints/recipes-connectivity/networkmanager/networkmanager-softap-config/SoftAP.nmconnection +++ /dev/null @@ -1,33 +0,0 @@ -[connection] -id=SoftAP -uuid=3b73c72c-be72-4458-9fd7-e8b1d6ee4e8d -type=wifi -autoconnect=true -interface-name=wlan0 -permissions= - -[wifi] -band=bg -channel=6 -mac-address-blacklist= -mode=ap -ssid=Oniro Project WiFi - -[wifi-security] -group=ccmp; -key-mgmt=wpa-psk -pairwise=ccmp; -proto=rsn; -psk=12345678 - -[ipv4] -address1=172.16.47.1/24,172.16.47.1 -dns-search= -method=shared - -[ipv6] -addr-gen-mode=stable-privacy -dns-search= -method=auto - -[proxy] diff --git a/meta-oniro-blueprints/recipes-connectivity/networkmanager/networkmanager-softap-config_git.bb b/meta-oniro-blueprints/recipes-connectivity/networkmanager/networkmanager-softap-config_git.bb deleted file mode 100644 index 4b804aea..00000000 --- a/meta-oniro-blueprints/recipes-connectivity/networkmanager/networkmanager-softap-config_git.bb +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${ONIRO_COREBASE}/LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755" - -SRC_URI = "file://SoftAP.nmconnection" - -do_install_append() { - install -D -m0600 ${WORKDIR}/SoftAP.nmconnection ${D}${libdir}/NetworkManager/system-connections/SoftAP.nmconnection -} - -FILES_${PN} += "${libdir}/NetworkManager/system-connections/" diff --git a/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/60-otbr-ip-forward.conf b/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/60-otbr-ip-forward.conf deleted file mode 100644 index d6cc8871..00000000 --- a/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/60-otbr-ip-forward.conf +++ /dev/null @@ -1,2 +0,0 @@ -net.ipv6.conf.all.forwarding = 1 -net.ipv4.ip_forward = 1 diff --git a/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration b/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration deleted file mode 100755 index c676acd7..00000000 --- a/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -set -e - -# Bring up a OpenThread border router for the given configuration -ot-ctl thread stop -ot-ctl ifconfig down -ot-ctl dataset clear -ot-ctl dataset init new -ot-ctl dataset panid 0x1357 -ot-ctl dataset extpanid 11112222deadbeef -ot-ctl dataset networkname OniroThread -ot-ctl dataset channel 26 -#ot-ctl dataset masterkey 00112233445566778899aabbccddeeff -#ot-ctl dataset networkkey 00112233445566778899aabbccddeeff -# J01NME is the Commissioner Credential to be used in the Android app -# J01NU5 is the Joiner Credential, set in the node and QR code -ot-ctl dataset pskc $(pskc J01NME 11112222deadbeef OniroThread) -ot-ctl dataset commit active -#ot-ctl prefix add fd11:22::/64 pasor -ot-ctl ifconfig up -ot-ctl thread start -ot-ctl netdata register -#ot-ctl prefix add 2001::/64 paros -#ot-ctl dataset meshlocalprefix fdde:00be:ef00:aaaa:: diff --git a/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration.service b/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration.service deleted file mode 100644 index 453f03a7..00000000 --- a/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration.service +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -[Unit] -Description=OpenThread Border Router Configuration -ConditionPathExists=/usr/sbin/otbr-configuration -After=sys-subsystem-net-devices-wpan0.device -BindsTo=sys-subsystem-net-devices-wpan0.device - -[Service] -Type=oneshot -ExecStart=/usr/sbin/otbr-configuration diff --git a/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix_%.bbappend b/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix_%.bbappend deleted file mode 100644 index 61ecc25c..00000000 --- a/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix_%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/ot-br-posix:" - -SRC_URI_append = " \ - file://60-otbr-ip-forward.conf \ - file://otbr-configuration \ - file://otbr-configuration.service \ - " - -do_install_append() { - install -d ${D}${sysconfdir}/sysctl.d/ - install -m 0644 ${WORKDIR}/60-otbr-ip-forward.conf ${D}${sysconfdir}/sysctl.d/ - install -D ${WORKDIR}/otbr-configuration ${D}${sbindir}/ - install -D -m 0644 ${WORKDIR}/otbr-configuration.service ${D}${systemd_unitdir}/system/ - install -m 0755 ${WORKDIR}/build/tools/pskc ${D}${sbindir}/ -} - -SYSTEMD_SERVICE_${PN} += " otbr-configuration.service" diff --git a/meta-oniro-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb b/meta-oniro-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb deleted file mode 100644 index 2ed67615..00000000 --- a/meta-oniro-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require recipes-core/images/oniro-image-base.bb - -SUMMARY = "Dashboard blueprint image: gateway" -DESCRIPTION = "Home Assistant based image targeting a gateway device" -LICENSE = "Apache-2.0" - -IMAGE_INSTALL_append = "\ - epiphany-app \ - homeassistant-config-blueprint-dashboard \ - python3-appdaemon \ - python3-homeassistant \ - weston \ - weston-examples \ - weston-init \ - " - -# 500 MiB of additional storage for config and runtime data. -# We need a bit more because Google Safe Browsing database case easily go to -# around 200MiB. -# https://gitlab.gnome.org/GNOME/epiphany/-/issues/477 -IMAGE_ROOTFS_EXTRA_SPACE = "524288" - -# This is a workaround in case the build runs on ZFS with compression on. -# It also gives us extra runtime space. -IMAGE_OVERHEAD_FACTOR = "2" diff --git a/meta-oniro-blueprints/recipes-core/images/blueprint-gateway-image.bb b/meta-oniro-blueprints/recipes-core/images/blueprint-gateway-image.bb deleted file mode 100644 index d93a1af5..00000000 --- a/meta-oniro-blueprints/recipes-core/images/blueprint-gateway-image.bb +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require recipes-core/images/oniro-image-base.bb - -SUMMARY = "Gateway blueprint image" -DESCRIPTION = "Smart home gateway device" -LICENSE = "Apache-2.0" diff --git a/meta-oniro-blueprints/recipes-core/images/blueprint-vending-machine-image.bb b/meta-oniro-blueprints/recipes-core/images/blueprint-vending-machine-image.bb deleted file mode 100644 index 53438667..00000000 --- a/meta-oniro-blueprints/recipes-core/images/blueprint-vending-machine-image.bb +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -HOMEPAGE = "https://docs.oniroproject.org/" -SUMMARY = "Vending machine blueprint image" -DESCRIPTION = "The Vending Machine image is composed of a couple of applications" -LICENSE = "Apache-2.0" - -require recipes-core/images/oniro-image-base.bb - -REQUIRED_DISTRO_FEATURES = "wayland" - -IMAGE_INSTALL_append = "\ - vending-machine-control-application \ - vending-machine-ui-application \ - weston \ - weston-init \ - " diff --git a/meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend b/meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend deleted file mode 100644 index e4e1fcca..00000000 --- a/meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -PACKAGES_append = "\ - packagegroup-thread-br \ - packagegroup-thread-client \ - " - -RDEPENDS_packagegroup-thread-br = "\ - ${@bb.utils.contains("DISTRO_FEATURES", "thread-border-router", "ot-br-posix", "", d)} \ - iptables \ - tayga \ - " - -RDEPENDS_packagegroup-thread-client = "\ - ${@bb.utils.contains("DISTRO_FEATURES", "thread-client", "ot-daemon", "", d)} \ - " diff --git a/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app.bb b/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app.bb deleted file mode 100644 index 2948215c..00000000 --- a/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app.bb +++ /dev/null @@ -1,62 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -SUMMARY = "Epiphany app mode support files" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${ONIRO_COREBASE}/LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755" - -inherit allarch features_check - -EPIPHANY_APP ?= "HomeAssistant" -EPIPHANY_URL ?= "http://localhost:8123" -EPIPHANY_RDEPENDS ?= "python3-homeassistant" -EPIPHANY_SERVICE_ENABLED ?= "0" - -# The services depend on weston -REQUIRED_DISTRO_FEATURES = "wayland" - -SRC_URI = "\ - file://epiphany-app@.service \ - file://${EPIPHANY_APP}/* \ - " - -do_install() { - # Setup the system service - install -d "${D}${systemd_unitdir}/system/multi-user.target.wants" - install -m 0644 "${WORKDIR}/epiphany-app@.service" "${D}${systemd_unitdir}/system" - sed -i -e 's,@EPIPHANY_APP@,${EPIPHANY_APP},g' \ - -e 's,@EPIPHANY_URL@,${EPIPHANY_URL},g' "${D}${systemd_unitdir}/system/epiphany-app@.service" - if [ "${EPIPHANY_SERVICE_ENABLED}" = "1" ]; then - install -d "${D}${sysconfdir}/systemd/system/multi-user.target.wants" - ln -s "${systemd_unitdir}/system/epiphany-app@.service" \ - "${D}${sysconfdir}/systemd/system/multi-user.target.wants/epiphany-app@${EPIPHANY_APP}.service" - fi - - # The systemd service override is optional and app specific (for example it - # can add dependencies for a local HTTP service). - if [ -f "${WORKDIR}/${EPIPHANY_APP}/service-override.conf" ]; then - mkdir -p "${D}${sysconfdir}/systemd/system/epiphany-app@${EPIPHANY_APP}.service.d" - cp "${WORKDIR}/${EPIPHANY_APP}/service-override.conf" \ - "${D}${sysconfdir}/systemd/system/epiphany-app@${EPIPHANY_APP}.service.d" - fi - - # Setup the app - WD_APPDIR="${WORKDIR}/${EPIPHANY_APP}" - D_APPDIR="${D}/home/root/.local/share/epiphany-${EPIPHANY_APP}" - mkdir -p "$D_APPDIR" - cp "$WD_APPDIR/epiphany-${EPIPHANY_APP}.desktop" "$D_APPDIR" - touch "$D_APPDIR/.app" -} - -FILES_${PN} += " \ - /home/root \ - ${systemd_unitdir} \ - " - -RDEPENDS_${PN} = "\ - ${EPIPHANY_RDEPENDS} \ - epiphany \ - weston-init \ - " diff --git a/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/epiphany-HomeAssistant.desktop b/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/epiphany-HomeAssistant.desktop deleted file mode 100644 index bb650a60..00000000 --- a/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/epiphany-HomeAssistant.desktop +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -[Desktop Entry] -Name=HomeAssistant -Exec=epiphany --application-mode --profile="/home/root/.local/share/epiphany-HomeAssistant" http://localhost:8123 -StartupNotify=true -Terminal=false -Type=Application diff --git a/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/service-override.conf b/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/service-override.conf deleted file mode 100644 index 9c473e1f..00000000 --- a/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/service-override.conf +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -[Unit] -Requires=weston@root.service homeassistant.service -After=weston@root.service homeassistant.service diff --git a/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/epiphany-app@.service b/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/epiphany-app@.service deleted file mode 100644 index 9f165383..00000000 --- a/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/epiphany-app@.service +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -[Unit] -Description=Epiphany browser started for %i application -Requires=weston@root.service -After=weston@root.service - -[Service] -Environment="WAYLAND_DISPLAY=wayland-0" -Environment="XDG_RUNTIME_DIR=/run/user/0" -ExecStart=/usr/bin/epiphany -a --profile /home/root/.local/share/epiphany-@EPIPHANY_APP@ @EPIPHANY_URL@ -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb deleted file mode 100644 index 68f05234..00000000 --- a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb +++ /dev/null @@ -1,87 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -SUMMARY = "Home Assistant configuration for Oniro Project Smart Panel \ -blueprint" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${ONIRO_COREBASE}/LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755" -INHIBIT_DEFAULT_DEPS = "1" - -inherit allarch - -HOMEASSISTANT_TRUSTED_NETWORK ?= "192.168.0.0/24" - -do_fetch[noexec] = "1" -do_unpack[noexec] = "1" -do_patch[noexec] = "1" -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -require recipes-homeassistant/homeassistant/homeassistant-config.inc -require recipes-homeassistant/homeassistant/homeassistant-useradd.inc - -do_install() { - install -d "${D}${HOMEASSISTANT_CONFIG_DIR}" - - # MAC addresses can be adjusted in your local.conf. - cat >> "${D}${HOMEASSISTANT_CONFIG_DIR}/configuration.yaml" << EOF -default_config: - -sensor: - - platform: oniroproject_sensors - mac: "${SMART_HOME_SENSORS_MAC}" - -switch: - - platform: oniroproject_switch - mac: "${SMART_HOME_SWITCH_MAC}" - -homeassistant: - auth_providers: - - type: trusted_networks - trusted_networks: - - "${HOMEASSISTANT_TRUSTED_NETWORK}" - - 127.0.0.1 - - ::1 - allow_bypass_login: true - - type: homeassistant - -automation: !include automations.yaml -EOF - - # Preload automation configuration for the loader - # Trigger on/off LED based on the human presence sensor input. - cat >> "${D}${HOMEASSISTANT_CONFIG_DIR}/automations.yaml" << EOF -- id: '1621503053201' - alias: Light on - description: '' - trigger: - - entity_id: sensor.oniroproject_smarthome_device_presence - from: 'False' - platform: state - to: 'True' - condition: [] - action: - - data: {} - entity_id: switch.oniroproject_smarthome_device_light - service: switch.turn_on -- id: '1621503121253' - alias: Light off - description: '' - trigger: - - entity_id: sensor.oniroproject_smarthome_device_presence - from: 'True' - platform: state - to: 'False' - condition: [] - action: - - data: {} - entity_id: switch.oniroproject_smarthome_device_light - service: switch.turn_off -EOF - - chown -R "${HOMEASSISTANT_USER}":homeassistant "${D}${HOMEASSISTANT_CONFIG_DIR}" -} - -RDEPENDS_${PN} = "smart-home-homeassistant-plugin" -FILES_${PN} += "${HOMEASSISTANT_CONFIG_DIR}" diff --git a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config.inc b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config.inc deleted file mode 100644 index 6018b996..00000000 --- a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config.inc +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -HOMEASSISTANT_CONFIG_DIR ?= "${localstatedir}/lib/homeassistant" -HOMEASSISTANT_CONFIG_DIR[doc] = "Configuration directory used by home-assistant." diff --git a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-useradd.inc b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-useradd.inc deleted file mode 100644 index 1c9dc948..00000000 --- a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-useradd.inc +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -inherit useradd - -HOMEASSISTANT_USER ?= "homeassistant" -HOMEASSISTANT_USER[doc] = "User the home-assistent service runs as." - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system homeassistant" -USERADD_PARAM_${PN} = "\ - --system --no-create-home --shell /bin/false \ - --home ${HOMEASSISTANT_CONFIG_DIR} \ - --groups homeassistant,dialout --gid homeassistant \ - ${HOMEASSISTANT_USER}" diff --git a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant/0001-components-met-Use-API-v2.patch b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant/0001-components-met-Use-API-v2.patch deleted file mode 100644 index 60d919f9..00000000 --- a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant/0001-components-met-Use-API-v2.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 115abd1bc0d801528f2d4ef270962a171aed1b22 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei@gherzan.com> -Date: Thu, 20 May 2021 11:38:43 +0100 -Subject: [PATCH] components/met: Use API v2 - -Signed-off-by: Andrei Gherzan <andrei@gherzan.com> -Upstream-status: Pending ---- - homeassistant/components/met/manifest.json | 2 +- - homeassistant/components/met/weather.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/homeassistant/components/met/manifest.json b/homeassistant/components/met/manifest.json -index 62aeaf2..4e908e3 100644 ---- a/homeassistant/components/met/manifest.json -+++ b/homeassistant/components/met/manifest.json -@@ -3,7 +3,7 @@ - "name": "Meteorologisk institutt (Met.no)", - "config_flow": true, - "documentation": "https://www.home-assistant.io/integrations/met", -- "requirements": ["pyMetno==0.4.6"], -+ "requirements": ["pyMetno==0.7.0"], - "dependencies": [], - "codeowners": ["@danielhiversen"] - } -diff --git a/homeassistant/components/met/weather.py b/homeassistant/components/met/weather.py -index 1315009..048a0aa 100644 ---- a/homeassistant/components/met/weather.py -+++ b/homeassistant/components/met/weather.py -@@ -30,7 +30,7 @@ ATTRIBUTION = ( - ) - DEFAULT_NAME = "Met.no" - --URL = "https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/1.9/" -+URL = "https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/2.0/classic" - - PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( - { --- -2.31.1 - diff --git a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant_%.bbappend b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant_%.bbappend deleted file mode 100644 index bef7d4e2..00000000 --- a/meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-components-met-Use-API-v2.patch" - -RRECOMMENDS_${PN} += "smart-home-homeassistant-plugin" diff --git a/meta-oniro-blueprints/recipes-homeassistant/ohsmarthome-py/ohsmarthome-py_git.bb b/meta-oniro-blueprints/recipes-homeassistant/ohsmarthome-py/ohsmarthome-py_git.bb deleted file mode 100644 index 6e6b7dae..00000000 --- a/meta-oniro-blueprints/recipes-homeassistant/ohsmarthome-py/ohsmarthome-py_git.bb +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -SUMMARY = "Oniro Project SmartHome device interface library" -HOMEPAGE = "https://booting.oniroproject.org/distro/components/ohsmarthome-py" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc" - -SRC_OPT_CLONE_DIR = "git/components/ohsmarthome-py" -SRC_OPT_PROTO = "protocol=https" -SRC_OPT_DEST = "destsuffix=${SRC_OPT_CLONE_DIR}" -SRC_OPT_NAME = "name=ohsmarthome-py" -SRC_OPT_BRANCH = "branch=master" - -SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}" -SRC_URI = "git://booting.oniroproject.org/distro/components/ohsmarthome-py.git;${SRC_OPTIONS}" -SRCREV_ohsmarthome-py = "3ea56efa56937939565c127810de55a05c9e4703" - -S = "${WORKDIR}/${SRC_OPT_CLONE_DIR}" - -inherit setuptools3 - -RDEPENDS_${PN} += "\ - python3-bluepy \ - " diff --git a/meta-oniro-blueprints/recipes-homeassistant/smart-home-homeassistant-plugin/smart-home-homeassistant-plugin_git.bb b/meta-oniro-blueprints/recipes-homeassistant/smart-home-homeassistant-plugin/smart-home-homeassistant-plugin_git.bb deleted file mode 100644 index d9c1f4ae..00000000 --- a/meta-oniro-blueprints/recipes-homeassistant/smart-home-homeassistant-plugin/smart-home-homeassistant-plugin_git.bb +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -SUMMARY = "Home Assistant custom component for Oniro Project SmartHome device" -HOMEPAGE = "https://booting.oniroproject.org/distro/components/smart_home_homeassistant_plugin/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc" - -SRC_OPT_CLONE_DIR = "git/components/smart_home_homeassistant_plugin" -SRC_OPT_PROTO = "protocol=https" -SRC_OPT_DEST = "destsuffix=${SRC_OPT_CLONE_DIR}" -SRC_OPT_NAME = "name=smart_home_homeassistant_plugin" -SRC_OPT_BRANCH = "branch=master" - -SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}" -SRC_URI = "git://booting.oniroproject.org/distro/components/smart_home_homeassistant_plugin.git;${SRC_OPTIONS}" -SRCREV_smart_home_homeassistant_plugin = "63c39b0eebab086ba793be8e7963c2d3c69cbedc" - -S = "${WORKDIR}/${SRC_OPT_CLONE_DIR}" - -require recipes-homeassistant/homeassistant/homeassistant-config.inc -require recipes-homeassistant/homeassistant/homeassistant-useradd.inc - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -d ${D}${HOMEASSISTANT_CONFIG_DIR}/custom_components/oniroproject_sensors/ - install ${S}/custom_components/oniroproject_sensors/*.py \ - ${D}${HOMEASSISTANT_CONFIG_DIR}/custom_components/oniroproject_sensors/ - - install -d ${D}${HOMEASSISTANT_CONFIG_DIR}/custom_components/oniroproject_switch/ - install ${S}/custom_components/oniroproject_switch/*.py \ - ${D}${HOMEASSISTANT_CONFIG_DIR}/custom_components/oniroproject_switch/ - - chown -R "${HOMEASSISTANT_USER}":homeassistant "${D}${HOMEASSISTANT_CONFIG_DIR}" -} - -RDEPENDS_${PN} += " \ - python3-homeassistant \ - ohsmarthome-py \ - " diff --git a/meta-oniro-blueprints/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-oniro-blueprints/recipes-kernel/linux/linux-raspberrypi_%.bbappend deleted file mode 100644 index 30424b0c..00000000 --- a/meta-oniro-blueprints/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -FILESEXTRAPATHS_prepend := "${THISDIR}/linux:" - -SRC_URI += "file://blueprints-misc.cfg" - -# Silence the console cursor -CMDLINE_append = " vt.global_cursor_default=0" diff --git a/meta-oniro-blueprints/recipes-kernel/linux/linux/blueprints-misc.cfg b/meta-oniro-blueprints/recipes-kernel/linux/linux/blueprints-misc.cfg deleted file mode 100644 index 0d11e49b..00000000 --- a/meta-oniro-blueprints/recipes-kernel/linux/linux/blueprints-misc.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_LOGO=n diff --git a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-doorlock-factoryreset.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-doorlock-factoryreset.bb deleted file mode 100644 index c5c1babe..00000000 --- a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-doorlock-factoryreset.bb +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require recipes-kernel/zephyr-kernel/zephyr-sample.inc - -SUMMARY = "Doorlock factory reset image" -DESCRIPTION = "Zephyr based image for doing a factory reset on the doorlock blueprint" -LICENSE = "Apache-2.0" - -SRC_OPT_PROTO = "protocol=https" -SRC_OPT_DEST = "destsuffix=git/apps/doorlock-factoryreset" -SRC_OPT_NAME = "name=doorlock-factoryreset" -SRC_OPT_BRANCH = "branch=main" - -SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}" -SRC_URI += "git://booting.oniroproject.org/distro/blueprints/doorlock/doorlock-factoryreset.git;${SRC_OPTIONS}" - -SRCREV_doorlock-factoryreset = "375df8948aff9aca79c6e766f070b82e6ca087f7" - -ZEPHYR_SRC_DIR = "${S}/apps/doorlock-factoryreset" - -# For the moment, other boards don't have the devicetree -# overlays describing how the locks, keypad etc. are -# supposed to be connected. -COMPATIBLE_MACHINE = "(arduino-nano-33-ble)" diff --git a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-doorlock.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-doorlock.bb deleted file mode 100644 index a14c4a80..00000000 --- a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-doorlock.bb +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require recipes-kernel/zephyr-kernel/zephyr-sample.inc - -SUMMARY = "Doorlock blueprint image" -DESCRIPTION = "Zephyr based image for handling door locks" -LICENSE = "Apache-2.0" - -SRC_OPT_PROTO = "protocol=https" -SRC_OPT_DEST = "destsuffix=git/apps/doorlock" -SRC_OPT_NAME = "name=doorlock" -SRC_OPT_BRANCH = "branch=main" - -SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}" -SRC_URI += "git://booting.oniroproject.org/distro/blueprints/doorlock/doorlock-zephyr.git;${SRC_OPTIONS}" - -SRCREV_doorlock = "7d7f093c5a1285027bea3d070760b48e25ba8ced" - -ZEPHYR_SRC_DIR = "${S}/apps/doorlock" - -# For the moment, other boards don't have the devicetree -# overlays describing how the locks, keypad etc. are -# supposed to be connected. -COMPATIBLE_MACHINE = "(arduino-nano-33-ble)" diff --git a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-gateway-node_git.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-gateway-node_git.bb deleted file mode 100644 index cbf2c685..00000000 --- a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-gateway-node_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require recipes-kernel/zephyr-kernel/zephyr-sample.inc - -SUMMARY = "Gateway blueprint: OpenThread node" -DESCRIPTION = "Zephyr based OpenThread node image" -LICENSE = "Apache-2.0" - -SRC_OPT_PROTO = "protocol=https" -SRC_OPT_DEST = "destsuffix=git/apps/openthread-node" -SRC_OPT_NAME = "name=otnode" -SRC_OPT_BRANCH = "branch=main" - -SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}" -SRC_URI += "git://booting.oniroproject.org/distro/blueprints/gateway/openthread-node-zephyr.git;${SRC_OPTIONS}" - -SRCREV_otnode = "a688fa8b08d56d0619f122a4eb426ddd9bc343a0" - -ZEPHYR_SRC_DIR = "${S}/apps/openthread-node" - -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/openthread" - -# The overlay config and OpenThread itself imposes some specific requirements -# towards the boards (e.g. flash layout and ieee802154 radio) so we need to -# limit to known working machines here. -COMPATIBLE_MACHINE = "(arduino-nano-33-ble)" diff --git a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-keypad.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-keypad.bb deleted file mode 100644 index 06e49e81..00000000 --- a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-keypad.bb +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require recipes-kernel/zephyr-kernel/zephyr-sample.inc - -SUMMARY = "Keypad blueprint image" -DESCRIPTION = "Zephyr based image for the touchscreen-based keypad" -LICENSE = "Apache-2.0" - -SRC_OPT_PROTO = "protocol=https" -SRC_OPT_DEST = "destsuffix=git/apps/keypad" -SRC_OPT_NAME = "name=keypad" -SRC_OPT_BRANCH = "branch=master" - -SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}" -SRC_URI += "git://booting.oniroproject.org/distro/blueprints/keypad/zephyr-keypad.git;${SRC_OPTIONS}" - -SRCREV_keypad = "b102af9f385993279e25e5c7cf335edfd08ef7d9" - -ZEPHYR_SRC_DIR = "${S}/apps/keypad" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/gui/lvgl" - -# We will support the Arduino Nano 33 BLE too in the future. For now we only -# support the display on the Nordic reference devkit. -COMPATIBLE_MACHINE = "(nrf52840dk-nrf52840)" - -# TODO Once we add more compatible machines, this should depend on the -# MACHINE value. -EXTRA_OECMAKE_append = " -DSHIELD=adafruit_2_8_tft_touch_v2" diff --git a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb deleted file mode 100644 index ca1fbae2..00000000 --- a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require recipes-kernel/zephyr-kernel/zephyr-sample.inc - -SUMMARY = "SmartHome blueprint image: IOT endpoint" -DESCRIPTION = "Zephyr based image targeting IOT endpoints" -LICENSE = "Apache-2.0" - -SRC_OPT_PROTO = "protocol=https" -SRC_OPT_DEST = "destsuffix=git/apps/smarthome" -SRC_OPT_NAME = "name=smarthome" -SRC_OPT_BRANCH = "branch=develop" - -SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}" -SRC_URI += "git://booting.oniroproject.org/distro/components/smart_home_blueprint_zephyr.git;${SRC_OPTIONS}" - -SRCREV_smarthome = "c4a2dc87b1d03be701f9b4d5d35597df6a6ce389" - -ZEPHYR_SRC_DIR = "${S}/apps/smarthome" - -ZEPHYR_MODULES_append = "\;${S}/modules/crypto/tinycrypt" - -do_configure_append() { - if [ ! -z "${MAC}" ]; then - sed -i "s/\(SMART_HOME_BT_MAC_ADDRESS\).*/\1 \"${MAC}\"/" ${ZEPHYR_SRC_DIR}/src/config.h - fi -} diff --git a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb deleted file mode 100644 index 6cc6c0c3..00000000 --- a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require zephyr-blueprint-smarthome-base.bb - -SUMMARY = "SmartHome blueprint image: sensors" -DESCRIPTION = "Zephyr based image targeting sensors board" -LICENSE = "Apache-2.0" - -MAC = "${SMART_HOME_SENSORS_MAC}" - -# Comment out features not used by this image -do_configure_append() { - sed -i '/^CONFIG_GROVE_LED_CTRL/ s/./#&/' ${ZEPHYR_SRC_DIR}/prj.conf -} diff --git a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-switch.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-switch.bb deleted file mode 100644 index 8db86c35..00000000 --- a/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-switch.bb +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -require zephyr-blueprint-smarthome-base.bb - -SUMMARY = "SmartHome blueprint image: smart LED switch" -DESCRIPTION = "Zephyr based image targeting smart LED switch board" -LICENSE = "Apache-2.0" - -MAC = "${SMART_HOME_SWITCH_MAC}" - -# Comment out features not used by this image -do_configure_append() { - sed -i '/^CONFIG_I2C/ s/./#&/' ${ZEPHYR_SRC_DIR}/prj.conf - sed -i '/^CONFIG_DISPLAY/ s/./#&/' ${ZEPHYR_SRC_DIR}/prj.conf - sed -i '/^CONFIG_GROVE_LCD_RGB/ s/./#&/' ${ZEPHYR_SRC_DIR}/prj.conf - sed -i '/^CONFIG_SENSOR/ s/./#&/' ${ZEPHYR_SRC_DIR}/prj.conf - sed -i '/^CONFIG_DHT/ s/./#&/' ${ZEPHYR_SRC_DIR}/prj.conf - sed -i '/^CONFIG_GROVE_HPS/ s/./#&/' ${ZEPHYR_SRC_DIR}/prj.conf -} -- GitLab