Merge version 0.9.10

- Fixed service name of ias-earlyapp. - Restart GLMark2 for S3 resume. - Updated NOTICE file. Signed-off-by: litcoder <[email protected]>
intel · Oct 30, 2018 · 885780e · 885780e
1 parent 7d3853f
commit 885780e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
 PROJECT("earlyapp")
 SET(PROJECT_VERSION_MAJOR 0)
 SET(PROJECT_VERSION_MINOR 9)
-SET(PROJECT_VERSION_PATCH 9)
+SET(PROJECT_VERSION_PATCH 10)
 
 # Version file.
 CONFIGURE_FILE("version.h.in" ${CMAKE_BINARY_DIR}/include/EAVersion.h)

diff --git a/config/earlyapp.service b/config/earlyapp.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=GP2.0 Early application 
 DefaultDependencies=no
-Requires=ias.service cbc_attach.service
-After=ias.service cbc_attach.service
+Requires=ias-earlyapp.service cbc_attach.service
+After=ias-earlyapp.service cbc_attach.service
 
 [Service]
 Environment=XDG_RUNTIME_DIR=/run/ias

diff --git a/config/fb_splash.service b/config/fb_splash.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=GP2.0 Splash Screen
 DefaultDependencies=no
-Before=ias.service
+Before=ias-earlyapp.service
 
 [Service]
 Type=oneshot

diff --git a/config/glmark2.service b/config/glmark2.service
@@ -16,3 +16,4 @@ Restart=on-failure
 
 [Install]
 WantedBy=graphical.target
+Also=glmark2_resume.service
diff --git a/config/glmark2_resume.service b/config/glmark2_resume.service
@@ -2,15 +2,7 @@
 After=suspend.target
 
 [Service]
-Environment=XDG_RUNTIME_DIR=/run/ias/
-ExecStartPre=/usr/share/earlyapp/kpi_gpio.sh 442 1
-ExecStart=/usr/bin/glmark2-es2-wayland --run-forever --fullscreen --annotate
-Slice=earlyapp.slice
-
-# In case weston is still starting up and socket is not available
-ExecStartPre=/usr/bin/test -S $XDG_RUNTIME_DIR/wayland-0
-ExecStartPost=/usr/share/earlyapp/kpi_gpio.sh 442 0
-Restart=on-failure
+ExecStart=/usr/bin/systemctl --no-block restart glmark2.service
 
 [Install]
 WantedBy=suspend.target
diff --git a/config/ias-earlyapp.service b/config/ias-earlyapp.service
@@ -24,4 +24,3 @@ Slice=earlyapp.slice
 
 [Install]
 WantedBy=graphical.target
-Alias=ias
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ Restart=on-failure

		[Install]
		WantedBy=graphical.target
		Also=glmark2_resume.service
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,3 @@ Slice=earlyapp.slice

		[Install]
		WantedBy=graphical.target
		Alias=ias