From b32509a8ea1d5343a5c96c510d3128d7169c6476 Mon Sep 17 00:00:00 2001
From: Viktor <35473052+viktorxda@users.noreply.github.com>
Date: Tue, 4 Jul 2023 18:34:08 +0200
Subject: [PATCH] Makefile: move repacked archives to images folder

---
 .github/workflows/build.yml | 4 ++--
 Makefile                    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 80b3de3a..a48ec5bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -223,12 +223,12 @@ jobs:
           TIME=$(date -d @${SECONDS} +%M:%S)
           echo TIME=${TIME} >> ${GITHUB_ENV}
 
-          NORFW=${GITHUB_WORKSPACE}/output/openipc.${{matrix.platform}}-nor-${{matrix.release}}.tgz
+          NORFW=${GITHUB_WORKSPACE}/output/images/openipc.${{matrix.platform}}-nor-${{matrix.release}}.tgz
           if [ -e ${NORFW} ]; then
             echo NORFW=${NORFW} >> ${GITHUB_ENV}
           fi
 
-          NANDFW=${GITHUB_WORKSPACE}/output/openipc.${{matrix.platform}}-nand-${{matrix.release}}.tgz
+          NANDFW=${GITHUB_WORKSPACE}/output/images/openipc.${{matrix.platform}}-nand-${{matrix.release}}.tgz
           if [ -e ${NANDFW} ]; then
             echo NANDFW=${NANDFW} >> ${GITHUB_ENV}
           fi
diff --git a/Makefile b/Makefile
index 9a0dfe26..9c8fc448 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,9 @@ define REPACK_FIRMWARE
 	cd $(TARGET)/images/$(3) && cp -f ../$(2) $(2).$(BR2_OPENIPC_SOC_MODEL)
 	cd $(TARGET)/images/$(3) && md5sum $(1).$(BR2_OPENIPC_SOC_MODEL) > $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum
 	cd $(TARGET)/images/$(3) && md5sum $(2).$(BR2_OPENIPC_SOC_MODEL) > $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum
-	cd $(TARGET)/images/$(3) && tar -czf $(TARGET)/openipc.$(BR2_OPENIPC_SOC_MODEL)-$(3)-$(BR2_OPENIPC_FLAVOR).tgz \
+	cd $(TARGET)/images/$(3) && tar -czf \
+		$(TARGET)/images/openipc.$(BR2_OPENIPC_SOC_MODEL)-$(3)-$(BR2_OPENIPC_FLAVOR).tgz \
 		$(1).$(BR2_OPENIPC_SOC_MODEL) $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum \
 		$(2).$(BR2_OPENIPC_SOC_MODEL) $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum
+	rm -rf $(TARGET)/images/$(3)
 endef