Request 221 (accepted)
* Sat Apr 13 2013 Marko Saukko <marko.saukko@jollamobile.com> - 1.4.268.1 - Add 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch to make warnings go away - Merge libEGL, libGLESv1 and libGLESv2 to the main package as all those binaries are needed by the pvrsinit script that is execu [+]
Submit package home:sage:bra...:n9xx-common / ti-omap3-sgx to package nemo:devel:hw...:n9xx-common / ti-omap3-sgx
[-] [+] | Changed | ti-omap3-sgx.changes |
[-] [+] | Changed | ti-omap3-sgx.spec ^ |
[-] [+] | Added | 0001-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] 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 | 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch ^ |
@@ -0,0 +1,27 @@ +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. + +Signed-off-by: Marko Saukko <marko.saukko@jollamobile.com> +--- + usr/sbin/pvrsrvinit | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/usr/sbin/pvrsrvinit b/usr/sbin/pvrsrvinit +index d099b4e..9ef0715 100755 +--- a/usr/sbin/pvrsrvinit ++++ b/usr/sbin/pvrsrvinit +@@ -83,8 +83,7 @@ fi + if [ "$(readlink /usr/lib/libsrv_um.so)" != "libsrv_um_r${SGX_CORE_REV}.so" -o \ + -e /var/lib/opengles-sgx-img/upgrade ]; then + activate_driver_for_core_rev $SGX_CORE_REV +- rm /var/lib/opengles-sgx-img/upgrade +- rmdir /var/lib/opengles-sgx-img ++ rm -rf /var/lib/opengles-sgx-img + fi + + if [ "$1" != "--force" ]; then +-- +1.7.10.3 + | ||
[-] [+] | Changed | ti-omap3-sgx.yaml ^ |
@@ -1,11 +1,11 @@ Name: ti-omap3-sgx Summary: ImgTec SGX drivers for TI OMAP3 -Version: 1.4.268 -Release: 0 +Version: 1.4.268.1 +Release: 1 Group: Graphics/Display and Graphics Adaptation License: TI Proprietary Sources: - - "%{name}-bin-%{version}-armv7hl.tar.bz2" + - "%{name}-bin-1.4.268-armv7hl.tar.bz2" - "license.txt" - "%{name}-powervr.ini" - "%{name}.udev" @@ -13,7 +13,9 @@ - "Meego_IMG-08172010-license_txt.doc" - "ti-omap3-sgx.conf" - "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 Description: OMAP3 drivers for SGX Configure: none Builder: none @@ -22,6 +24,23 @@ # mkdir, touch, grep required for pvrsrvinit - coreutils - grep + # modprobe + - kmod >= 9 +Provides: + - libEGL + - libEGL.so.1 + - libGLESv1 + - libGLES_CM.so.1 + - libGLESv2 + - libGLESv2.so.2 + - "%{name}-libEGL > 1.4.268" + - "%{name}-libGLESv1 > 1.4.268" + - "%{name}-libGLESv2 > 1.4.268" +Obsoletes: + - "%{name}-libEGL <= 1.4.268" + - "%{name}-libGLESv1 <= 1.4.268" + - "%{name}-libGLESv2 <= 1.4.268" + SubPackages: - Name: devel Summary: PowerVR SGX support development files @@ -29,62 +48,32 @@ Description: | This package provides common development files for PowerVR SGX. - - Name: libEGL - Summary: EGL for SGX - Group: Development/Libraries - Description: | - This package.. - Provides: - - libEGL - - libEGL.so.1 - - Name: libEGL-devel Summary: EGL development headers for SGX Group: Development/Libraries Description: | - This package.. + %{summary}. Requires: - - "%{name}-libEGL = %{version}-%{release}" - "%{name}-devel = %{version}-%{release}" Provides: - libEGL-devel - - Name: libGLESv1 - Summary: GLESv1 for SGX - Group: Development/Libraries - Description: | - This package.. - Provides: - - libGLESv1 - - libGLES_CM.so.1 - - Name: libGLESv1-devel Summary: GLESv1 development headers for SGX Group: Development/Libraries Description: | - This package.. + %{summary}. Requires: - - "%{name}-libGLESv1 = %{version}-%{release}" - "%{name}-devel = %{version}-%{release}" Provides: - libGLESv1-devel - - Name: libGLESv2 - Summary: GLESv2 for SGX - Group: Development/Libraries - Description: | - This package.. - Provides: - - libGLESv2 - - libGLESv2.so.2 - - Name: libGLESv2-devel Summary: GLESv2 development headers for SGX Group: Development/Libraries Description: | - This package.. + %{summary}. Requires: - - "%{name}-libGLESv2 = %{version}-%{release}" - "%{name}-devel = %{version}-%{release}" Provides: - libGLESv2-devel |
Comments for request 221 (0)
There's nothing to be done right now
Request History
sage | created request | 1401982120 almost 10 years ago |
* Sat Apr 13 2013 Marko Saukko <marko.saukko@jol [+] |
||
cibot | Request got a new review request | 1366104319 about 11 years ago |
Under automated review |
||
cibot | Request got reviewed | 1366104325 about 11 years ago |
Prechecks succeeded. |
||
cibot | Request got a new review request | 1366104327 about 11 years ago |
Please replace this text with a review and appro [+] |
||
sage | Request got reviewed | 1366104346 about 11 years ago |
ok |
||
cibot | Request got a new review request | 1366104350 about 11 years ago |
Build trial in progress at https://build.merproj [+] |
||
cibot | Request got reviewed | 1366104812 about 11 years ago |
Build trial succeeded. |
||
cibot | Request got accepted | 1366104815 about 11 years ago |
BOSS accepted this request because: Trial build [+] |
||
cibot | Review got accepted | 1401982120 almost 10 years ago |
Prechecks succeeded. |
||
sage | Review got accepted | 1401982120 almost 10 years ago |
ok |
||
cibot | Review got accepted | 1401982120 almost 10 years ago |
Build trial succeeded. |