From 5f49d050ab574302aeed3f3968ddf56eca0c270e Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 3 Oct 2014 14:57:49 +0200 Subject: [PATCH] meta-tizen: Fix ail start up Change-Id: If074dba66aebec6247c905b0b13e224db9931876 (From meta-tizen rev: a1df6368d3125e2ba9bd67a4740fbdb0a7ffd640) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../modello-installer-postinst.service | 1 + .../modello-installer-postinst.sh | 31 +++++++++++++++------- meta-tizen/recipes-tizen/ail/ail.inc | 9 +++---- meta-tizen/recipes-tizen/ail/ail_git.bb | 2 +- .../ail/files/remove-dlog-for-native-build.patch | 4 +-- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer/modello-installer-postinst.service b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer/modello-installer-postinst.service index 7e9500d..cb6f342 100644 --- a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer/modello-installer-postinst.service +++ b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer/modello-installer-postinst.service @@ -4,6 +4,7 @@ Before=Modello_Homescreen.service [Service] Type=oneshot +SmackExecLabel=User ExecStart=/usr/share/modello-installer/modello-installer-postinst.sh ExecStartPost=/bin/rm -f /lib/systemd/system/multi-user.target.wants/modello-installer-postinst.service diff --git a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer/modello-installer-postinst.sh b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer/modello-installer-postinst.sh index 10a08bc..c3eaf11 100644 --- a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer/modello-installer-postinst.sh +++ b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer/modello-installer-postinst.sh @@ -3,18 +3,29 @@ source /etc/tizen-platform.conf export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/5000/dbus/user_bus_socket" +export MODELLO_INSTALL_USER="app" +export MODELLO_COMMON_DIR="/usr/share/Modello/Common" + +export PATH="${PATH}:/bin" + for list in $(find $TZ_SYS_APP_PREINSTALL -name "Modello*") do - #XWalk requires you not be root to install files - echo "Installing $list" - /bin/su app -c "xwalkctl -i $list" +#XWalk requires you not be root to install files + echo "Installing $list" + su ${MODELLO_INSTALL_USER} -c "xwalkctl -i $list" done -for list2 in $(ls -d $TZ_SYS_HOME/app/.config/xwalk-service/applications/*/) -do - /bin/su app -c "mkdir -p '$list2/css'" - /bin/su app -c "mkdir -p '$list2/js'" - /bin/su app -c "cp -r /opt/usr/apps/_common/js/services '$list2/js/'" - /bin/su app -c "cp -r /opt/usr/apps/_common/css/* '$list2/css/'" - /bin/su app -c "cp -r /opt/usr/apps/_common/icons '$list2/'" +for list2 in $(ls -d $TZ_SYS_HOME/${MODELLO_INSTALL_USER}/.config/xwalk-service/applications/*/) +do + echo list2 $ + su ${MODELLO_INSTALL_USER} -c "mkdir -p '$list2/css'" + su ${MODELLO_INSTALL_USER} -c "mkdir -p '$list2/js'" + su ${MODELLO_INSTALL_USER} -c "cp -fr ${MODELLO_COMMON_DIR}/js/services '$list2/js/'" + su ${MODELLO_INSTALL_USER} -c "cp -fr ${MODELLO_COMMON_DIR}/css/* '$list2/css/'" + su ${MODELLO_INSTALL_USER} -c "cp -fr ${MODELLO_COMMON_DIR}/icons '$list2/'" + + done + +find $TZ_SYS_HOME/${MODELLO_INSTALL_USER}/.config/xwalk-service/applications/ -exec chsmack -a "User" {} \; + diff --git a/meta-tizen/recipes-tizen/ail/ail.inc b/meta-tizen/recipes-tizen/ail/ail.inc index 3099efe..fa1aa11 100644 --- a/meta-tizen/recipes-tizen/ail/ail.inc +++ b/meta-tizen/recipes-tizen/ail/ail.inc @@ -65,7 +65,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - CFLAGS+=" -fpic" + CFLAGS="$CFLAGS -fpic" @@ -81,8 +81,7 @@ do_compile() { -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . -DTZ_SYS_RW_DESKTOP_APP=${prefix}/share/applications \ - -DBUILD_PKGTYPE=rpm \ - -DSMACK=Off + -DBUILD_PKGTYPE=rpm oe_runmake -j16 @@ -118,8 +117,8 @@ pkg_postinst_${PN}() { ldconfig # Create tizenglobalapp user needed for global installation useradd -d $D${prefix}/apps -m tizenglobalapp -r -c "system user for common applications" -g root - #mkdir -p $D${prefix}/apps/.config/xwalk-service/applications - #cd $D${prefix}/apps/ + #mkdir -p %TZ_SYS_RW_APP/.config/xwalk-service/applications + #cd %TZ_SYS_RW_APP/ #ln -s .config/xwalk-service/applications/ vconftool set -t string db/ail/ail_info "0" -f -s system::vconf_inhouse vconftool set -t string db/menuscreen/desktop "0" -f -s system::vconf_inhouse diff --git a/meta-tizen/recipes-tizen/ail/ail_git.bb b/meta-tizen/recipes-tizen/ail/ail_git.bb index b664190..0a41a29 100644 --- a/meta-tizen/recipes-tizen/ail/ail_git.bb +++ b/meta-tizen/recipes-tizen/ail/ail_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=84d6c89b12efe4af20c21ced0e7775035b3d50e4;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=e252503f15cb8c3d3401178f926762498ab9aedb;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/ail/files/remove-dlog-for-native-build.patch b/meta-tizen/recipes-tizen/ail/files/remove-dlog-for-native-build.patch index 87d761b..9cb77ba 100644 --- a/meta-tizen/recipes-tizen/ail/files/remove-dlog-for-native-build.patch +++ b/meta-tizen/recipes-tizen/ail/files/remove-dlog-for-native-build.patch @@ -18,8 +18,8 @@ index 2c3fafe..9adea33 100644 INCLUDE(FindPkgConfig) --pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 dlog db-util xdgmime vconf libtzplatform-config) -+pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 db-util xdgmime vconf libtzplatform-config) +-pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 dlog db-util xdgmime vconf libtzplatform-config libsmack) ++pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 db-util xdgmime vconf libtzplatform-config libsmack) STRING(REPLACE ";" " " EXTRA_CFLAGS "${LPKGS_CFLAGS}") SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") -- 2.7.4