Submit package nemo:devel:hw...:n9xx-common / ti-omap3-sgx (revision 5) to package nemo:testing:...:n9xx-common / ti-omap3-sgx
| [-] [+] | Changed | ti-omap3-sgx.changes |
| [-] [+] | Changed | ti-omap3-sgx.spec ^ |
| [-] [+] | Deleted | 0001-Don-t-hide-error-messages.patch ^ |
| @@ -1,50 +0,0 @@ -From a00eb8a5050b1cf007db4db121558fe7bd8a97f7 Mon Sep 17 00:00:00 2001 -From: Marko Saukko <marko.saukko@jollamobile.com> -Date: Sat, 13 Apr 2013 20:24:45 +0000 -Subject: [PATCH] Don't hide error messages. - -Signed-off-by: Marko Saukko <marko.saukko@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 - | ||
| [-] [+] | Changed | 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.saukko@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.saukko@jollamobile.com> --- | ||
| [-] [+] | Added | 0002-Don-t-hide-error-messages.patch ^ |
| @@ -0,0 +1,50 @@ +From a00eb8a5050b1cf007db4db121558fe7bd8a97f7 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <marko.saukko@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.saukko@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 + | ||
| [-] [+] | Added | 0003-Ignore-return-value-and-notify-systemd-that-we-are-d.patch ^ |
| @@ -0,0 +1,31 @@ +From b9d97ce84a677f75b52af8eef4163e9b51f15a92 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <marko.saukko@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. + +Return value is ignored as it doesn't seem to affect to functionality and if we +dont return 0 systemd can think that this service failed and other services +that depend on it might not start. + +Signed-off-by: Marko Saukko <marko.saukko@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..9db29ad 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 $?)." ++ exec /bin/systemd-notify --ready + fi ++ +-- +1.7.10.3 + | ||
| [-] [+] | Changed | 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 | ||
| [-] [+] | Changed | 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 @@ -40,6 +41,10 @@ - "%{name}-libEGL <= 1.4.268" - "%{name}-libGLESv1 <= 1.4.268" - "%{name}-libGLESv2 <= 1.4.268" +Conflicts: + # At times mesa gets dragged in to image and it breaks + # the installation lets make sure that doesn't happen. + - mesa-llvmpipe SubPackages: - Name: devel | ||
Comments for request 267 (0)
There's nothing to be done right now
Request History
|
|
created request | 1401982108 almost 10 years ago |
fixes |
||
|
|
Request got a new review request | 1366955277 almost 11 years ago |
Under automated review |
||
|
|
Request got reviewed | 1366955282 almost 11 years ago |
Prechecks succeeded. |
||
|
|
Request got a new review request | 1366955283 almost 11 years ago |
Please replace this text with a review and appro [+] |
||
|
|
Request got reviewed | 1366956086 almost 11 years ago |
ok |
||
|
|
Request got a new review request | 1366956088 almost 11 years ago |
Build trial in progress at https://build.merproj [+] |
||
|
|
Request got reviewed | 1366956594 almost 11 years ago |
Build trial succeeded. |
||
|
|
Request got accepted | 1366956596 almost 11 years ago |
BOSS accepted this request because: Trial build [+] |
||
|
|
Review got accepted | 1401982108 almost 10 years ago |
Prechecks succeeded. |
||
|
|
Review got accepted | 1401982108 almost 10 years ago |
ok |
||
|
|
Review got accepted | 1401982108 almost 10 years ago |
Build trial succeeded. |
||