From 1b72a0f90fa7d1b45eb1017629cc83dcd8971c48 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Wed, 3 Nov 2021 15:18:49 +0100 Subject: 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 Change-Id: I58075f5f1e477106a1aad3d2171a0904bf0cb16e --- .../agl-service-can-low-level_git.bb | 23 -------------- .../agl-service-can-low-level_git.bbappend | 10 ------ .../can-dev-mapping-helper_1.0.bb | 21 ------------- .../files/can-dev-mapping-helper.conf | 3 -- .../files/can-dev-mapping-helper.service | 6 ---- .../files/can-dev-mapping-helper.sh | 36 ---------------------- .../agl-service-can-low-level/files/run-ptest | 3 -- 7 files changed, 102 deletions(-) delete mode 100644 recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb delete mode 100644 recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend delete mode 100644 recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb delete mode 100644 recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.conf delete mode 100644 recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.service delete mode 100644 recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.sh delete mode 100644 recipes-apis/agl-service-can-low-level/files/run-ptest (limited to 'recipes-apis/agl-service-can-low-level') diff --git a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb b/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb deleted file mode 100644 index 6ac2f4f2..00000000 --- a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Low level CAN service" -DESCRIPTION = "AGL Service application for read and decode CAN messages" -HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/low-level-can-service" -SECTION = "apps" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-can-low-level;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "${AGL_APP_REVISION}" - -PV = "${AGLVERSION}" -S = "${WORKDIR}/git" - -DEPENDS = "libafb-helpers libappcontroller" - -inherit cmake aglwgt pkgconfig ptest - -# For now, just enable J1939 on the qemu platforms where we know the -# linux-yocto kernel is new enough (>= 5.4) and has the support enabled. -AGLWGT_CMAKE_CONFIGURE_ARGS:append:qemuall = " -DWITH_FEATURE_J1939=ON" - -RDEPENDS:${PN} = "virtual/low-can-dev-mapping" diff --git a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend b/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend deleted file mode 100644 index bc2d0d35..00000000 --- a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI:append = " file://can-dev-mapping-helper.conf" - -do_install:append() { - install -D -m 0644 ${WORKDIR}/can-dev-mapping-helper.conf \ - ${D}${sysconfdir}/systemd/system/afm-service-agl-service-can-low-level-.service.d/can-dev-mapping-helper.conf -} - -RDEPENDS:${PN}:append = " can-dev-mapping-helper" diff --git a/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb b/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb deleted file mode 100644 index cc50bfe2..00000000 --- a/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Systemd unit for agl-service-can-low-level CAN device helper" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit systemd allarch - -SRC_URI = "file://can-dev-mapping-helper.service \ - file://can-dev-mapping-helper.sh \ -" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service - install -D -m 0755 ${WORKDIR}/${BPN}.sh ${D}${sbindir}/${BPN}.sh -} - -FILES:${PN} += "${systemd_system_unitdir}" - -RDEPENDS:${PN} += "bash" diff --git a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.conf b/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.conf deleted file mode 100644 index c89cc4d8..00000000 --- a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Wants=can-dev-mapping-helper.service -After=can-dev-mapping-helper.service diff --git a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.service b/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.service deleted file mode 100644 index 0436716c..00000000 --- a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=CAN interface helper - -[Service] -ExecStart=/usr/sbin/can-dev-mapping-helper.sh -Type=oneshot diff --git a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.sh b/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.sh deleted file mode 100644 index c81014f3..00000000 --- a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# -# Script to bring up CAN interfaces configured in /etc/dev-mapping.conf -# as vcan interfaces if no physical interface is present. -# - -vcan_up() { - if [ -n "$1" ]; then - echo "Bringing up $1 as virtual CAN device" - ip link add dev $1 type vcan - ip link set up $1 - fi -} - -if [ ! -f /etc/dev-mapping.conf ]; then - exit 0 -fi - -hs=$(grep ^hs= /etc/dev-mapping.conf |cut -d= -f2 |tr -d '"') -ls=$(grep ^ls= /etc/dev-mapping.conf |cut -d= -f2 |tr -d '"') - -if [ -n "$hs" ]; then - echo "Checking $hs" - if ! ifconfig $hs >/dev/null 2>&1; then - vcan_up $hs - fi -fi -if [ -n "$ls" -a "$ls" != "$hs" ]; then - echo "Checking $ls" - if ! ifconfig $ls >/dev/null 2>&1; then - vcan_up $ls - fi -fi - -exit 0 diff --git a/recipes-apis/agl-service-can-low-level/files/run-ptest b/recipes-apis/agl-service-can-low-level/files/run-ptest deleted file mode 100644 index cc9c4136..00000000 --- a/recipes-apis/agl-service-can-low-level/files/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -afm-test /usr/AGL/apps/testwgt/low-can-service-test.wgt -- cgit 1.2.3-korg