summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-demo-hmi/unicens/files/0001-Fix-cross-compilation-with-yocto.patch49
-rw-r--r--recipes-demo-hmi/unicens/files/0001-Support-booting-by-systemd.patch147
-rw-r--r--recipes-demo-hmi/unicens/files/most-network-manager.service11
-rw-r--r--recipes-demo-hmi/unicens/files/most-network-startup.service12
-rw-r--r--recipes-demo-hmi/unicens/unicens_0.1.bb49
5 files changed, 0 insertions, 268 deletions
diff --git a/recipes-demo-hmi/unicens/files/0001-Fix-cross-compilation-with-yocto.patch b/recipes-demo-hmi/unicens/files/0001-Fix-cross-compilation-with-yocto.patch
deleted file mode 100644
index 23b6a04f9..000000000
--- a/recipes-demo-hmi/unicens/files/0001-Fix-cross-compilation-with-yocto.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e75a2aafc7fc6b845e84a1a66d4883dddbbc93e2 Mon Sep 17 00:00:00 2001
-From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-Date: Fri, 9 Dec 2016 21:53:22 +0100
-Subject: [PATCH] Fix cross-compilation with yocto
-
-Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
----
- buildX86/Makefile-Release.mk | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/buildX86/Makefile-Release.mk b/buildX86/Makefile-Release.mk
-index 7419a76..72d7df8 100644
---- a/buildX86/Makefile-Release.mk
-+++ b/buildX86/Makefile-Release.mk
-@@ -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
-@@ -86,7 +86,7 @@ OBJECTFILES= \
-
-
- # Include Path
--C_INCLUDE=-Imnsl -ISrc -ISrc/IP -ISrc/Network -ISrc/Network/base -I/usr/include/libxml2 ${INCLUDE_PATH}
-+C_INCLUDE=-Imnsl -ISrc -ISrc/IP -ISrc/Network -ISrc/Network/base -I=/usr/include/libxml2 ${INCLUDE_PATH}
-
- # C Compiler Flags
- CFLAGS=-c -Wall -O2 -MMD -MP -DNDEBUG ${PROJECT_C_FLAGS}
---
-2.10.2
-
diff --git a/recipes-demo-hmi/unicens/files/0001-Support-booting-by-systemd.patch b/recipes-demo-hmi/unicens/files/0001-Support-booting-by-systemd.patch
deleted file mode 100644
index 5c18aacdc..000000000
--- a/recipes-demo-hmi/unicens/files/0001-Support-booting-by-systemd.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 7942933a4f1508966375326c4ee230812f504f4b Mon Sep 17 00:00:00 2001
-From: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
-Date: Tue, 20 Dec 2016 19:04:48 +0900
-Subject: [PATCH] Support booting by systemd
-
-Hack for CES2017 demo integration.
-
-Loading modules would be done by systemd, so loadDriver.sh
-could skip all insmod.
-
-Change-Id: I1d0d6db6faad789754707ffff127099f70150b1f
-Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
----
- scripts/loadDriver.sh | 95 +++++++++++++++++++++++++++++----------------------
- 1 file changed, 55 insertions(+), 40 deletions(-)
-
-diff --git a/scripts/loadDriver.sh b/scripts/loadDriver.sh
-index f55fdde..a3979cc 100755
---- a/scripts/loadDriver.sh
-+++ b/scripts/loadDriver.sh
-@@ -1,4 +1,7 @@
- #!/bin/bash
-+#
-+# Usage: loadDriver.sh [--systemd]
-+#
-
- if [ ! "$(whoami)" = "root" ]
- then
-@@ -13,63 +16,75 @@ else
- echo Searching driver in folder:$(pwd)
- fi
-
--#unload MOST Kernel modules
--lsmod | grep "^mxc_mlb\>" > /dev/null &&
-- rmmod mxc_mlb && echo "unloaded mxc_mlb"
-+load_modules()
-+{
-+ #unload MOST Kernel modules
-+ lsmod | grep "^mxc_mlb\>" > /dev/null &&
-+ rmmod mxc_mlb && echo "unloaded mxc_mlb"
-+
-+ lsmod | grep "^hdm_dim2_mx6q\>" > /dev/null &&
-+ rmmod hdm_dim2_mx6q && echo "unloaded hdm_dim2_mx6q"
-
--lsmod | grep "^hdm_dim2_mx6q\>" > /dev/null &&
-- rmmod hdm_dim2_mx6q && echo "unloaded hdm_dim2_mx6q"
-+ lsmod | grep "^hdm_dim2\>" > /dev/null &&
-+ rmmod hdm_dim2 && echo "unloaded hdm_dim2"
-
--lsmod | grep "^hdm_dim2\>" > /dev/null &&
-- rmmod hdm_dim2 && echo "unloaded hdm_dim2"
-+ lsmod | grep "^hdm_usb\>" > /dev/null &&
-+ rmmod hdm_usb && echo "unloaded hdm_usb"
-
--lsmod | grep "^hdm_usb\>" > /dev/null &&
-- rmmod hdm_usb && echo "unloaded hdm_usb"
-+ lsmod | grep "^aim_sound\>" > /dev/null &&
-+ rmmod aim_sound && echo "unloaded aim_sound"
-
--lsmod | grep "^aim_sound\>" > /dev/null &&
-- rmmod aim_sound && echo "unloaded aim_sound"
-+ lsmod | grep "^aim_v4l2\>" > /dev/null &&
-+ rmmod aim_v4l2 && echo "unloaded aim_v4l2"
-
--lsmod | grep "^aim_v4l2\>" > /dev/null &&
-- rmmod aim_v4l2 && echo "unloaded aim_v4l2"
-+ lsmod | grep "^aim_cdev\>" > /dev/null &&
-+ rmmod aim_cdev && echo "unloaded aim_cdev"
-
--lsmod | grep "^aim_cdev\>" > /dev/null &&
-- rmmod aim_cdev && echo "unloaded aim_cdev"
-+ lsmod | grep "^aim_network\>" > /dev/null &&
-+ rmmod aim_network && echo "unloaded aim_network"
-
--lsmod | grep "^aim_network\>" > /dev/null &&
-- rmmod aim_network && echo "unloaded aim_network"
-+ lsmod | grep "^mostcore\>" > /dev/null &&
-+ rmmod mostcore && echo "unloaded mostcore"
-
--lsmod | grep "^mostcore\>" > /dev/null &&
-- rmmod mostcore && echo "unloaded mostcore"
-+ echo
-+ #load V4L support
-+ lsmod | grep "^media\>" ||
-+ insmod /lib/modules/$(uname -r)/kernel/drivers/media/media.ko
-
--echo
--#load V4L support
--lsmod | grep "^media\>" ||
-- insmod /lib/modules/$(uname -r)/kernel/drivers/media/media.ko
-+ lsmod | grep "^videodev\>" ||
-+ insmod /lib/modules/$(uname -r)/kernel/drivers/media/v4l2-core/videodev.ko
-
--lsmod | grep "^videodev\>" ||
-- insmod /lib/modules/$(uname -r)/kernel/drivers/media/v4l2-core/videodev.ko
-+ #load MOST Kernel modules
-+ insmod mostcore.ko && echo "loaded mostcore"
-+ insmod aim_cdev.ko && echo "loaded aim_cdev"
-
--#load MOST Kernel modules
--insmod mostcore.ko && echo "loaded mostcore"
--insmod aim_cdev.ko && echo "loaded aim_cdev"
-+ [ -e aim_network.ko ] &&
-+ insmod aim_network.ko && echo "loaded aim_network"
-
--[ -e aim_network.ko ] &&
-- insmod aim_network.ko && echo "loaded aim_network"
-+ [ -e aim_sound.ko ] &&
-+ insmod aim_sound.ko && echo "loaded sound"
-
--[ -e aim_sound.ko ] &&
-- insmod aim_sound.ko && echo "loaded sound"
-+ [ -e aim_v4l2.ko ] &&
-+ insmod aim_v4l2.ko && echo "loaded v4l2"
-
--[ -e aim_v4l2.ko ] &&
-- insmod aim_v4l2.ko && echo "loaded v4l2"
-+ [ -e hdm_usb.ko ] &&
-+ insmod hdm_usb.ko && echo "loaded hdm_usb"
-
--[ -e hdm_usb.ko ] &&
-- insmod hdm_usb.ko && echo "loaded hdm_usb"
-+ [ -e hdm_dim2.ko ] &&
-+ insmod hdm_dim2.ko clock_speed=4096fs fcnt=3 && echo "loaded hdm_dim2"
-
--[ -e hdm_dim2.ko ] &&
-- insmod hdm_dim2.ko clock_speed=4096fs fcnt=3 && echo "loaded hdm_dim2"
-+ [ -e hdm_dim2_mx6q.ko ] &&
-+ insmod hdm_dim2_mx6q.ko && echo "loaded hdm_dim2_mx6q"
-+}
-
--[ -e hdm_dim2_mx6q.ko ] &&
-- insmod hdm_dim2_mx6q.ko && echo "loaded hdm_dim2_mx6q"
-+#
-+# Systemd load modules when booting system already.
-+# If argv[1] == "--systemd" then skip load modules
-+#
-+if [ "$1" != "--systemd" ]; then
-+ echo "Load modules"
-+ load_modules
-+fi
-
- DEVS=/sys/devices/virtual/most/mostcore/devices
- AIMS=/sys/devices/virtual/most/mostcore/aims
---
-2.7.4
-
diff --git a/recipes-demo-hmi/unicens/files/most-network-manager.service b/recipes-demo-hmi/unicens/files/most-network-manager.service
deleted file mode 100644
index 61e17b2d4..000000000
--- a/recipes-demo-hmi/unicens/files/most-network-manager.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Most Network Manager Service
-After=WindowManager.service most-network-startup.service
-
-[Service]
-Type=simple
-ExecStart=/usr/AGL/most/MostNetworkManager -i /usr/AGL/most/config-agl.xml
-Restart=always
-
-[Install]
-WantedBy=default.target
diff --git a/recipes-demo-hmi/unicens/files/most-network-startup.service b/recipes-demo-hmi/unicens/files/most-network-startup.service
deleted file mode 100644
index 4fd037531..000000000
--- a/recipes-demo-hmi/unicens/files/most-network-startup.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Most Network Startup Service
-After=WindowManager.service
-
-[Service]
-Type=simple
-RemainAfterExit=yes
-ExecStart=/usr/AGL/most/loadDriver.sh --systemd
-Restart=always
-
-[Install]
-WantedBy=default.target
diff --git a/recipes-demo-hmi/unicens/unicens_0.1.bb b/recipes-demo-hmi/unicens/unicens_0.1.bb
deleted file mode 100644
index 4f289c619..000000000
--- a/recipes-demo-hmi/unicens/unicens_0.1.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "Build NetworkManager"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-#LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-# "
-
-PV = "0.1"
-
-DEPENDS += "libxml2"
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/unicens;protocol=https;branch=${AGL_BRANCH}"
-SRC_URI += "file://0001-Fix-cross-compilation-with-yocto.patch"
-SRC_URI += "file://0001-Support-booting-by-systemd.patch \
- file://most-network-startup.service \
- file://most-network-manager.service"
-
-S = "${WORKDIR}/git"
-#SRCREV = "8c5f2324d7aa61669324aec1a0ad091fe1379489"
-SRCREV = "${AGL_DEFAULT_REVISION}"
-
-do_install() {
- install -m 0755 -d ${D}/usr/AGL/most
- install -m 0755 ${S}/NetworkManager ${D}/usr/AGL/most/MostNetworkManager
- install -m 0644 ${S}/scripts/config-agl.xml ${D}/usr/AGL/most/
- install -m 0644 ${S}/scripts/camera-os88122-ts.script ${D}/usr/AGL/most/
- install -m 0644 ${S}/scripts/i2c-slim-amplifier-v2.3.script ${D}/usr/AGL/most/
- install -m 0644 ${S}/scripts/i2c-uda1388-v2.3.script ${D}/usr/AGL/most
- install -m 0755 ${S}/scripts/loadDriver.sh ${D}/usr/AGL/most
-
- # Install MOST network startup systemd service (user)
- if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
- install -m 644 -p -D ${WORKDIR}/most-network-startup.service ${D}${systemd_user_unitdir}/most-network-startup.service
- install -m 644 -p -D ${WORKDIR}/most-network-manager.service ${D}${systemd_user_unitdir}/most-network-manager.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}/most-network-startup.service ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/most-network-startup.service
- ln -sf ${systemd_user_unitdir}/most-network-manager.service ${D}${ROOT_HOME}/.config/systemd/user/default.target.wants/most-network-manager.service
- fi
-}
-
-FILES_${PN} += " \
- /usr/AGL/most \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/most-network-startup.service', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/most-network-manager.service', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ROOT_HOME}/.config/systemd/user/default.target.wants/most-network-startup.service', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ROOT_HOME}/.config/systemd/user/default.target.wants/most-network-manager.service', '', d)} \
- "