From de443762080b2253c517ed09025319cf6a8b72cf Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Jul 2024 17:38:12 +0000
Subject: [PATCH] flash-images: Collect files again instead of relying on the
 tarball

This has always been an ugly hack.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/flash-images | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lfs/flash-images b/lfs/flash-images
index 40c65cfff..18745c6a8 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -139,12 +139,9 @@ ifeq "$(EFI)" "1"
 	mount $(PART_EFI) $(MNThdd)/boot/efi
 endif
 
-	# Install IPFire
-ifneq "$(BUILD_PLATFORM)" "arm"
-	tar $(TAR_OPTIONS) -x --zstd -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
-else
-	tar $(TAR_OPTIONS) -x -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img
-endif
+	# Copy all files
+	$(call COPY_FILES,$(DIR_SRC)/config/rootfiles/common,$(MNThdd))
+
 	-touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
 	mkdir $(MNThdd)/proc
 	mount --bind /proc $(MNThdd)/proc