diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2021-11-03 15:18:49 +0100 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2021-11-03 22:43:56 +0100 |
commit | 1b72a0f90fa7d1b45eb1017629cc83dcd8971c48 (patch) | |
tree | decc406f376b968d90fade3c321777e068a8c00e /recipes-config/cluster-demo-network-config | |
parent | 94a051785cdb588bc3a475a5490f1f286176d646 (diff) |
Prepare master for new framework integration
During the last workshop the transition to the new framework was presented.
This change essentially deprecates the SMACK-based application framework.
To prepare the integration of it, we remove the deprecated components:
- recipes-apis : all agl-service-*
- recipes-demos: all demo apps but homescreen
- non-essential configurations
Todo:
We need to bring-back the html5 image in a follow-up w/o ties into the old framework.
v2: kept WAM + Chromium recipes for reference
v3: rebased
Bug-AGL: SPEC-4121
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I58075f5f1e477106a1aad3d2171a0904bf0cb16e
Diffstat (limited to 'recipes-config/cluster-demo-network-config')
3 files changed, 0 insertions, 62 deletions
diff --git a/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb b/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb deleted file mode 100644 index 8d737282d..000000000 --- a/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Setting files for cluster network for the AGL Demonstrator" -DESCRIPTION = "Setting files for cluster network for the AGL Demonstrator" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit systemd allarch - -SRC_URI = "file://cluster-demo-network-conf@.service \ - file://cluster-demo-network-conf.sh \ -" - -# Network device for dedicated connection to cluster -AGL_CLUSTER_NET_DEVICE ?= "eth1" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - # Install helper script - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/cluster-demo-network-conf.sh ${D}${sbindir}/ - - # Install service unit - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/cluster-demo-network-conf@.service ${D}${systemd_system_unitdir}/ - - # Add symlink to network.target.wants - install -d ${D}${sysconfdir}/systemd/system/network.target.wants - ln -s ${systemd_system_unitdir}/cluster-demo-network-conf@.service \ - ${D}${sysconfdir}/systemd/system/network.target.wants/cluster-demo-network-conf@${AGL_CLUSTER_NET_DEVICE}.service -} - -FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.sh b/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.sh deleted file mode 100644 index 3f538175f..000000000 --- a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -CONNMAN_CONF=/etc/connman/main.conf -CLUSTER_ADDRESS=192.168.20.93 - -if [ -z "$1" ]; then - echo "Usage: $0 <network device>" - exit 1 -fi - -# Need to blacklist given device with connman if it isn't already, -# otherwise connman will over-ride address configuration. -if ! grep '^NetworkInterfaceBlacklist=' ${CONNMAN_CONF} | grep -q $1; then - sed -i "s/^\(NetworkInterfaceBlacklist=.*\)/\1,$1/" ${CONNMAN_CONF} -fi - -/sbin/ifconfig $1 ${CLUSTER_ADDRESS} diff --git a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf@.service b/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf@.service deleted file mode 100644 index 5fc29b7a0..000000000 --- a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Configure dedicated link for cluster demo network -After=sys-subsystem-net-devices-%i.device -Requires=sys-subsystem-net-devices-%i.device -Before=network.target - -[Service] -ExecStart=/usr/sbin/cluster-demo-network-conf.sh %i -Type=oneshot - -[Install] -WantedBy=network.target |