I have made the following changes intended for : nemo:devel:hw:ti:omap3:n9xx-common / ti-omap3-sgx
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/252 Thank You, Marko Saukko [This message was auto-generated] --- Request # 252: Messages from BOSS: State: review at 2013-04-25T10:57:34 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:hw:ti:omap3:n9xx-common : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:nemo:devel:hw:ti:omap3:n9xx-common / ti-omap3-sgx -> nemo:devel:hw:ti:omap3:n9xx-common / ti-omap3-sgx changes files: -------------- --- ti-omap3-sgx.changes +++ ti-omap3-sgx.changes @@ -0,0 +1,4 @@ +* Thu Apr 25 2013 Marko Saukko <marko.sau...@jollamobile.com> - 1.4.268.1 +- Change service from oneshot to notify and notify systemd when initialization is done +- Make sure we start before graphical.target + old: ---- 0001-Don-t-hide-error-messages.patch new: ---- 0002-Don-t-hide-error-messages.patch 0003-Ignore-return-value-and-notify-systemd-that-we-are-d.patch spec files: ----------- --- ti-omap3-sgx.spec +++ ti-omap3-sgx.spec @@ -25,7 +25,8 @@ Source7: ti-omap3-sgx-update.sh Source100: ti-omap3-sgx.yaml Patch0: 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch -Patch1: 0001-Don-t-hide-error-messages.patch +Patch1: 0002-Don-t-hide-error-messages.patch +Patch2: 0003-Ignore-return-value-and-notify-systemd-that-we-are-d.patch Requires: coreutils Requires: grep Requires: kmod >= 9 @@ -100,8 +101,10 @@ # 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch %patch0 -p1 -# 0001-Don-t-hide-error-messages.patch +# 0002-Don-t-hide-error-messages.patch %patch1 -p1 +# 0003-Ignore-return-value-and-notify-systemd-that-we-are-d.patch +%patch2 -p1 # >> setup cp -v %{SOURCE1} . cp -v %{SOURCE5} . other changes: -------------- ++++++ 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch --- 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch +++ 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch @@ -1,7 +1,7 @@ From ce850ef2b5ce549a7a02a521e315e59318b15390 Mon Sep 17 00:00:00 2001 From: Marko Saukko <marko.sau...@jollamobile.com> Date: Sat, 13 Apr 2013 07:47:27 +0000 -Subject: [PATCH] If dir and/or file doesn't exist lets not cause warning. +Subject: [PATCH 1/3] If dir and/or file doesn't exist lets not cause warning. Signed-off-by: Marko Saukko <marko.sau...@jollamobile.com> --- ++++++ 0002-Don-t-hide-error-messages.patch (new) --- 0002-Don-t-hide-error-messages.patch +++ 0002-Don-t-hide-error-messages.patch @@ -0,0 +1,50 @@ +From a00eb8a5050b1cf007db4db121558fe7bd8a97f7 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <marko.sau...@jollamobile.com> +Date: Sat, 13 Apr 2013 20:24:45 +0000 +Subject: [PATCH 2/3] Don't hide error messages. + +Signed-off-by: Marko Saukko <marko.sau...@jollamobile.com> +--- + usr/sbin/pvrsrvinit | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/usr/sbin/pvrsrvinit b/usr/sbin/pvrsrvinit +index 9ef0715..a309efd 100755 +--- a/usr/sbin/pvrsrvinit ++++ b/usr/sbin/pvrsrvinit +@@ -52,7 +52,7 @@ activate_driver_for_core_rev() + test -f /targets/links/scratchbox.config && exit 0 + + if [ "$1" == "--force" ]; then +- modprobe pvrsrvkm &> /dev/null ++ modprobe pvrsrvkm + mkdir -p /var/lib/opengles-sgx-img + touch /var/lib/opengles-sgx-img/upgrade + else +@@ -61,7 +61,7 @@ fi + + if [ \! -f /proc/pvr/version ]; then + if [ "$1" != "--force" ]; then +- echo "SGX driver failed to initialize" > /dev/console ++ echo "SGX driver failed to initialize" + fi + exit 1 + fi +@@ -70,12 +70,12 @@ SGX_CORE_REV=$(grep -Eo "SGX revision = ([0-9][.][0-9][.][0-9])" \ + /proc/pvr/version | cut -d= -f 2 | tr -d ". ") + + if [ "$SGX_CORE_REV" = "" ]; then +- echo "Unable to determine SGX core revision" > /dev/console ++ echo "Unable to determine SGX core revision" + exit 1 + fi + + if [ \! -f /usr/sbin/pvrsrvinit_r$SGX_CORE_REV ]; then +- echo "Unsupported SGX core revision" > /dev/console ++ echo "Unsupported SGX core revision" + exit 1 + fi + +-- +1.7.10.3 + ++++++ 0003-Ignore-return-value-and-notify-systemd-that-we-are-d.patch (new) --- 0003-Ignore-return-value-and-notify-systemd-that-we-are-d.patch +++ 0003-Ignore-return-value-and-notify-systemd-that-we-are-d.patch @@ -0,0 +1,27 @@ +From 089a8f0ddb87f1a68b8463ee79a4ae76d58d8a57 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <marko.sau...@jollamobile.com> +Date: Thu, 25 Apr 2013 10:30:00 +0000 +Subject: [PATCH 3/3] Ignore return value and notify systemd that we are done. + +Signed-off-by: Marko Saukko <marko.sau...@jollamobile.com> +--- + usr/sbin/pvrsrvinit | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/usr/sbin/pvrsrvinit b/usr/sbin/pvrsrvinit +index a309efd..ff3e8d7 100755 +--- a/usr/sbin/pvrsrvinit ++++ b/usr/sbin/pvrsrvinit +@@ -87,5 +87,8 @@ if [ "$(readlink /usr/lib/libsrv_um.so)" != "libsrv_um_r${SGX_CORE_REV}.so" -o \ + fi + + if [ "$1" != "--force" ]; then +- exec /usr/sbin/pvrsrvinit_r$SGX_CORE_REV ++ /usr/sbin/pvrsrvinit_r$SGX_CORE_REV ++ echo "/usr/sbin/pvrsrvinit_r$SGX_CORE_REV returned $(echo $?)." + fi ++ ++exec /bin/systemd-notify --ready +-- +1.7.10.3 + ++++++ ti-omap3-sgx.service --- ti-omap3-sgx.service +++ ti-omap3-sgx.service @@ -1,9 +1,10 @@ [Unit] Description=TI OMAP3 SGX driver After=local-fs.target +Before=systemd-user-sessions.service [Service] -Type=oneshot +Type=notify RemainAfterExit=yes ExecStart=/usr/sbin/pvrsrvinit ++++++ ti-omap3-sgx.yaml --- ti-omap3-sgx.yaml +++ ti-omap3-sgx.yaml @@ -15,7 +15,8 @@ - "ti-omap3-sgx-update.sh" Patches: - 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch - - 0001-Don-t-hide-error-messages.patch + - 0002-Don-t-hide-error-messages.patch + - 0003-Ignore-return-value-and-notify-systemd-that-we-are-d.patch Description: OMAP3 drivers for SGX Configure: none Builder: none ++++++ deleted files: --- 0001-Don-t-hide-error-messages.patch
