From 578251031f63c8f5b9f9c9710872bddd0934a30e Mon Sep 17 00:00:00 2001
From: Joonsub Lee <joon-sub.lee@samsung.com>
Date: Tue, 22 Dec 2015 19:20:03 +0900
Subject: [PATCH] Enable Wayland image creation

Change-Id: I5d95514663b9b0ecd6b81b2a963cff350d5d1ad7
Signed-off-by: Joonsub Lee <joon-sub.lee@samsung.com>
---
 ks/wearable-boot-armv7l-odroidu3.yaml           |  2 +-
 ks/wearable-wayland-3parts-armv7l-odroidu3.yaml | 10 ++++++++++
 ks/wearable-x11-3parts-armv7l-odroidu3.yaml     | 10 ----------
 patterns/wearable-wayland.yaml                  | 11 +++++++++++
 scripts/wearable-x11.post                       |  7 -------
 wearable-repos.yaml                             |  4 ++--
 wearable-targets.yaml                           |  4 ++--
 wearable.yaml                                   |  7 ++-----
 8 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 ks/wearable-wayland-3parts-armv7l-odroidu3.yaml
 delete mode 100644 ks/wearable-x11-3parts-armv7l-odroidu3.yaml
 create mode 100644 patterns/wearable-wayland.yaml
 delete mode 100644 scripts/wearable-x11.post

diff --git a/ks/wearable-boot-armv7l-odroidu3.yaml b/ks/wearable-boot-armv7l-odroidu3.yaml
index b27a120..86673f9 100644
--- a/ks/wearable-boot-armv7l-odroidu3.yaml
+++ b/ks/wearable-boot-armv7l-odroidu3.yaml
@@ -11,4 +11,4 @@ Attachment:
     - /var/tmp/u-boot/u-boot-mmc.bin
     - /var/tmp/u-boot/params.bin
 Repos:
-    - wearable-x11_armv7l
+    - wearable-wayland_armv7l
diff --git a/ks/wearable-wayland-3parts-armv7l-odroidu3.yaml b/ks/wearable-wayland-3parts-armv7l-odroidu3.yaml
new file mode 100644
index 0000000..4258b5a
--- /dev/null
+++ b/ks/wearable-wayland-3parts-armv7l-odroidu3.yaml
@@ -0,0 +1,10 @@
+Name: wearable-Wayland-3parts-armv7l-odroidu3
+Architecture: armv7l
+Schedule: "*"
+Active: False
+Platform: Wayland
+Part: wearable-mbr-3parts
+Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+FileName: wearable-wayland-3parts-armv7l-odroidu3
+Repos:
+    - wearable-wayland_armv7l
diff --git a/ks/wearable-x11-3parts-armv7l-odroidu3.yaml b/ks/wearable-x11-3parts-armv7l-odroidu3.yaml
deleted file mode 100644
index e4782ba..0000000
--- a/ks/wearable-x11-3parts-armv7l-odroidu3.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-Name: wearable-x11-3parts-armv7l-odroidu3
-Architecture: armv7l
-Schedule: "*"
-Active: False
-Platform: X11
-Part: wearable-mbr-3parts
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
-FileName: wearable-x11-3parts-armv7l-odroidu3
-Repos:
-    - wearable-x11_armv7l
diff --git a/patterns/wearable-wayland.yaml b/patterns/wearable-wayland.yaml
new file mode 100644
index 0000000..b3d335a
--- /dev/null
+++ b/patterns/wearable-wayland.yaml
@@ -0,0 +1,11 @@
+Summary: Wearable Wayland
+Description: Wearable Wayland
+Name: wearable-wayland
+Packages: 
+- at-spi2-core
+- libatspi0
+- typelib-1_0-Atspi-2_0
+- libatk-bridge-2_0-0
+- atk-locale
+- libatk
+- typelib-Atk
diff --git a/scripts/wearable-x11.post b/scripts/wearable-x11.post
deleted file mode 100644
index 5666e9d..0000000
--- a/scripts/wearable-x11.post
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-echo "#################### wearable-x11.post ##################"
-
-# tag the background image with the current snapshot id
-arch=$(rpm -qa | grep kernel-common | awk -F- '{printf("%s %s",$3,$4);}')
-/usr/bin/mark_image.py /usr/share/backgrounds/tizen/current "Tizen Wearable: @BUILD_ID@ $arch" ffffff 50 90 95 95
-
diff --git a/wearable-repos.yaml b/wearable-repos.yaml
index c93fea2..6686395 100644
--- a/wearable-repos.yaml
+++ b/wearable-repos.yaml
@@ -1,5 +1,5 @@
 Repositories:
-    -   Name: wearable-x11_armv7l
-        Url:  http://download.tizen.org/snapshots/tizen/wearable/@BUILD_ID@/repos/arm-x11/packages/
+    -   Name: wearable-wayland_armv7l
+        Url:  http://download.tizen.org/snapshots/tizen/wearable/@BUILD_ID@/repos/arm-wayland/packages/
         Options: --ssl_verify=no
 
diff --git a/wearable-targets.yaml b/wearable-targets.yaml
index 47ad585..70306cd 100644
--- a/wearable-targets.yaml
+++ b/wearable-targets.yaml
@@ -1,6 +1,6 @@
 ---
 Targets:
-    -   Name: arm-x11
+    -   Name: arm-wayland
         Images:
             - wearable-boot-armv7l-odroidu3.yaml
-            - wearable-x11-3parts-armv7l-odroidu3.yaml
+            - wearable-wayland-3parts-armv7l-odroidu3.yaml
diff --git a/wearable.yaml b/wearable.yaml
index f1bbf98..889828a 100644
--- a/wearable.yaml
+++ b/wearable.yaml
@@ -27,7 +27,7 @@ Boot-Odroidu3:
         - Wearable Boot Odroid U3
     Repos: []
 
-X11:
+Wayland:
     Part: wearable-mbr
     UserGroups: "audio,video"
     Groups:
@@ -38,8 +38,7 @@ X11:
         - Wearable Packaging
         - Generic Adaptation
         - Wearable Adaptation
-        - Generic X11
-        - Wearable X11
+        - Wearable Wayland
         - Wearable Middleware
         - Generic Applications
         - Wearable Applications
@@ -65,8 +64,6 @@ X11:
         - wearable-packaging
         - generic-adaptation
         - wearable-adaptation
-        - generic-x11
-        - wearable-x11
         - wearable-middleware
         - generic-applications
         - generic-bluetooth
-- 
2.7.4