phase1: correctly exclude kmods files from rsync target upload and prune
authorChristian Marangi <ansuelsmth@gmail.com>
Fri, 15 Nov 2024 15:41:52 +0000 (16:41 +0100)
committerPetr Štetiar <ynezz@true.cz>
Mon, 18 Nov 2024 08:08:56 +0000 (08:08 +0000)
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 <ansuelsmth@gmail.com>
phase1/master.cfg

index 765852b1424525029bd746df1b10a3c2ef102132..e3dee371dd73a592cab070e670f597043cbcbb2d 100644 (file)
@@ -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),