From ce46b2b5e92dceb5872b9d2ec41a61f215c065d4 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 21 Mar 2014 18:13:13 +0100 Subject: [PATCH] Add crosswalk to wayland images Change-Id: Id007396b9a2feeb0a0647e6a07001847db242226 Signed-off-by: Stephane Desneux --- generic.yaml | 2 + ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml | 15 -------- ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml | 15 -------- ks/generic-wayland-xwalk-mbr-i586.yaml | 13 ------- ks/generic-wayland-xwalk-mbr-x86_64.yaml | 13 ------- patterns/generic-crosswalk.yaml | 2 + scripts/generic-crosswalk.post | 43 ++++++++++++++++++---- 7 files changed, 40 insertions(+), 63 deletions(-) delete mode 100644 ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml delete mode 100644 ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml delete mode 100644 ks/generic-wayland-xwalk-mbr-i586.yaml delete mode 100644 ks/generic-wayland-xwalk-mbr-x86_64.yaml diff --git a/generic.yaml b/generic.yaml index 8d60df7..85bcca9 100644 --- a/generic.yaml +++ b/generic.yaml @@ -45,6 +45,7 @@ Wayland: - Generic Bluetooth - Generic Multimedia - Generic Desktop Applications + - Generic Crosswalk PostScripts: - generic-wayland - generic-adaptation @@ -53,6 +54,7 @@ Wayland: - generic-bluetooth - generic-multimedia - generic-desktop-applications + - generic-crosswalk X11: Part: generic-mbr diff --git a/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml deleted file mode 100644 index 73930a8..0000000 --- a/ks/generic-qa-unsafe-wayland-xwalk-mbr-i586.yaml +++ /dev/null @@ -1,15 +0,0 @@ -Name: Generic QA Unsafe Wayland XWalk MBR i586 -Architecture: ia32 -Active: True -Platform: Wayland -Part: generic-mbr -FileName: generic-qa-unsafe-wayland-xwalk-mbr-i586 -Kernel: kernel-x86-generic -Repos: - - generic-wayland_i586 -Groups: - - Generic Crosswalk - - Generic Automated QA Tools -PostScripts: - - generic-crosswalk - - generic-autoqa diff --git a/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml b/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml deleted file mode 100644 index ef53458..0000000 --- a/ks/generic-qa-unsafe-wayland-xwalk-mbr-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ -Name: Generic QA Unsafe Wayland XWalk MBR x86_64 -Architecture: x86_64 -Active: True -Platform: Wayland -Part: generic-mbr -FileName: generic-qa-unsafe-wayland-xwalk-mbr-x86_64 -Kernel: kernel-x86-generic -Repos: - - generic-wayland_x86_64 -Groups: - - Generic Crosswalk - - Generic Automated QA Tools -PostScripts: - - generic-crosswalk - - generic-autoqa diff --git a/ks/generic-wayland-xwalk-mbr-i586.yaml b/ks/generic-wayland-xwalk-mbr-i586.yaml deleted file mode 100644 index 77d7c93..0000000 --- a/ks/generic-wayland-xwalk-mbr-i586.yaml +++ /dev/null @@ -1,13 +0,0 @@ -Name: Generic Wayland XWalk MBR i586 -Architecture: ia32 -Active: True -Platform: Wayland -Part: generic-mbr -FileName: generic-wayland-xwalk-mbr-i586 -Kernel: kernel-x86-generic -Repos: - - generic-wayland_i586 -Groups: - - Generic Crosswalk -PostScripts: - - generic-crosswalk diff --git a/ks/generic-wayland-xwalk-mbr-x86_64.yaml b/ks/generic-wayland-xwalk-mbr-x86_64.yaml deleted file mode 100644 index 8e7a7cf..0000000 --- a/ks/generic-wayland-xwalk-mbr-x86_64.yaml +++ /dev/null @@ -1,13 +0,0 @@ -Name: Generic Wayland XWalk MBR x86_64 -Architecture: x86_64 -Active: True -Platform: Wayland -Part: generic-mbr -FileName: generic-wayland-xwalk-mbr-x86_64 -Kernel: kernel-x86-generic -Repos: - - generic-wayland_x86_64 -Groups: - - Generic Crosswalk -PostScripts: - - generic-crosswalk diff --git a/patterns/generic-crosswalk.yaml b/patterns/generic-crosswalk.yaml index a1005d1..e391a87 100644 --- a/patterns/generic-crosswalk.yaml +++ b/patterns/generic-crosswalk.yaml @@ -3,4 +3,6 @@ Description: Generic Crosswalk Name: generic-crosswalk Packages: - crosswalk +- tizen-extensions-crosswalk +- wrt-widgets diff --git a/scripts/generic-crosswalk.post b/scripts/generic-crosswalk.post index cfd5678..e3ea16d 100644 --- a/scripts/generic-crosswalk.post +++ b/scripts/generic-crosswalk.post @@ -1,9 +1,32 @@ ############### generic-crosswalk.post ################ -# patch install path of crosswalk -if [ -d /usr/lib64/xwalk ]; then - ln -s ../lib64/xwalk /usr/lib -fi +# Initialize the native application database +pkg_initdb +ail_initdb + +# start wrt widgets preinstall +prepare_widgets.sh + +# install widgets at first run +cat </lib/systemd/user/xwalk_widgets_preinstall.service +[Unit] +Description=Installation of pre-installed widgets +After=dbus.service +ConditionPathExists=!/home/app/.config/xwalk-service/applications.db + +[Service] +Type=oneshot +ExecStart=/usr/bin/install_widgets.sh + +[Install] +WantedBy=weston.target +EOF + +mkdir -p /lib/systemd/user/xwalk.target.wants +ln -sf ../xwalk_widgets_preinstall.service /lib/systemd/user/weston.target.wants/xwalk_widgets_preinstall.service + + +# add launchers to weston.ini if [ -f /usr/bin/weston ]; then @@ -13,11 +36,17 @@ if [ -f /usr/bin/weston ]; then [launcher] icon=/usr/share/icons/tizen/32x32/web-browser.png -path=/usr/lib64/xwalk/xwalk http://www.tizen.org +path=/usr/lib64/xwalk/xwalk http://www.google.com [launcher] -icon=/usr/share/icons/tizen/32x32/web-browser.png -path=/usr/lib64/xwalk/xwalk http://www.google.com +icon=/usr/share/icons/tizen/32x32/annex.png +path=/usr/bin/xwalk-launcher hnabpnbionlaokfnobomjleblmmiefig + +[launcher] +icon=/usr/share/icons/tizen/32x32/bubblewrap.png +path=/usr/bin/xwalk-launcher kmnbdhfbkjkeilhpbooaecgpllbollfn + EOF fi + -- 2.7.4