Change GLOBALUSER to aglglobalapp

Change GLOBALUSER (is defined in etc/tizen-platform.conf) to aglglobalapp from tizenglobalapp according to AGL platform.

Change-Id: I9dc224ced7ef0ff15976860d1c0bc8c7ae402da9
Signed-off-by: Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>

5 files changed, 51 insertions, 8 deletions

diff --git a/meta-application-manager/recipes-application-framework/ail/ail.inc b/meta-application-manager/recipes-application-framework/ail/ail.inc
index e1857cf..f946869 100644
--- a/meta-application-manager/recipes-application-framework/ail/ail.inc
+++ b/meta-application-manager/recipes-application-framework/ail/ail.inc
@@ -114,8 +114,8 @@ pkg_postinst_${PN}() {
     #!/bin/sh -e
 
     ldconfig
-    # Create tizenglobalapp user needed for global installation
-    useradd -d $D${prefix}/apps -m tizenglobalapp -r -c "system user for common applications" -g root
+    # Create aglglobalapp user needed for global installation
+    useradd -d $D${prefix}/apps -m aglglobalapp -r -c "system user for common applications" -g root
     #mkdir -p %TZ_SYS_RW_APP/.config/xwalk-service/applications
     #cd %TZ_SYS_RW_APP/
     #ln -s .config/xwalk-service/applications/
@@ -142,12 +142,12 @@ pkg_postinst_${PN}() {
     chsmack -a '*' $D${prefix}/share/icons/default/small/
     chmod g+w $D${prefix}/share/applications
     chmod g+w $D${prefix}/share/applications
-    chown tizenglobalapp:root $D${prefix}/share/applications
-    chown tizenglobalapp:root $D${prefix}/share/applications
-    chown tizenglobalapp:root $D${prefix}/apps
-    chown tizenglobalapp:root $D${prefix}/dbspace
-    chown tizenglobalapp:root $D${prefix}/dbspace
-    chown tizenglobalapp:root -R $D${prefix}/share/icons
+    chown aglglobalapp:root $D${prefix}/share/applications
+    chown aglglobalapp:root $D${prefix}/share/applications
+    chown aglglobalapp:root $D${prefix}/apps
+    chown aglglobalapp:root $D${prefix}/dbspace
+    chown aglglobalapp:root $D${prefix}/dbspace
+    chown aglglobalapp:root -R $D${prefix}/share/icons
     ail_createdb 2>/dev/null
     ail_syncdb 2>/dev/null
     chsmack -a '*' $D${prefix}/dbspace/.app_info.db*
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/0001_change-tzglobalapp-to-aglglobalapp.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/0001_change-tzglobalapp-to-aglglobalapp.patch
new file mode 100644
index 0000000..2e91fd0
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/files/0001_change-tzglobalapp-to-aglglobalapp.patch
@@ -0,0 +1,28 @@
+diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec
+index 61e4711..9b69e59 100644
+--- a/packaging/pkgmgr.spec
++++ b/packaging/pkgmgr.spec
+@@ -151,8 +151,8 @@ chsmack -a '*' %{TZ_SYS_RW_PACKAGES}
+ %{_bindir}/pkg_getsize
+ %{_bindir}/pkginfo
+ %{_bindir}/pkgmgr-install
+-%attr(-,tizenglobalapp,root) %dir %{TZ_SYS_RW_PACKAGES}
+-%attr(-,tizenglobalapp,root) %{TZ_SYS_RW_PACKAGES}/org.tizen.pkgmgr-install.xml
++%attr(-,aglglobalapp,root) %dir %{TZ_SYS_RW_PACKAGES}
++%attr(-,aglglobalapp,root) %{TZ_SYS_RW_PACKAGES}/org.tizen.pkgmgr-install.xml
+ %{_datadir}/mime/packages/mime.wac.xml
+ %{_datadir}/mime/packages/mime.tpk.xml
+ %exclude %{_includedir}/pkgmgr/comm_client.h
+diff --git a/tool/pkg_info.c b/tool/pkg_info.c
+index cd7d461..49b1119 100644
+--- a/tool/pkg_info.c
++++ b/tool/pkg_info.c
+@@ -2227,7 +2227,7 @@ int main(int argc, char *argv[])
+ 
+ 
+ 	if(getuid() == OWNER_ROOT) {
+-		printf("User is Root! : Only tizenglobalapp or regular user are allowed\n");
++		printf("User is Root! : Only aglglobalapp or regular user are allowed\n");
+ 		return -1;
+ 	}
+ 	
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_%.bbappend b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_%.bbappend
new file mode 100644
index 0000000..1d47580
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_%.bbappend
@@ -0,0 +1 @@
+SRC_URI += "file://0001_change-tzglobalapp-to-aglglobalapp.patch"
diff --git a/meta-application-manager/recipes-others/tizen-platform-config/files/0001-modified-global-tizen-to-agl.patch b/meta-application-manager/recipes-others/tizen-platform-config/files/0001-modified-global-tizen-to-agl.patch
new file mode 100644
index 0000000..ebba84d
--- /dev/null
+++ b/meta-application-manager/recipes-others/tizen-platform-config/files/0001-modified-global-tizen-to-agl.patch
@@ -0,0 +1,13 @@
+diff --git ../tizen-platform.meta ../tizen-platform.meta
+index f9cbe54..8cb108c 100644
+--- ../tizen-platform.meta
++++ ../tizen-platform.meta
+@@ -25,7 +25,7 @@ TZ_SYS_BIN=/usr/bin
+ TZ_SYS_SMACK=/etc/smack
+ TZ_SYS_STORAGE=/usr/storage
+ TZ_SYS_USER_GROUP=users
+-TZ_SYS_GLOBALAPP_USER=tizenglobalapp
++TZ_SYS_GLOBALAPP_USER=aglglobalapp
+ TZ_SYS_ADMIN_GROUP=system
+ 
+ # which user to use when applications start request are sent by system daemons
diff --git a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend
new file mode 100644
index 0000000..d61675e
--- /dev/null
+++ b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend
@@ -0,0 +1 @@
+SRC_URI += "file://0001-modified-global-tizen-to-agl.patch"