diff options
| author | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-02-20 12:27:32 +0400 |
|---|---|---|
| committer | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-02-20 12:27:46 +0400 |
| commit | c8c371ef796edee0403be61387858aff980cce78 (patch) | |
| tree | 477a7f7422cd4f51e84e4d13e6426f6b5a3ddac3 | |
| parent | 8193330a4fb54f4d8ffbf380f50a9dc395d8938a (diff) | |
| parent | 331fc66d7ea9f3ce603aa7aa152cb75522926fc7 (diff) | |
| download | emulator-yagl-c8c371ef796edee0403be61387858aff980cce78.tar.gz emulator-yagl-c8c371ef796edee0403be61387858aff980cce78.tar.bz2 emulator-yagl-c8c371ef796edee0403be61387858aff980cce78.zip | |
Merge branch 'tizen' into glesv3
Change-Id: Ie75f90abff3a430c6a3647f3ba8d38c7ebe5dd16
| -rw-r--r-- | packaging/95-tizen-emulator.rules | 6 | ||||
| -rw-r--r-- | packaging/emulator-yagl.spec | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/packaging/95-tizen-emulator.rules b/packaging/95-tizen-emulator.rules deleted file mode 100644 index 7753c1d..0000000 --- a/packaging/95-tizen-emulator.rules +++ /dev/null @@ -1,6 +0,0 @@ -KERNEL=="glmem", MODE="0666", SMACK="*" -KERNEL=="yagl", MODE="0666", SMACK="*" -KERNEL=="vdpram*", MODE="0644", SYMLINK+="dpram/%n" - -# Moved from /etc/rc.d/rc3.d/S30brightness -SUBSYSTEM=="lcd", ATTR{lcd_power}=="?*", RUN+="/bin/chown :system_bklight 0664 %S/%p/lcd_power" diff --git a/packaging/emulator-yagl.spec b/packaging/emulator-yagl.spec index 3ea840f..1ed1cf9 100644 --- a/packaging/emulator-yagl.spec +++ b/packaging/emulator-yagl.spec @@ -61,9 +61,6 @@ mkdir -p %{buildroot}/etc/emulator cp packaging/virtgl.sh %{buildroot}/etc/emulator %endif -mkdir -p %{buildroot}/usr/lib/udev/rules.d -cp packaging/95-tizen-emulator.rules %{buildroot}/usr/lib/udev/rules.d - mkdir -p %{buildroot}/usr/include cp -r include/EGL %{buildroot}/usr/include/ cp -r include/GL %{buildroot}/usr/include/ @@ -79,7 +76,6 @@ cp -r include/KHR %{buildroot}/usr/include/ %files %manifest %{name}.manifest %defattr(-,root,root,-) -/usr/lib/udev/rules.d/95-tizen-emulator.rules %if %{with wayland} /usr/lib/*.so* %else |