Fix model-config mappingsubmit/tizen_3.0_common/20161203.060836accepted/tizen/3.0/common/20161203.061027

Change-Id: Ic0461973652728038e0fddf8830d7c0b3e008dbe
Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>

9 files changed, 4 insertions, 6 deletions

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-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 33216f4..09a48bb 100644
--- a/patterns/common-adaptation-odroid.yaml
+++ b/patterns/common-adaptation-odroid.yaml
@@ -10,5 +10,6 @@ Packages:
 - libomxil-e54xx
 - libwayland-egl
 - libtpl-egl
+- model-config-xu3
 #From TRE-627
 - device-manager-plugin-odroid
diff --git a/patterns/common-middleware.yaml b/patterns/common-middleware.yaml
index c7dc619..64342a7 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