From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Aug 2024 09:39:27 +0000 (+0000)
Subject: core-updates: Honour the excluded file list
X-Git-Tag: v2.29-core188~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e6bb176b126579f970452ee54effe3e84422e6b;p=ipfire-2.x.git

core-updates: Honour the excluded file list

This was not implement when refactoring the code to compress the
updater's tarball.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/Config b/lfs/Config
index fe4e9605cb..9fabe790c3 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -358,6 +358,7 @@ __FILES_IN = \
 		--exclude="proc/*" \
 		--exclude="tmp/*" \
 		--exclude="__pycache__" \
+		$(if $(1),--exclude-from=$(1)) \
 		--files-from=-
 
 # Takes a tarball and extracts it in the target directory
@@ -370,8 +371,10 @@ __FILES_OUT = \
 # Copies all files on a rootfile into the given directory
 define COPY_FILES
 	# Copy all files from $(1) to $(2) ($(3))
+	# $4 = rootfile to write out
+	# $5 = exclude
 	$(call COLLECT_FILES,$(1),$(3),$(4)) | \
-		$(call __FILES_IN) | \
+		$(call __FILES_IN,$(5)) | \
 		$(call __FILES_OUT,$(2))
 
 	# Strip everything, except a few things
diff --git a/lfs/cdrom b/lfs/cdrom
index aef95208d3..a25141fc20 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -148,7 +148,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rf $(DIR_TMP)/root && mkdir -p $(DIR_TMP)/root
 
 	# Copy all files that we want
-	$(call COPY_FILES,$(DIR_SRC)/config/rootfiles/common,$(DIR_TMP)/root,)
+	$(call COPY_FILES,$(DIR_SRC)/config/rootfiles/common,$(DIR_TMP)/root,,,)
 
 	# Create mount points
 	$(call CREATE_MOUNTPOINTS,$(DIR_TMP)/root)
diff --git a/lfs/core-updates b/lfs/core-updates
index 81ea9a5f00..ca72e2381c 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -54,7 +54,7 @@ install:
 	@rm -rf $(ARCHIVE_DIR) && mkdir -pv $(ARCHIVE_DIR) $(ARCHIVE_TMP)
 
 	# Generate the archive and write out the rootfile
-	$(call COPY_FILES,$(DIR_SRC)/config/rootfiles/core/$(CORE)/filelists,$(ARCHIVE_TMP),,$(ARCHIVE_DIR)/ROOTFILES)
+	$(call COPY_FILES,$(DIR_SRC)/config/rootfiles/core/$(CORE)/filelists,$(ARCHIVE_TMP),,$(ARCHIVE_DIR)/ROOTFILES,$(DIR_SRC)/config/rootfiles/core/$(CORE)/exclude)
 
 	# Create the archive
 	$(call COMPRESS_XZ,$(ARCHIVE_TMP),$(ARCHIVE_DIR)/files.tar.xz)