From 012ce77c1ec0cf3934c21a3ed3661a878c1f64b9 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Wed, 4 Sep 2019 10:13:47 -0400
Subject: [PATCH] Config file changes  for packages being relocated to repo
 'compile'

List of relocated subdirectories:

base/bash
base/golang-dep
base/rpm
python/python-2.7.5
base/golang

Story: 2006166
Task: 35687
Depends-On: I665dc7fabbfffc798ad57843eb74dca16e7647a3
Depends-On: I947cab3787dd323ef0fc50ec64f172d2df6459e9
Change-Id: I840888f0b012e9fb24e72f4e6a46567e6f949df7
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 centos_iso_image.inc      | 2 --
 centos_pkg_dirs           | 5 -----
 centos_pkg_dirs_installer | 1 -
 3 files changed, 8 deletions(-)

diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index e60dfd880..211bb18c5 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -288,8 +288,6 @@ kubernetes-client
 # resource-agents
 resource-agents
 
-# bash
-bash
 
 # haproxy
 haproxy
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index df4240c52..798a66a67 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -14,7 +14,6 @@ config/facter
 virt/qemu
 filesystem/nfscheck
 utilities/update-motd
-python/python-2.7.5
 python/python-setuptools
 virt/libvirt
 virt/libvirt-python
@@ -116,12 +115,10 @@ kernel/kernel-modules/qat17
 kernel/kernel-modules/tpmdd
 kernel/kernel-modules/integrity
 kernel/kernel-modules/drbd
-base/rpm
 base/dpkg
 base/cgcs-users
 base/cluster-resource-agents
 base/libfdt
-base/bash
 base/haproxy
 base/haproxy-config
 filesystem/iscsi-initiator-utils-config
@@ -132,8 +129,6 @@ database/mariadb
 database/python-psycopg2
 base/dnsmasq
 base/dnsmasq-config
-base/golang
-base/golang-dep
 filesystem/parted
 security/python-keyring
 grub/grub2
diff --git a/centos_pkg_dirs_installer b/centos_pkg_dirs_installer
index a1e41ea71..03b52a7a4 100644
--- a/centos_pkg_dirs_installer
+++ b/centos_pkg_dirs_installer
@@ -1,2 +1 @@
-base/rpm
 base/anaconda