From a75ce026ca9bd5df828e9e51db08f209a716fe82 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Fri, 15 Nov 2024 16:41:52 +0100 Subject: [PATCH] phase1: correctly exclude kmods files from rsync target upload and prune There is currently a BUG in the --exclude pattern for the targetupload step. The /kmods/ directory is actually never excluded. This was never notice as the rsynclist never actually had kmods entry as make checksum step was done before moving the kmods to the dedicated directory. This is caused by the fact that with --files-from, not only the /kmods/ directory needs to be excluded but also every content in it, hence the additional --exclude "/kmods/**" is required to correcly skip the entry present in rsynclist. Signed-off-by: Christian Marangi --- phase1/master.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/phase1/master.cfg b/phase1/master.cfg index 765852b..e3dee37 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -1664,6 +1664,7 @@ def prepareFactory(target): command=[ "../rsync.sh", "--exclude=/kmods/", + "--exclude=/kmods/**", "--files-from=rsynclist", "--delay-updates", "--partial-dir=.~tmp~%s~%s" % (target, subtarget), -- 2.30.2