[meego-commits] 23597: Changes to Trunk:non-oss/ti-omap3-sgx

[Tracy Graydon]

Hi,
I have made the following changes to ti-omap3-sgx in project Trunk:non-oss. Please review and accept ASAP.

Thank You,
Tracy Graydon

[This message was auto-generated]

---

Request #23597:

  submit:   Trunk:non-oss:Testing/ti-omap3-sgx(r2)(update) -> Trunk:non-oss/ti-omap3-sgx


Message:
    Push to trunk

State:   new          2011-08-08T13:51:44 tracyg
Comment: None



changes files:
--------------
--- ti-omap3-sgx.changes
+++ ti-omap3-sgx.changes
@@ -0,0 +1,3 @@
+* Thu Jun 02 2011 Marko Saukko <marko.saukko at cybercom.com> - 1.4.20090218.189
+- Initial changes from sysvinit to systemd (FEA#16109).
+

old:
----
  ti-omap3-sgx.init

new:
----
  ti-omap3-sgx.service
  ti-omap3-sgx.sh

spec files:
-----------
--- ti-omap3-sgx.spec
+++ ti-omap3-sgx.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22git
+# Generated by: spectacle version 0.22
 # 
 # >> macros
 %ifarch armv7l
@@ -24,17 +24,18 @@
 License:    TI Proprietary
 ExclusiveArch:  armv7l armv7el armv7hl armv8el
 Source0:    %{name}-bin-%{version}-%{targetarch}.tar.gz
-Source1:    %{name}.init
+Source1:    %{name}.sh
 Source2:    license.txt
 Source3:    %{name}-powervr.ini
 Source4:    %{name}.udev
+Source5:    %{name}.service
 Source100:  ti-omap3-sgx.yaml
+Requires(post): systemd
 Requires(post): /sbin/ldconfig
-Requires(post): /sbin/service
-Requires(post): /sbin/chkconfig
+Requires(postun): systemd
 Requires(postun): /sbin/ldconfig
-Requires(postun): /sbin/service
-Requires(postun): /sbin/chkconfig
+Provides:   libsrv_um.so
+Provides:   libpvr2d.so
 
 
 %description
@@ -140,7 +141,6 @@
 
 
 # >> build post
-
 # << build post
 %install
 rm -rf %{buildroot}
@@ -154,13 +154,18 @@
 rm $RPM_BUILD_ROOT/usr/share/doc/%{name}-bin-%{version}/license.txt
 
 install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/powervr.ini
-install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/%{name}
+install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/sbin/%{name}.sh
 install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/udev/rules.d/10-pvrsrvkm.rules
 
 # Integrate into Mesa naming.
 ln -s libGLESv2.so $RPM_BUILD_ROOT/usr/lib/libGLESv2.so.2
 ln -s libGLES_CM.so $RPM_BUILD_ROOT/usr/lib/libGLES_CM.so.1
 ln -s libEGL.so $RPM_BUILD_ROOT/usr/lib/libEGL.so.1
+
+# systemd
+install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/lib/systemd/system/%{name}.service
+install -d $RPM_BUILD_ROOT/lib/systemd/system/sysinit.target.wants/
+ln -s ../%{name}.service $RPM_BUILD_ROOT/lib/systemd/system/sysinit.target.wants/%{name}.service
 # << install pre
 
 # >> install post
@@ -171,15 +176,13 @@
 %post
 /sbin/ldconfig
 # >> post
-/sbin/chkconfig --add %{name}
+systemctl daemon-reload
 # << post
 
 %postun
 /sbin/ldconfig
 # >> postun
-if [ $1 = 0 ]; then
-/sbin/chkconfig --del %{name}
-fi
+systemctl daemon-reload
 # << postun
 
 
@@ -228,7 +231,9 @@
 /usr/lib/libsrv_um*.so
 %attr(755,root,root) /usr/sbin/pvrsrvinit_r*
 %attr(755,root,root) /usr/sbin/pvrsrvinit
-%attr(755,root,root) /etc/init.d/%{name}
+%attr(755,root,root) /usr/sbin/%{name}.sh
+/lib/systemd/system/%{name}.service
+/lib/systemd/system/sysinit.target.wants/%{name}.service
 # Should be in it's own package.
 /usr/lib/libOpenVG*.so
 # << files

other changes:
--------------

++++++ ti-omap3-sgx.service (new)
--- ti-omap3-sgx.service
+++ ti-omap3-sgx.service
+[Unit]
+Description=TI OMAP3 SGX driver
+Before=uxlaunch.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ti-omap3-sgx.sh start
+ExecStop=/usr/sbin/ti-omap3-sgx.sh stop
+
+[Install]
+WantedBy=multi-user.target

++++++ ti-omap3-sgx.sh (new)
--- ti-omap3-sgx.sh
+++ ti-omap3-sgx.sh
+#!/bin/bash
+
+RETVAL=0
+
+start() {
+    echo "Starting ti-omap-sgx... "
+    /sbin/modprobe omaplfb
+    /sbin/modprobe pvrsrvkm
+    /usr/sbin/pvrsrvinit
+    RETVAL=$?
+}
+
+stop() {
+    echo "Stopping ti-omap-sgx..."
+    rmmod omaplfb
+    rmmod pvrsrvkm
+    RETVAL=$?
+}
+
+case "$1" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    restart)
+        stop
+        start
+        ;;
+    reload)
+        stop
+        start
+        ;;
+    status)
+        lsmod | grep omaplfb &> /dev/null
+        RETVAL=$?
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|status}"
+        RETVAL=1
+esac
+
+exit $RETVAL
++++++ ti-omap3-sgx.yaml
--- ti-omap3-sgx.yaml
+++ ti-omap3-sgx.yaml
@@ -6,10 +6,18 @@
 License: TI Proprietary
 Sources:
     - "%{name}-bin-%{version}-%{targetarch}.tar.gz"
-    - "%{name}.init"
+    - "%{name}.sh"
     - "license.txt"
     - "%{name}-powervr.ini"
     - "%{name}.udev"
+    - "%{name}.service"
+RequiresPost:
+    - systemd
+RequiresPostUn:
+    - systemd
+Provides:
+    - libsrv_um.so
+    - libpvr2d.so
 
 Description: OMAP3 drivers for SGX
 SetupOptions: -q -n %{name}-bin-%{version}-%{targetarch}

++++++ deleted files:
--- ti-omap3-sgx.init