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>

diff --git a/lfs/flash-images b/lfs/flash-images
index 40c65cfffd2a40c0bd5ad19c80561364097390fa..18745c6a83b661f0846f4cba6faec288a8d88ef8 100644 (file)
--- 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