From 69d40194167df655116115f8864251594dbc8744 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Thu, 30 Apr 2020 16:04:22 +0200
Subject: Cleanup post next merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove recipes no longer used by any image.
- als-meter-demo
- controls
- settings-log-utils
- vod-server
- windowmanager (old version)
- web-runtime (replaced with chromium)

Packagegroup updates.

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: I2824a1a645a6f31e2f2ee9023548aefd7710aa07
---
 .../0001-Fix-cross-compilation-with-yocto.patch    | 25 ----------------
 recipes-demo-hmi/vod-server/files/vod-demo.service | 10 -------
 recipes-demo-hmi/vod-server/vod-server_0.1.bb      | 35 ----------------------
 3 files changed, 70 deletions(-)
 delete mode 100644 recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch
 delete mode 100644 recipes-demo-hmi/vod-server/files/vod-demo.service
 delete mode 100644 recipes-demo-hmi/vod-server/vod-server_0.1.bb

(limited to 'recipes-demo-hmi/vod-server')

diff --git a/recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch b/recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch
deleted file mode 100644
index c034d4ee..00000000
--- a/recipes-demo-hmi/vod-server/files/0001-Fix-cross-compilation-with-yocto.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/buildX86/Makefile-Release.mk	2016-12-09 15:48:37.000000000 +0100
-+++ b/buildX86/Makefile-Release.mk	2016-12-09 16:56:35.071740652 +0100
-@@ -11,14 +11,14 @@
- MKDIR=mkdir
- CP=cp
- GREP=grep
--NM=nm
--CCADMIN=CCadmin
--RANLIB=ranlib
--CC=${CROSS_COMPILE}gcc
--CCC=${CROSS_COMPILE}g++
--CXX=${CROSS_COMPILE}g++
--FC=${CROSS_COMPILE}gfortran
--AS=${CROSS_COMPILE}as
-+#NM=nm
-+#CCADMIN=CCadmin
-+#RANLIB=ranlib
-+#CC=${CROSS_COMPILE}gcc
-+#CCC=${CROSS_COMPILE}g++
-+#CXX=${CROSS_COMPILE}g++
-+#FC=${CROSS_COMPILE}gfortran
-+#AS=${CROSS_COMPILE}as
- 
- # Macros
- CND_PLATFORM=GNU-Linux-x86
diff --git a/recipes-demo-hmi/vod-server/files/vod-demo.service b/recipes-demo-hmi/vod-server/files/vod-demo.service
deleted file mode 100644
index c783bd4a..00000000
--- a/recipes-demo-hmi/vod-server/files/vod-demo.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Video On Demand AGL Demo
-After=WindowManager.service most-network-manager.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/VideoOnDemand -p /home/root/Video
-
-[Install]
-WantedBy=default.target
diff --git a/recipes-demo-hmi/vod-server/vod-server_0.1.bb b/recipes-demo-hmi/vod-server/vod-server_0.1.bb
deleted file mode 100644
index d1cbb669..00000000
--- a/recipes-demo-hmi/vod-server/vod-server_0.1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Build VideoOnDemand server"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-#LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-#		   "  
-
-PV = "0.1"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/vod-server;protocol=https;branch=${AGL_BRANCH}"
-SRC_URI += "file://0001-Fix-cross-compilation-with-yocto.patch \
-            file://vod-demo.service"
-
-S = "${WORKDIR}/git"
-SRCREV = "faafe61dd5f88859a005a59082d57339089ddca1"
-
-do_install() {
-        install -m 0755 -d ${D}${bindir}
-        install -m 0755 ${S}/VideoOnDemand ${D}${bindir}/VideoOnDemand
-
-        # Install VOD server systemd service (user)
-        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-            install -m 644 -p -D ${WORKDIR}/vod-demo.service ${D}${systemd_user_unitdir}/vod-demo.service
-
-            # Execute install manually for root user on behalf of systemctl script
-            # because it doesn't support user mode of systemd.
-            install -m 0755 -d ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/
-            ln -sf ${systemd_user_unitdir}/vod-demo.service ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/vod-demo.service
-            sed -i "s:/home/root:${ROOT_HOME}:" ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/vod-demo.service
-        fi
-}
-
-FILES_${PN} += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/vod-demo.service', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ROOT_HOME}/.config/systemd/user/default.target.wants/vod-demo.service', '', d)} \
-    "
-- 
cgit 1.2.3-korg