From 30e2d1085156590be3e616a7cb9e3ae7396cd7e8 Mon Sep 17 00:00:00 2001
From: "Graydon, Tracy" <tracy.graydon@intel.com>
Date: Fri, 13 Sep 2013 16:27:59 -0700
Subject: [PATCH] Undo the zypper workaround; add saythis and openavb

---
 ivi.yaml                        |  5 +++--
 packaging/meta-ivi.changes      |  4 ++++
 patterns/ivi-applications.yaml  |  3 ++-
 patterns/ivi-console-tools.yaml | 26 --------------------------
 patterns/ivi-middleware.yaml    |  2 ++
 5 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 patterns/ivi-console-tools.yaml

diff --git a/ivi.yaml b/ivi.yaml
index 8a55948..0acede8 100644
--- a/ivi.yaml
+++ b/ivi.yaml
@@ -23,6 +23,7 @@ Default:
     Groups:
         - Base System
         - IVI Adaptation
+        - IVI Packaging
     PostScripts:
         - base-general
         - rpm
@@ -35,7 +36,7 @@ Wayland-i586:
     Groups:
         - IVI Middleware
         - Wayland
-        - IVI Console Tools
+        - Console Tools
         - IVI Applications
     PostScripts:
         - base-weston-default
@@ -46,7 +47,7 @@ Wayland-x86_64:
     Groups:
         - IVI Middleware x86_64
         - Wayland
-        - IVI Console Tools
+        - Console Tools
         - IVI Applications x86_64
     PostScripts:
         - base-weston-default
diff --git a/packaging/meta-ivi.changes b/packaging/meta-ivi.changes
index cab4891..bd89474 100644
--- a/packaging/meta-ivi.changes
+++ b/packaging/meta-ivi.changes
@@ -1,3 +1,7 @@
+* Fri Sep 13 23:26:43 UTC 2013 - tracy.graydon@intel.com
+- Add zypper, openavb, saythis to patterns.
+- Undue the ivi-console-tools workaround for zypper 
+
 *Fri Sep 13 06:50:54 UTC 2013 - tracy.graydon@intel.com
 - Drop openavb and zypper temporarily until they are resolvable by mic
 
diff --git a/patterns/ivi-applications.yaml b/patterns/ivi-applications.yaml
index dbb1184..8604d75 100644
--- a/patterns/ivi-applications.yaml
+++ b/patterns/ivi-applications.yaml
@@ -2,13 +2,14 @@ Description: IVI Applications
 Name: ivi-applications
 Packages:
 - GhostCluster
+- Settings
 - MediaPlayer
 - ca-certificates
 - ca-certificates-mozilla
 - evolution-data-server
 - festival
 - pocketsphinx
-- Settings
+- saythis
 - sphinxbase
 - webkit2-efl-test
 Summary: IVI Applications
diff --git a/patterns/ivi-console-tools.yaml b/patterns/ivi-console-tools.yaml
deleted file mode 100644
index a97712c..0000000
--- a/patterns/ivi-console-tools.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: IVI Console Tools
-Name: ivi-console-tools
-Packages:
-- tar
-- wget
-- grep
-- gzip
-- openssh
-- rsync
-- parted
-- zip
-- vim
-- unzip
-- less
-- xz
-- nano
-- curl
-- strace
-- diffutils
-- patch
-- findutils
-- wdiff
-- powertop
-- sudo
-- ca-certificates-mozilla
-Summary: IVI Console Tools
diff --git a/patterns/ivi-middleware.yaml b/patterns/ivi-middleware.yaml
index 4c0cbe9..524d957 100644
--- a/patterns/ivi-middleware.yaml
+++ b/patterns/ivi-middleware.yaml
@@ -33,6 +33,7 @@ Packages:
 - obexd-client
 - obexd-server
 - ofono
+- openavb
 - pulseaudio
 - pulseaudio-config
 - pulseaudio-locale
@@ -48,4 +49,5 @@ Packages:
 - wrt
 - wrt-installer
 - wrt-plugins-tizen
+- zypper
 Summary: IVI Middleware
-- 
2.7.4