From 4015097a31ac79b46a438b768b80ed83fd266227 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Fri, 2 May 2014 15:43:05 -0400
Subject: [PATCH] Update base element to make use of pkg-map

With this change package name to distro mappings used
within the base element are now stored in the top
level pkg-map file.

Additionally, all bin/install-packages commands are updated
to use the -m option so that the base element pkg-map
namespace is used by default.

Change-Id: I3bdbf987c8525f9ef67ca0c263651d6613f29ef0
---
 elements/base/element-deps                      |  1 +
 elements/base/install.d/00-baseline-environment |  2 +-
 elements/base/install.d/00-ccache               |  2 +-
 elements/base/install.d/99-dkms                 |  2 +-
 elements/base/pkg-map                           | 14 ++++++++++++++
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 elements/base/element-deps
 create mode 100644 elements/base/pkg-map

diff --git a/elements/base/element-deps b/elements/base/element-deps
new file mode 100644
index 00000000..ef25eec6
--- /dev/null
+++ b/elements/base/element-deps
@@ -0,0 +1 @@
+pkg-map
diff --git a/elements/base/install.d/00-baseline-environment b/elements/base/install.d/00-baseline-environment
index 449f5096..706537a2 100755
--- a/elements/base/install.d/00-baseline-environment
+++ b/elements/base/install.d/00-baseline-environment
@@ -4,4 +4,4 @@
 set -eu
 set -o pipefail
 
-install-packages vlan open-iscsi
+install-packages -m base vlan_package iscsi_package
diff --git a/elements/base/install.d/00-ccache b/elements/base/install.d/00-ccache
index 8d2c7452..8a581105 100755
--- a/elements/base/install.d/00-ccache
+++ b/elements/base/install.d/00-ccache
@@ -3,4 +3,4 @@
 set -eu
 set -o pipefail
 
-install-packages ccache
+install-packages -m base ccache_package
diff --git a/elements/base/install.d/99-dkms b/elements/base/install.d/99-dkms
index b8b7496c..cbffab9d 100755
--- a/elements/base/install.d/99-dkms
+++ b/elements/base/install.d/99-dkms
@@ -3,4 +3,4 @@
 set -eu
 set -o pipefail
 
-install-packages dkms
+install-packages -m base dkms_package
diff --git a/elements/base/pkg-map b/elements/base/pkg-map
new file mode 100644
index 00000000..344729f8
--- /dev/null
+++ b/elements/base/pkg-map
@@ -0,0 +1,14 @@
+{
+  "family": {
+    "redhat": {
+      "vlan_package": "vconfig",
+      "iscsi_package": "iscsi-initiator-utils"
+    }
+  },
+  "default": {
+    "ccache_package": "ccache",
+    "dkms_package": "dkms",
+    "vlan_package": "vlan",
+    "iscsi_package": "open-iscsi"
+  }
+}