From: Christian Marangi Date: Fri, 15 Nov 2024 15:41:52 +0000 (+0100) Subject: phase1: correctly exclude kmods files from rsync target upload and prune X-Git-Tag: v22~1 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=a75ce026ca9bd5df828e9e51db08f209a716fe82;p=buildbot.git 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 --- 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),