From 3e75710ed1eb6da658146a41d6eba00f8f04d662 Mon Sep 17 00:00:00 2001 From: Sangjin Kim Date: Thu, 30 May 2013 13:15:49 +0900 Subject: [PATCH] Remove opengl related systemd service files. Change-Id: I696c3694e2cd884339bd860feb76ee2745005a93 Signed-off-by: Sangjin Kim --- filesystem/etc/emulator/virtgl.sh | 32 ------------------- filesystem/etc/emulator/yagl.sh | 11 ------- filesystem/etc/init.d/emulator-opengl | 5 --- .../systemd/system/emul-opengl-mode.service | 11 ------- .../systemd/system/emul-opengl-yagl.service | 13 -------- packaging/system-plugin-emulator.spec | 11 ------- 6 files changed, 83 deletions(-) delete mode 100755 filesystem/etc/emulator/virtgl.sh delete mode 100755 filesystem/etc/emulator/yagl.sh delete mode 100755 filesystem/etc/init.d/emulator-opengl delete mode 100644 filesystem/usr/lib/systemd/system/emul-opengl-mode.service delete mode 100644 filesystem/usr/lib/systemd/system/emul-opengl-yagl.service diff --git a/filesystem/etc/emulator/virtgl.sh b/filesystem/etc/emulator/virtgl.sh deleted file mode 100755 index df3a11d..0000000 --- a/filesystem/etc/emulator/virtgl.sh +++ /dev/null @@ -1,32 +0,0 @@ - #!/bin/sh - -echo -e "[${_G} Opengl-es acceleration module setting. ${C_}]" -if grep "gles=1" /proc/cmdline ; then - echo -e "[${_G} Emulator support gles hw acceleration. ${C_}]" - echo -e "[${_G} Change permission of /dev/glmem. ${C_}]" - chmod 666 /dev/glmem - echo -e "[${_G} Apply to use hw gles library. ${C_}]" - ln -s -f /usr/lib/host-gl/libEGL.so.1.0 /usr/lib/libEGL.so - ln -s -f /usr/lib/host-gl/libEGL.so.1.0 /usr/lib/libEGL.so.1 - ln -s -f /usr/lib/host-gl/libGLESv1_CM.so.1.0 /usr/lib/libGLESv1_CM.so - ln -s -f /usr/lib/host-gl/libGLESv1_CM.so.1.0 /usr/lib/libGLESv1_CM.so.1 - ln -s -f /usr/lib/host-gl/libGLESv2.so.1.0 /usr/lib/libGLESv2.so - ln -s -f /usr/lib/host-gl/libGLESv2.so.1.0 /usr/lib/libGLESv2.so.1 - rm -f /usr/lib/st_GL.so - rm -f /usr/lib/egl_gallium.so - rm -f /usr/lib/libglapi.so* -else - echo -e "[${_G} Emulator does not support gles hw acceleration. ${C_}]" - echo -e "[${_G} Apply to use sw mesa gles library. ${C_}]" - ln -s -f /usr/lib/mesa-gl/libEGL.so.1.0 /usr/lib/libEGL.so - ln -s -f /usr/lib/mesa-gl/libEGL.so.1.0 /usr/lib/libEGL.so.1 - ln -s -f /usr/lib/mesa-gl/libGLESv1_CM.so.1.1.0 /usr/lib/libGLESv1_CM.so - ln -s -f /usr/lib/mesa-gl/libGLESv1_CM.so.1.1.0 /usr/lib/libGLESv1_CM.so.1 - ln -s -f /usr/lib/mesa-gl/libGLESv2.so.2.0.0 /usr/lib/libGLESv2.so - ln -s -f /usr/lib/mesa-gl/libGLESv2.so.2.0.0 /usr/lib/libGLESv2.so.1 - ln -s -f /usr/lib/mesa-gl/st_GL.so /usr/lib/st_GL.so - ln -s -f /usr/lib/mesa-gl/egl_gallium.so /usr/lib/egl_gallium.so - ln -s -f /usr/lib/mesa-gl/libglapi.so.0.0.0 /usr/lib/libglapi.so - ln -s -f /usr/lib/mesa-gl/libglapi.so.0.0.0 /usr/lib/libglapi.so.0 - ln -s -f /usr/lib/mesa-gl/libglapi.so.0.0.0 /usr/lib/libglapi.so.0.0.0 -fi diff --git a/filesystem/etc/emulator/yagl.sh b/filesystem/etc/emulator/yagl.sh deleted file mode 100755 index 5d1c0cc..0000000 --- a/filesystem/etc/emulator/yagl.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if test -f '/usr/lib/yagl/libGLESv2.so' && grep -q 'yagl=1' /proc/cmdline; then - export LD_LIBRARY_PATH="/usr/lib/yagl${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - export ELM_ENGINE=gl - export YAGL_DEBUG=4 -# export YAGL_DEBUG_FUNC_TRACE=1 - - # XXX FIXME: This has to be dropped too - ulimit -SHl unlimited -fi diff --git a/filesystem/etc/init.d/emulator-opengl b/filesystem/etc/init.d/emulator-opengl deleted file mode 100755 index 36a2d76..0000000 --- a/filesystem/etc/init.d/emulator-opengl +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -. /etc/emulator/virtgl.sh -# yagl init script should be modified to old symlink mode, not a LD_LIBRARY_PATH mode. -#. /etc/emulator/yagl.sh diff --git a/filesystem/usr/lib/systemd/system/emul-opengl-mode.service b/filesystem/usr/lib/systemd/system/emul-opengl-mode.service deleted file mode 100644 index 3346513..0000000 --- a/filesystem/usr/lib/systemd/system/emul-opengl-mode.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenGL mode -DefaultDependencies=no -Before=basic.target - -[Service] -Type=oneshot -ExecStart=/bin/sh -c '/etc/emulator/virtgl.sh' - -[Install] -WantedBy=emulator_preinit.target diff --git a/filesystem/usr/lib/systemd/system/emul-opengl-yagl.service b/filesystem/usr/lib/systemd/system/emul-opengl-yagl.service deleted file mode 100644 index 82b2e00..0000000 --- a/filesystem/usr/lib/systemd/system/emul-opengl-yagl.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=OpenGL "YAGL" -DefaultDependencies=no -After=emul-opengl-mode.service -Before=basic.target -ConditionKernelCommandLine=yagl=1 - -[Service] -Type=oneshot -ExecStart=/bin/sh -c 'systemctl set-environment LD_LIBRARY_PATH="/usr/lib/yagl${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"' - -[Install] -WantedBy=emulator_preinit.target diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index c6cc5b1..163871e 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -32,7 +32,6 @@ cp -arf filesystem/* %{buildroot} if [ ! -d %{buildroot}/etc/rc.d/rc3.d ]; then mkdir -p %{buildroot}/etc/rc.d/rc3.d fi -ln -s /etc/init.d/emulator-opengl %{buildroot}/etc/rc.d/rc3.d/S01emulator-opengl ln -s /etc/init.d/setup-audio-volume %{buildroot}//etc/rc.d/rc3.d/S02setup-audio-volume ln -s /etc/init.d/mount-hostdir %{buildroot}//etc/rc.d/rc3.d/S03mount-hostdir ln -s /etc/init.d/ssh %{buildroot}/etc/rc.d/rc3.d/S50ssh @@ -42,8 +41,6 @@ ln -s /etc/init.d/ssh %{buildroot}/etc/rc.d/rc3.d/S50ssh mkdir -p %{buildroot}/%{systemd_dir}/system/basic.target.wants ln -s %{systemd_dir}/system/emulator_preinit.target %{buildroot}/%{systemd_dir}/system/basic.target.wants/ mkdir -p %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants -ln -s %{systemd_dir}/system/emul-opengl-mode.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/ -ln -s %{systemd_dir}/system/emul-opengl-yagl.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/ ln -s %{systemd_dir}/system/emul-setup-audio-volume.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/ ln -s %{systemd_dir}/system/emul-mount-hostdir.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/ ln -s %{systemd_dir}/system/emul-common-preinit.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/ @@ -65,9 +62,6 @@ fi %files /etc/emulator/setup-audio-volume.sh /etc/emulator/mount-hostdir.sh -/etc/emulator/virtgl.sh -/etc/emulator/yagl.sh -/etc/init.d/emulator-opengl /etc/init.d/setup-audio-volume /etc/init.d/mount-hostdir /etc/inittab @@ -78,7 +72,6 @@ fi /etc/rc.d/rc.firstboot /etc/rc.d/rc.shutdown /etc/rc.d/rc.sysinit -/etc/rc.d/rc3.d/S01emulator-opengl /etc/rc.d/rc3.d/S02setup-audio-volume /etc/rc.d/rc3.d/S03mount-hostdir /etc/rc.d/rc3.d/S50ssh @@ -89,13 +82,9 @@ fi /usr/lib/systemd/system/emul-setup-audio-volume.service /usr/lib/systemd/system/emul-mount-hostdir.service /usr/lib/systemd/system/emul-common-preinit.service -/usr/lib/systemd/system/emul-opengl-mode.service -/usr/lib/systemd/system/emul-opengl-yagl.service /usr/lib/systemd/system/emulator_preinit.target.wants/emul-setup-audio-volume.service /usr/lib/systemd/system/emulator_preinit.target.wants/emul-mount-hostdir.service /usr/lib/systemd/system/emulator_preinit.target.wants/emul-common-preinit.service -/usr/lib/systemd/system/emulator_preinit.target.wants/emul-opengl-mode.service -/usr/lib/systemd/system/emulator_preinit.target.wants/emul-opengl-yagl.service /usr/lib/systemd/system/sdbd.service /usr/lib/systemd/system/sshd.service /usr/lib/systemd/system/emulator.target.wants/sdbd.service -- 2.34.1