Add ivi repos for x86_64 images

diff --git a/ks/ivi-efi-i586.yaml b/ks/ivi-efi-i586.yaml
index e342fdf..2aedcb3 100644 (file)
--- a/ks/ivi-efi-i586.yaml
+++ b/ks/ivi-efi-i586.yaml
@@ -8,6 +8,7 @@ Part: ivi-efi
 FileName: ivi-efi-i586
 Kernel: kernel-x86-ivi
 ExtraPackages:
+    - ivi-repos
     - setup-efi-ivi
 PostScripts:
     - efi

diff --git a/ks/ivi-efi-x86_64.yaml b/ks/ivi-efi-x86_64.yaml
index fcad0f4..c6d50fa 100644 (file)
--- a/ks/ivi-efi-x86_64.yaml
+++ b/ks/ivi-efi-x86_64.yaml
@@ -11,6 +11,7 @@ Kernel: kernel-adaptation-pc
 Architecture: x86_64
 Kernel: kernel-adaptation-pc
 ExtraPackages:
+    - ivi-repos-x86_64
     - setup-efi-ivi
 RemovePackages:
     - GhostCluster

diff --git a/ks/ivi-mbr-i586.yaml b/ks/ivi-mbr-i586.yaml
index 5420486..e98d3c1 100644 (file)
--- a/ks/ivi-mbr-i586.yaml
+++ b/ks/ivi-mbr-i586.yaml
@@ -5,3 +5,5 @@ Platform: Wayland-i586
 Part: ivi-mbr
 FileName: ivi-mbr-i586
 Kernel: kernel-x86-ivi
+ExtraPackages:
+    - ivi-repos

diff --git a/ks/ivi-mbr-x86_64.yaml b/ks/ivi-mbr-x86_64.yaml
index 1b36cd5..a3ccbef 100644 (file)
--- a/ks/ivi-mbr-x86_64.yaml
+++ b/ks/ivi-mbr-x86_64.yaml
@@ -7,6 +7,8 @@ FileName: ivi-mbr-x86_64
 Architecture: x86_64
 Kernel: kernel-adaptation-pc
 Architecture: x86_84
+ExtraPackages:
+    - ivi-repos-x86_64
 RemovePackages:
     - GhostCluster
     - sdbd

diff --git a/ks/ivi-min-efi-i586.yaml b/ks/ivi-min-efi-i586.yaml
index fd1820d..79fc7aa 100644 (file)
--- a/ks/ivi-min-efi-i586.yaml
+++ b/ks/ivi-min-efi-i586.yaml
@@ -8,6 +8,7 @@ Part: ivi-efi
 FileName: ivi-min-efi-i586
 Kernel: kernel-x86-ivi
 ExtraPackages:
+    - ivi-repos
     - setup-efi-ivi
 PostScripts:
     - base-ivi-minimal

diff --git a/ks/ivi-min-efi-x86_64.yaml b/ks/ivi-min-efi-x86_64.yaml
index be3eb9d..4d77873 100644 (file)
--- a/ks/ivi-min-efi-x86_64.yaml
+++ b/ks/ivi-min-efi-x86_64.yaml
@@ -9,6 +9,7 @@ FileName: ivi-min-efi-x86_64
 Architecture: x86_64
 Kernel: kernel-adaptation-pc
 ExtraPackages:
+    - ivi-repos-x86_64
     - setup-efi-ivi
 RemovePackage:
     - sdbd

diff --git a/ks/ivi-min-mbr-i586.yaml b/ks/ivi-min-mbr-i586.yaml
index fefcdef..a9b2a76 100644 (file)
--- a/ks/ivi-min-mbr-i586.yaml
+++ b/ks/ivi-min-mbr-i586.yaml
@@ -5,5 +5,7 @@ Platform: Default
 Part: ivi-mbr
 FileName: ivi-min-mbr-i586
 Kernel: kernel-x86-ivi
+ExtraPackages:
+    - ivi-repos
 PostScripts:
     - base-ivi-minimal

diff --git a/ks/ivi-min-mbr-x86_64.yaml b/ks/ivi-min-mbr-x86_64.yaml
index 4273d0c..de022dc 100644 (file)
--- a/ks/ivi-min-mbr-x86_64.yaml
+++ b/ks/ivi-min-mbr-x86_64.yaml
@@ -6,6 +6,8 @@ Part: ivi-mbr
 FileName: ivi-min-mbr-x86_64
 Architecture: x86_64
 Kernel: kernel-adaptation-pc
+ExtraPackages:
+    - ivi-repos-x86_64
 RemovePackages:
     - sdbd
 PostScripts:

diff --git a/ks/ivi-release-efi-i586.yaml b/ks/ivi-release-efi-i586.yaml
index 1d42374..b807bfc 100644 (file)
--- a/ks/ivi-release-efi-i586.yaml
+++ b/ks/ivi-release-efi-i586.yaml
@@ -10,7 +10,5 @@ Kernel: kernel-x86-ivi
 ExtraPackages:
     - release-repos
     - setup-efi-ivi
-RemovePackages:
-    - ivi-repos
 PostScripts:
     - efi

diff --git a/ks/ivi-release-efi-x86_64.yaml b/ks/ivi-release-efi-x86_64.yaml
index da7baa4..aef8385 100644 (file)
--- a/ks/ivi-release-efi-x86_64.yaml
+++ b/ks/ivi-release-efi-x86_64.yaml
@@ -9,9 +9,7 @@ InstallerFrameworkPlugins:
 Architecture: x86_64
 Kernel: kernel-adaptation-pc
 ExtraPackages:
-    - release-repos
+    - release-repos-x86_64
     - setup-efi-ivi
-RemovePackages:
-    - ivi-repos
 PostScripts:
     - efi

diff --git a/ks/ivi-release-mbr-i586.yaml b/ks/ivi-release-mbr-i586.yaml
index 763a454..067f0b3 100644 (file)
--- a/ks/ivi-release-mbr-i586.yaml
+++ b/ks/ivi-release-mbr-i586.yaml
@@ -7,5 +7,3 @@ FileName: ivi-release-mbr-i586
 Kernel: kernel-x86-ivi
 ExtraPackages:
     - release-repos
-RemovePackages:
-    - ivi-repos

diff --git a/ks/ivi-release-mbr-x86_64.yaml b/ks/ivi-release-mbr-x86_64.yaml
index 30950b5..3777e9e 100644 (file)
--- a/ks/ivi-release-mbr-x86_64.yaml
+++ b/ks/ivi-release-mbr-x86_64.yaml
@@ -7,6 +7,4 @@ FileName: ivi-release-mbr-x86_64
 Architecture: x86_64
 Kernel: kernel-adaptation-pc
 ExtraPackages:
-    - release-repos
-RemovePackages:
-    - ivi-repos
+    - release-repos-x86_64

diff --git a/packaging/meta-ivi.changes b/packaging/meta-ivi.changes
index 26d2259..73a77f1 100644 (file)
--- a/packaging/meta-ivi.changes
+++ b/packaging/meta-ivi.changes
@@ -1,3 +1,6 @@
+* Thu Aug 15 18:50:56 UTC 2013 - tracy.graydon@intel.com
+- Add repos for x86_64 images.
+
 *Tue Aug 13 23:45:10 UTC 2013 - tracy.graydon@intel.com
 - Add nfc/neard packages back in now that bluetooth-tools dep is fixed 
 

diff --git a/patterns/ivi-packaging.yaml b/patterns/ivi-packaging.yaml
index dc111f4..1939b39 100644 (file)
--- a/patterns/ivi-packaging.yaml
+++ b/patterns/ivi-packaging.yaml
@@ -2,6 +2,5 @@ Description: IVI Packaging
 Name: ivi-packaging
 Packages:
 - zypper
-- ivi-repos
 - yum
 Summary: IVI Packaging