From 2072985b4d55c68ca0e9fc739b07b4d06595b1f0 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Wed, 15 Aug 2018 14:12:00 -0400
Subject: [PATCH] Split image.inc across git repos

Currently compiling a new package and adding it
to the iso still requires a multi-git update because
image.inc is a single centralized file in the root git.

It would be better to allow a single git update to add
a package. Too allow this, image.inc must be split across
the git repos and the build tools must be changed to
read/merge those files to arrive at the final package list.

Current scheme is to name the image.inc files using this
schema.

${distro}_${build_target}_image_${build_type}.inc

distro = centos, ...
build_target = iso, guest ...
build_type = std, rt ...

Traditionally build_type=std is omitted from config files,
so we instead use ${distro}_${build_target}_image.inc.

Change-Id: I935a0abfea7f3799becd18d172d412e09eb4d55c
Story: 2003447
Task:  24649
Depends-On: Ib39b8063e7759842ba15330c68503bfe2dea6e20
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 centos_guest_image.inc    | 16 ++++++++++++++++
 centos_guest_image_rt.inc | 16 ++++++++++++++++
 centos_iso_image.inc      | 20 ++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 centos_guest_image.inc
 create mode 100644 centos_guest_image_rt.inc
 create mode 100644 centos_iso_image.inc

diff --git a/centos_guest_image.inc b/centos_guest_image.inc
new file mode 100644
index 00000000..e22c777a
--- /dev/null
+++ b/centos_guest_image.inc
@@ -0,0 +1,16 @@
+# List of packages to be included/installed in guest image
+# If these have dependencies, they will be pulled in automatically
+#
+
+#
+# guest extensions
+#
+
+# guest-client
+guest-client
+
+# guest-scale-agent
+guest-scale-agent
+
+# host-guest-comm
+guest-host-comm
diff --git a/centos_guest_image_rt.inc b/centos_guest_image_rt.inc
new file mode 100644
index 00000000..21cb7cde
--- /dev/null
+++ b/centos_guest_image_rt.inc
@@ -0,0 +1,16 @@
+# List of packages to be included/installed in RT guest image
+# If these have dependencies, they will be pulled in automatically
+#
+
+#
+# guest extensions
+#
+
+# guest-client
+guest-client
+
+# guest-scale-agent
+guest-scale-agent
+
+# host-guest-comm
+guest-host-comm
diff --git a/centos_iso_image.inc b/centos_iso_image.inc
new file mode 100644
index 00000000..301a5c3c
--- /dev/null
+++ b/centos_iso_image.inc
@@ -0,0 +1,20 @@
+# List of packages to be included/installed in ISO
+# If these have dependencies, they will be pulled in automatically
+#
+
+# nova-api-proxy
+nova-api-proxy
+
+# guest-scale-agent
+guest-scale-helper
+
+# host-guest-comm
+host-guest-comm
+
+# nfv
+nfv
+nfv-common
+nfv-plugins
+nfv-tools
+nfv-vim
+nfv-client