Merge remote-tracking branch 'origin/tizen_3.0' into artik_3.0

Change-Id: I1caed48929d239863c7bf8e7498b36fde0fd072d

22 files changed, 89 insertions, 31 deletions

diff --git a/common-repos.yaml b/common-repos.yaml
index 7919150..e2360d7 100644
--- a/common-repos.yaml
+++ b/common-repos.yaml
@@ -4,5 +4,5 @@ Repositories:
         Options: --ssl_verify=no
 
     -   Name: base_arm
-        Url:  http://download.tizen.org/snapshots/tizen/base/latest/repos/arm/packages/
+        Url:  http://download.tizen.org/snapshots/tizen/3.0-base/latest/repos/arm/packages/
         Options: --ssl_verify=no
diff --git a/common.yaml b/common.yaml
index 85d2b22..b7d411f 100644
--- a/common.yaml
+++ b/common.yaml
@@ -17,18 +17,12 @@ Default:
     Desktop: None
     SaveRepos: False
     UserGroups: "audio,video"
-    Groups:
-        - Generic Adaptation
-        - Common Adaptation
-    PostScripts:
-        - generic-adaptation
-        - common-adaptation
-    NoChrootScripts:
-        - buildname
 
 Minimal:
     Part: common-mbr
     Groups:
+        - Generic Adaptation
+        - Common Adaptation
         - Generic Base
         - Common Base
         - Generic Console Tools
@@ -36,16 +30,25 @@ Minimal:
         - Generic Packaging
         - Common Packaging
     PostScripts:
+        - generic-adaptation
+        - common-adaptation
         - generic-base
         - common-base
         - generic-console-tools
         - generic-packaging
         - common-packaging
     Repos: []
+    NoChrootScripts:
+        - buildname
 
 Artik:
     Part: common-mbr-3parts
+    Groups:
+        - Generic Adaptation
+        - Common Adaptation
     PostScripts:
+        - generic-adaptation
+        - common-adaptation
         - generic-base
         - common-base
         - generic-wayland
@@ -62,12 +65,23 @@ Artik:
         - generic-qt5
         - common-qt5
         - generic-security
+        - generic-fixed-multiuser
     Repos: []
+    NoChrootScripts:
+        - buildname
 
 Installer:
     Part: common-mbr
+    Groups:
+        - Generic Adaptation
+        - Common Adaptation
+    PostScripts:
+        - generic-adaptation
+        - common-adaptation
     BootloaderAppend: "rw vga=current quiet splash rootwait rootfstype=ext4"
     Repos: []
+    NoChrootScripts:
+        - buildname
 
 Boot-Odroidu3:
     Part: common-mbr-boot
@@ -118,6 +132,8 @@ Wayland:
     Part: common-mbr
     UserGroups: "audio,video"
     Groups:
+        - Generic Adaptation
+        - Common Adaptation
         - Generic Base
         - Common Base
         - Generic Console Tools
@@ -144,6 +160,8 @@ Wayland:
         - Common Input Framework
         - Common Telephony
     PostScripts:
+        - generic-adaptation
+        - common-adaptation
         - generic-base
         - common-base
         - generic-console-tools
@@ -163,4 +181,7 @@ Wayland:
         - generic-qt5
         - common-qt5
         - generic-security
+        - generic-fixed-multiuser
     Repos: []
+    NoChrootScripts:
+        - buildname
diff --git a/ks/common-boot-arm64-juno.yaml b/ks/common-boot-arm64-juno.yaml
index 5fdb6de..49e6f0b 100644
--- a/ks/common-boot-arm64-juno.yaml
+++ b/ks/common-boot-arm64-juno.yaml
@@ -9,4 +9,3 @@ FileName: common-boot-arm64-juno
 Group: Common Boot Juno
 Repos:
     - common-wayland_arm64
-    - base_arm64
\ No newline at end of file
diff --git a/ks/common-boot-armv7l-artik10.yaml b/ks/common-boot-armv7l-artik10.yaml
index 5f41d72..dfc1171 100644
--- a/ks/common-boot-armv7l-artik10.yaml
+++ b/ks/common-boot-armv7l-artik10.yaml
@@ -14,4 +14,3 @@ Attachment:
     - /boot/u-boot/u-boot.bin
 Repos:
     - common-wayland_armv7l
-    - base_arm
diff --git a/ks/common-boot-armv7l-artik5.yaml b/ks/common-boot-armv7l-artik5.yaml
index 90e39dc..d42c968 100644
--- a/ks/common-boot-armv7l-artik5.yaml
+++ b/ks/common-boot-armv7l-artik5.yaml
@@ -14,4 +14,3 @@ Attachment:
     - /boot/u-boot/u-boot.bin
 Repos:
     - common-wayland_armv7l
-    - base_arm
diff --git a/ks/common-boot-armv7l-odroidu3.yaml b/ks/common-boot-armv7l-odroidu3.yaml
index cb073d0..fbb2d1d 100644
--- a/ks/common-boot-armv7l-odroidu3.yaml
+++ b/ks/common-boot-armv7l-odroidu3.yaml
@@ -12,4 +12,3 @@ Attachment:
     - /var/tmp/u-boot/params.bin
 Repos:
     - common-wayland_armv7l
-    - base_arm
\ No newline at end of file
diff --git a/ks/common-boot-armv7l-odroidxu3.yaml b/ks/common-boot-armv7l-odroidxu3.yaml
index 6dc41b7..fa621a9 100644
--- a/ks/common-boot-armv7l-odroidxu3.yaml
+++ b/ks/common-boot-armv7l-odroidxu3.yaml
@@ -12,4 +12,3 @@ Attachment:
     - /var/tmp/u-boot-xu3/params.bin
 Repos:
     - common-wayland_armv7l
-    - base_arm
diff --git a/ks/common-emulator-wayland-3parts-i586.yaml b/ks/common-emulator-wayland-3parts-i586.yaml
index 5a07c6f..36a301f 100644
--- a/ks/common-emulator-wayland-3parts-i586.yaml
+++ b/ks/common-emulator-wayland-3parts-i586.yaml
@@ -18,7 +18,6 @@ ExtraPackages:
     - dlogbackend-logger
 Groups:
     - Common Adaptation Emulator
-    - Common Adaptation Intel
     - Generic Multimedia Intel
     - Generic Setup Boot Bios
 PostScripts:
diff --git a/ks/common-emulator-wayland-mbr-i586.yaml b/ks/common-emulator-wayland-mbr-i586.yaml
index 6a63553..ef42333 100644
--- a/ks/common-emulator-wayland-mbr-i586.yaml
+++ b/ks/common-emulator-wayland-mbr-i586.yaml
@@ -19,7 +19,6 @@ ExtraPackages:
     - dlogbackend-logger
 Groups:
     - Common Adaptation Emulator
-    - Common Adaptation Intel
     - Generic Multimedia Intel
     - Generic Setup Boot Bios
 PostScripts:
diff --git a/ks/common-wayland-2parts-armv7l.yaml b/ks/common-wayland-2parts-armv7l.yaml
index b1088b5..cad7502 100644
--- a/ks/common-wayland-2parts-armv7l.yaml
+++ b/ks/common-wayland-2parts-armv7l.yaml
@@ -10,3 +10,5 @@ Kernel: kernel-profile-common
 Repos:
     - common-wayland_armv7l
     - base_arm
+Groups:
+    - Common Adaptation Intel
diff --git a/ks/common-wayland-efi-i586.yaml b/ks/common-wayland-efi-i586.yaml
index 594ad4c..55835d7 100644
--- a/ks/common-wayland-efi-i586.yaml
+++ b/ks/common-wayland-efi-i586.yaml
@@ -13,7 +13,6 @@ Repos:
     - common-wayland_i586
     - base_ia32
 Groups:
-    - Common Adaptation Emulator
     - Common Adaptation Intel
     - Generic Multimedia Intel
     - Generic Setup Boot
diff --git a/ks/common-wayland-efi-x86_64.yaml b/ks/common-wayland-efi-x86_64.yaml
index fafd38d..aa655ef 100644
--- a/ks/common-wayland-efi-x86_64.yaml
+++ b/ks/common-wayland-efi-x86_64.yaml
@@ -13,7 +13,6 @@ Repos:
     - common-wayland_x86_64
     - base_x86_64
 Groups:
-    - Common Adaptation Emulator
     - Common Adaptation Intel
     - Generic Multimedia Intel
     - Generic Setup Boot
diff --git a/ks/common-wayland-mbr-i586.yaml b/ks/common-wayland-mbr-i586.yaml
index e659ed1..ce3063b 100644
--- a/ks/common-wayland-mbr-i586.yaml
+++ b/ks/common-wayland-mbr-i586.yaml
@@ -13,7 +13,6 @@ Repos:
     - common-wayland_i586
     - base_ia32
 Groups:
-    - Common Adaptation Emulator
     - Common Adaptation Intel
     - Generic Multimedia Intel
     - Generic Setup Boot Bios
diff --git a/ks/common-wayland-mbr-x86_64.yaml b/ks/common-wayland-mbr-x86_64.yaml
index 6312f84..3229aee 100644
--- a/ks/common-wayland-mbr-x86_64.yaml
+++ b/ks/common-wayland-mbr-x86_64.yaml
@@ -13,7 +13,6 @@ Repos:
     - common-wayland_x86_64
     - base_x86_64
 Groups:
-    - Common Adaptation Emulator
     - Common Adaptation Intel
     - Generic Multimedia Intel
     - Generic Setup Boot Bios
diff --git a/patterns/common-adaptation-artik-headless.yaml b/patterns/common-adaptation-artik-headless.yaml
index 7ce6c76..28fae91 100644
--- a/patterns/common-adaptation-artik-headless.yaml
+++ b/patterns/common-adaptation-artik-headless.yaml
@@ -204,7 +204,6 @@ Packages:
 - libgobject
 - libgpg-error
 - libgthread
-- libgudev
 - libgum
 - libhangul
 - libharfbuzz
@@ -469,7 +468,6 @@ Packages:
 - mmsvc-player
 - mmsvc-recorder
 - wgt-backend
-- widget_toolkit
 #From TRE-321
 - capi-media-camera
 - capi-media-codec
@@ -535,3 +533,16 @@ Packages:
 - device-manager-plugin-artik
 #From TRE-666
 - capi-telephony
+#From TRE-681
+- d2d-conv-manager
+- d2d-conv-manager-lib
+#From TRE-709
+- org.tizen.dpm-toolkit
+#From TRE-717
+- download-fonts-service
+#From TRE-750
+- system-upgrade
+#From TRE-754
+- systemd-user-helper
+#From TRE-762
+- tts-engine-rsc
diff --git a/patterns/common-adaptation-artik.yaml b/patterns/common-adaptation-artik.yaml
index 33b858a..5eafa47 100644
--- a/patterns/common-adaptation-artik.yaml
+++ b/patterns/common-adaptation-artik.yaml
@@ -226,7 +226,6 @@ Packages:
 #From TRE-71
 - device-policy-manager
 - libdpm
-- org.tizen.ode
 - org.tizen.dpm-syspopup
 #From TRE-168
 - app2sd
@@ -289,7 +288,6 @@ Packages:
 - libwidget_viewer
 - nfc-client-lib-neard
 - pepper
-- widget_toolkit
 #From TRE-346, TRE-493
 - org.tizen.stt-engine-default
 #From TRE-218
@@ -334,3 +332,16 @@ Packages:
 #From TRE-666
 - capi-telephony
 - libtcore
+#From TRE-681
+- d2d-conv-manager
+- d2d-conv-manager-lib
+#From TRE-700
+- maps-plugin-mapzen
+#From TRE-717
+- download-fonts-service
+#From TRE-750
+- system-upgrade
+#From TRE-754
+- systemd-user-helper
+#From TRE-762
+- tts-engine-rsc
diff --git a/patterns/common-adaptation-emulator.yaml b/patterns/common-adaptation-emulator.yaml
index ef168d0..3f2b016 100644
--- a/patterns/common-adaptation-emulator.yaml
+++ b/patterns/common-adaptation-emulator.yaml
@@ -4,3 +4,13 @@ Name: common-adaptation-emulator
 Packages:
 - audio-hal-emul
 - mmfw-sysconf-simulator
+- coregl
+- device-manager-plugin-emul
+- emulator-yagl
+- emuld
+- libpciaccess
+- libtbm-vigs
+- libtdm-client
+- libtdm-drm
+- model-config-emulator
+- system-plugin-emulator
diff --git a/patterns/common-adaptation-intel.yaml b/patterns/common-adaptation-intel.yaml
index 9486ce0..416aea6 100644
--- a/patterns/common-adaptation-intel.yaml
+++ b/patterns/common-adaptation-intel.yaml
@@ -4,3 +4,4 @@ Name: common-adaptation-intel
 Packages:
 - libtdm-drm
 - libtbm-dumb
+- model-config-generic
diff --git a/patterns/common-adaptation-odroid.yaml b/patterns/common-adaptation-odroid.yaml
index a8fb578..09a48bb 100644
--- a/patterns/common-adaptation-odroid.yaml
+++ b/patterns/common-adaptation-odroid.yaml
@@ -10,7 +10,6 @@ Packages:
 - libomxil-e54xx
 - libwayland-egl
 - libtpl-egl
-#From TRE-220
-- org.tizen.dpm-toolkit
+- model-config-xu3
 #From TRE-627
 - device-manager-plugin-odroid
diff --git a/patterns/common-applications.yaml b/patterns/common-applications.yaml
index a2d3fd6..cf357d9 100644
--- a/patterns/common-applications.yaml
+++ b/patterns/common-applications.yaml
@@ -8,5 +8,4 @@ Packages:
 - org.tizen.menu-screen
 - data-provider-master
 - org.tizen.setting
-- org.tizen.ode
 - org.tizen.dpm-syspopup
diff --git a/patterns/common-middleware.yaml b/patterns/common-middleware.yaml
index 5ceceee..d612bb6 100644
--- a/patterns/common-middleware.yaml
+++ b/patterns/common-middleware.yaml
@@ -2,7 +2,6 @@ Summary: Common Middleware
 Description: Common Middleware
 Name: common-middleware
 Packages:
-- model-config-generic
 - ofono
 - neard
 - neardal
@@ -65,3 +64,18 @@ Packages:
 - vconf-internal-keys-config-profile_common
 #From TRE-624
 - libspeex
+#From TRE-681
+- d2d-conv-manager
+- d2d-conv-manager-lib
+#From TRE-700
+- maps-plugin-mapzen
+#From TRE-709
+- org.tizen.dpm-toolkit
+#From TRE-717
+- download-fonts-service
+#From TRE-750
+- system-upgrade
+#From TRE-754
+- systemd-user-helper
+#From TRE-762
+- tts-engine-rsc
diff --git a/scripts/common-wayland.post b/scripts/common-wayland.post
index 069d15f..cb43d6a 100644
--- a/scripts/common-wayland.post
+++ b/scripts/common-wayland.post
@@ -22,7 +22,8 @@ fi
 
 #}
 
-# 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 Common: @BUILD_ID@ $arch" ffffff 50 90 95 95
+# tag the background image with the current snapshot id and change the background image
+mv /opt/share/settings/Wallpapers/home_001.png /opt/share/settings/Wallpapers/home_005.png
+ln -fs /opt/share/settings/Wallpapers/home_004.png /opt/share/settings/Wallpapers/home_001.png
+/usr/bin/mark_image.py /opt/share/settings/Wallpapers/home_001.png "Tizen 3.0 Common: @BUILD_ID@" ffffff 10 60 95 70