From 2c3afac5767177506191de7308bc84fd0ea0683c Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 31 Jan 2023 15:10:49 -0500
Subject: [PATCH] Restructure aarch64 addons

Avoid tripping over current copy over, prepare
for smarter selection by architecture.
---
 .../confluent_osdeploy-aarch64.spec.tmpl      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl b/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl
index a1e39b8d..f1b7c804 100644
--- a/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl
+++ b/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl
@@ -36,8 +36,8 @@ for os in rhvh4 el7 genesis el8 suse15 ubuntu20.04 ubuntu22.04 coreos el9; do
     fi
     cp -a ../${os}/initramfs/* .
     cp -a ../common/initramfs/* .
-    find . | cpio -H newc -o > ../addons-aarch64.cpio
-    mv ../addons-aarch64.cpio .
+    find . | cpio -H newc -o > ../addons.cpio
+    mv ../addons.cpio .
     cd ..
 done
 for os in el7 el8 suse15 el9 ubuntu20.04; do
@@ -55,8 +55,8 @@ for os in el7 el8 suse15 el9 ubuntu20.04; do
     else
         cp -a ../stateless-bin/* opt/confluent/bin
     fi
-    find . | cpio -H newc -o > ../addons-aarch64.cpio
-    mv ../addons-aarch64.cpio .
+    find . | cpio -H newc -o > ../addons.cpio
+    mv ../addons.cpio .
     cd ..
 done
 mkdir esxi7out
@@ -65,8 +65,8 @@ cp -a ../opt .
 cp -a ../esxi7/initramfs/* .
 cp -a ../common/initramfs/* .
 chmod +x bin/* opt/confluent/bin/*
-tar zcvf ../addons-aarch64.tgz *
-mv ../addons-aarch64.tgz .
+tar zcvf ../addons.tgz *
+mv ../addons.tgz .
 cd ..
 cp -a esxi7out esxi6out
 cp -a esxi7 esxi6
@@ -77,11 +77,11 @@ cp -a esxi7 esxi8
 mkdir -p %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
 #cp LICENSE %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
 for os in rhvh4 el7 el8 el9 genesis suse15 ubuntu20.04 ubuntu22.04 esxi6 esxi7 esxi8 coreos; do
-    mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
-    cp ${os}out/addons-aarch64.* %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
+    mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs/aarch64/
+    cp ${os}out/addons.* %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs/aarch64/
     if [ -d ${os}disklessout ]; then
-        mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs
-        cp ${os}disklessout/addons-aarch64.* %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs
+        mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs/aarch64/
+        cp ${os}disklessout/addons.* %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs/aarch64/
     fi
 done
 find %{buildroot}/opt/confluent/lib/osdeploy/ -name .gitignore -exec rm -f {} +