[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 20719b4ce36fbfa7d7b05ce0e3f1a56fdeb0d750

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 20719b4ce36fbfa7d7b05ce0e3f1a56fdeb0d750

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3144 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  20719b4ce36fbfa7d7b05ce0e3f1a56fdeb0d750 (commit)
      from  3c8adb565340ad10b6aaac5da41caf34ed8f2b30 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 20719b4ce36fbfa7d7b05ce0e3f1a56fdeb0d750
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 27 09:39:27 2024 +0000

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/Config       | 5 ++++-
 lfs/cdrom        | 2 +-
 lfs/core-updates | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/Config b/lfs/Config
index fe4e9605c..9fabe790c 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 aef95208d..a25141fc2 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 a6478b5e0..8460549a8 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -52,7 +52,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)


hooks/post-receive
--
IPFire 2.x development tree