Skip to content
This repository has been archived by the owner on Oct 26, 2021. It is now read-only.

meta-raspberrypi: update to latest on rocko #193

Merged
merged 3 commits into from
Jul 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion gdp-src-build/conf/templates/raspberrypi.local.inc
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
include local.inc

GPU_MEM = "128"
# vc4grahpics do not use GPU_MEM, instead it uses the CMA memory, allocating
# a high number of GPU_MEM does seem to eat memory from CMA causing OOM errors.
#
# Ultimatly we would like to set this to 0, but it does seem to need a small
# amount otherwise the system will not boot. Fails at first stage already,
# loading the Linux kernel.
GPU_MEM = "16"

MACHINE_FEATURES_append = " vc4graphics"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From b8f9a332e28f00035a37bd7eeb9e6471e998ab83 Mon Sep 17 00:00:00 2001
From: Mirza Krak <[email protected]>
Date: Thu, 26 Jul 2018 14:27:36 +0200
Subject: [PATCH 1/1] rvi_ctl.template: get rid of dependecy on "install"

Use mkdir instead which is most certanly already in place.

Signed-off-by: Mirza Krak <[email protected]>
---
scripts/rvi_ctl.template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/rvi_ctl.template b/scripts/rvi_ctl.template
index 82ae11b..d93fe2a 100644
--- a/scripts/rvi_ctl.template
+++ b/scripts/rvi_ctl.template
@@ -104,7 +104,7 @@ then
else
RUNDIR=${RVI_RUNDIR}
fi
- install -d --mode=0755 ${RUNDIR}
+ mkdir -p ${RUNDIR}
Copy link
Member

@gunnarx gunnarx Jul 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it need a chmod 755? (depends on what umask is active I guess - it's probably OK)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated with mkdir -m 755

cd ${RUNDIR}
RVI_LOGDIR="${RVI_LOGDIR}" ${RVI_BINDIR}/setup_gen rvi ${CONFIG_FILE} rvi
)
@@ -122,7 +122,7 @@ LAUNCH="${ERL} -boot ${RUNDIR}/rvi/start -sname ${SNAME} -config ${RUNDIR}/rvi/s

case "${CMD}" in
start)
- install -D -d --mode 0755 ${RVI_LOGDIR}
+ mkdir -p ${RVI_LOGDIR}
exec run_erl -daemon ${RUNDIR}/ ${RVI_LOGDIR} "exec ${LAUNCH}"
;;

--
2.18.0

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI += "\
file://rvi.service \
file://device_id \
file://0001-rvi_ctl.template-get-rid-of-dependecy-on-install.patch \
"

do_install_append () {
Expand Down
2 changes: 1 addition & 1 deletion meta-raspberrypi
Submodule meta-raspberrypi updated from b58ccf to 9e0891