From b4e8daaebea955fd0e1ab633c3583edc310894f3 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 26 Jun 2020 16:23:51 -0400
Subject: [PATCH] Incorporate common copy of apiclient into build

---
 confluent_osdeploy/common/{ => opt/confluent/bin}/apiclient | 0
 confluent_osdeploy/confluent_osdeploy.spec.tmpl             | 2 ++
 2 files changed, 2 insertions(+)
 rename confluent_osdeploy/common/{ => opt/confluent/bin}/apiclient (100%)

diff --git a/confluent_osdeploy/common/apiclient b/confluent_osdeploy/common/opt/confluent/bin/apiclient
similarity index 100%
rename from confluent_osdeploy/common/apiclient
rename to confluent_osdeploy/common/opt/confluent/bin/apiclient
diff --git a/confluent_osdeploy/confluent_osdeploy.spec.tmpl b/confluent_osdeploy/confluent_osdeploy.spec.tmpl
index 18980401..7436c334 100644
--- a/confluent_osdeploy/confluent_osdeploy.spec.tmpl
+++ b/confluent_osdeploy/confluent_osdeploy.spec.tmpl
@@ -30,6 +30,7 @@ for os in rhvh4 el8 suse15 ubuntu20.04; do
     cd ${os}out
     cp -a ../opt .
     cp -a ../${os}/initramfs/* .
+    cp -a ../common/* .
     find . | cpio -H newc -o > ../addons.cpio
     mv ../addons.cpio .
     cd ..
@@ -38,6 +39,7 @@ mkdir esxi7out
 cd esxi7out
 cp -a ../opt .
 cp -a ../esxi7/initramfs/* .
+cp -a ../common/* .
 chmod +x bin/* opt/confluent/bin/*
 tar zcvf ../addons.tgz *
 mv ../addons.tgz .